diff options
author | Luuk van Baal <luukvbaal@gmail.com> | 2022-12-15 13:15:39 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-12-15 13:15:39 +0000 |
commit | ba936f6f4e85cc1408bc3967f9fd7665d948909b (patch) | |
tree | 5c3d87dd658a5c5de01db33af82103dbb96714cc /src/testdir | |
parent | 3d473ee1a6aed7cb9eae458bbd8d42dffdc754f9 (diff) |
patch 9.0.1061: cannot display 'showcmd' somewhere elsev9.0.1061
Problem: Cannot display 'showcmd' somewhere else.
Solution: Add the 'showcmdloc' option. (Luuk van Baal, closes #11684)
Diffstat (limited to 'src/testdir')
-rw-r--r-- | src/testdir/dumps/Test_statusline_showcmd_1.dump | 6 | ||||
-rw-r--r-- | src/testdir/dumps/Test_statusline_showcmd_2.dump | 6 | ||||
-rw-r--r-- | src/testdir/dumps/Test_statusline_showcmd_3.dump | 6 | ||||
-rw-r--r-- | src/testdir/dumps/Test_tabline_showcmd_1.dump | 6 | ||||
-rw-r--r-- | src/testdir/dumps/Test_tabline_showcmd_2.dump | 6 | ||||
-rw-r--r-- | src/testdir/gen_opt_test.vim | 1 | ||||
-rw-r--r-- | src/testdir/test_statusline.vim | 22 | ||||
-rw-r--r-- | src/testdir/test_tabline.vim | 21 |
8 files changed, 74 insertions, 0 deletions
diff --git a/src/testdir/dumps/Test_statusline_showcmd_1.dump b/src/testdir/dumps/Test_statusline_showcmd_1.dump new file mode 100644 index 0000000000..049e0f777d --- /dev/null +++ b/src/testdir/dumps/Test_statusline_showcmd_1.dump @@ -0,0 +1,6 @@ +|a+0&#e0e0e08| +0&#ffffff0@73 +|b+0&#e0e0e08| +0&#ffffff0@73 +|c+0&#e0e0e08> +0&#ffffff0@73 +|~+0#4040ff13&| @73 +|3+3#0000000&|x|2| @71 +|-+2&&@1| |V|I|S|U|A|L| |B|L|O|C|K| |-@1| +0&&@56 diff --git a/src/testdir/dumps/Test_statusline_showcmd_2.dump b/src/testdir/dumps/Test_statusline_showcmd_2.dump new file mode 100644 index 0000000000..c443662dd8 --- /dev/null +++ b/src/testdir/dumps/Test_statusline_showcmd_2.dump @@ -0,0 +1,6 @@ +|a+0&#ffffff0| @73 +|b| @73 +>c| @73 +|~+0#4040ff13&| @73 +|1+3#0000000&|2|3|4| @70 +| +0&&@74 diff --git a/src/testdir/dumps/Test_statusline_showcmd_3.dump b/src/testdir/dumps/Test_statusline_showcmd_3.dump new file mode 100644 index 0000000000..26ba3773e2 --- /dev/null +++ b/src/testdir/dumps/Test_statusline_showcmd_3.dump @@ -0,0 +1,6 @@ +|a+0&#ffffff0| @73 +|b| @73 +>c| @73 +|~+0#4040ff13&| @73 +|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @32|1|2|3|4| @6|3|,|1| @11|A|l@1 +|:+0&&| @73 diff --git a/src/testdir/dumps/Test_tabline_showcmd_1.dump b/src/testdir/dumps/Test_tabline_showcmd_1.dump new file mode 100644 index 0000000000..de8f62c171 --- /dev/null +++ b/src/testdir/dumps/Test_tabline_showcmd_1.dump @@ -0,0 +1,6 @@ +| +2&#ffffff0|+| |[|N|o| |N|a|m|e|]| | +1&&@51|3+8#0000001#e0e0e08|x|2| +1#0000000#ffffff0@6 +|a+0&#e0e0e08| +0&#ffffff0@73 +|b+0&#e0e0e08| +0&#ffffff0@73 +|c+0&#e0e0e08> +0&#ffffff0@73 +|~+0#4040ff13&| @73 +|-+2#0000000&@1| |V|I|S|U|A|L| |B|L|O|C|K| |-@1| +0&&@38|3|,|2| @10|A|l@1| diff --git a/src/testdir/dumps/Test_tabline_showcmd_2.dump b/src/testdir/dumps/Test_tabline_showcmd_2.dump new file mode 100644 index 0000000000..b5a7283a84 --- /dev/null +++ b/src/testdir/dumps/Test_tabline_showcmd_2.dump @@ -0,0 +1,6 @@ +| +2&#ffffff0|+| |[|N|o| |N|a|m|e|]| | +1&&@51|1+8#0000001#e0e0e08|2|3|4| +1#0000000#ffffff0@5 +|a+0&&| @73 +|b| @73 +>c| @73 +|~+0#4040ff13&| @73 +| +0#0000000&@56|3|,|1| @10|A|l@1| diff --git a/src/testdir/gen_opt_test.vim b/src/testdir/gen_opt_test.vim index 7337217a31..a18aa66dfa 100644 --- a/src/testdir/gen_opt_test.vim +++ b/src/testdir/gen_opt_test.vim @@ -132,6 +132,7 @@ let test_values = { \ 'selection': [['old', 'inclusive'], ['', 'xxx']], \ 'selectmode': [['', 'mouse', 'key,cmd'], ['xxx']], \ 'sessionoptions': [['', 'blank', 'help,options,slash'], ['xxx']], + \ 'showcmdloc': [['last', 'statusline', 'tabline'], ['xxx']], \ 'signcolumn': [['', 'auto', 'no'], ['xxx', 'no,yes']], \ 'spellfile': [['', 'file.en.add', '/tmp/dir\ with\ space/en.utf-8.add'], ['xxx', '/tmp/file']], \ 'spelllang': [['', 'xxx', 'sr@latin'], ['not&lang', "that\\\rthere"]], diff --git a/src/testdir/test_statusline.vim b/src/testdir/test_statusline.vim index 15f2083f02..a829597655 100644 --- a/src/testdir/test_statusline.vim +++ b/src/testdir/test_statusline.vim @@ -558,4 +558,26 @@ func Test_statusline_highlight_truncate() call StopVimInTerminal(buf) endfunc +func Test_statusline_showcmd() + CheckScreendump + + let lines =<< trim END + set laststatus=2 + set statusline=%S + set showcmdloc=statusline + call setline(1, ['a', 'b', 'c']) + END + call writefile(lines, 'XTest_statusline', 'D') + + let buf = RunVimInTerminal('-S XTest_statusline', {'rows': 6}) + call feedkeys("\<C-V>Gl", "xt") + call VerifyScreenDump(buf, 'Test_statusline_showcmd_1', {}) + + call feedkeys("\<Esc>1234", "xt") + call VerifyScreenDump(buf, 'Test_statusline_showcmd_2', {}) + + call feedkeys("\<Esc>:set statusline=\<CR>:\<CR>1234", "xt") + call VerifyScreenDump(buf, 'Test_statusline_showcmd_3', {}) +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/testdir/test_tabline.vim b/src/testdir/test_tabline.vim index ab0268d65a..da738846f8 100644 --- a/src/testdir/test_tabline.vim +++ b/src/testdir/test_tabline.vim @@ -1,6 +1,9 @@ " Test for tabline source shared.vim +source view_util.vim +source check.vim +source screendump.vim func TablineWithCaughtError() let s:func_in_tabline_called = 1 @@ -158,5 +161,23 @@ func Test_mouse_click_in_tab() call RunVim([], [], "-e -s -S Xclickscript -c qa") endfunc +func Test_tabline_showcmd() + CheckScreendump + + let lines =<< trim END + set showtabline=2 + set showcmdloc=tabline + call setline(1, ['a', 'b', 'c']) + END + call writefile(lines, 'XTest_tabline', 'D') + + let buf = RunVimInTerminal('-S XTest_tabline', {'rows': 6}) + + call feedkeys("\<C-V>Gl", "xt") + call VerifyScreenDump(buf, 'Test_tabline_showcmd_1', {}) + + call feedkeys("\<Esc>1234", "xt") + call VerifyScreenDump(buf, 'Test_tabline_showcmd_2', {}) +endfunc " vim: shiftwidth=2 sts=2 expandtab |