From d5b9a7d6e8891c8f456413b86ebfba44f92c713c Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Tue, 11 May 2021 21:00:54 -0400 Subject: vim-patch:8.2.0023: command line editing not sufficiently tested Problem: Command line editing not sufficiently tested. Solution: Add more tests. (Dominique Pelle, closes vim/vim#5374) https://github.com/vim/vim/commit/59cb041d0a56d8555857da7e063ec61504ee1fa7 Ported to commit test_ex_mode.vim for later patches. Test fails because feedkeys() filters out modifier keys on output. --- src/nvim/testdir/test_alot.vim | 1 + src/nvim/testdir/test_cmdline.vim | 48 +++++++++++++++++++++++---------- src/nvim/testdir/test_ex_mode.vim | 56 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 14 deletions(-) create mode 100644 src/nvim/testdir/test_ex_mode.vim diff --git a/src/nvim/testdir/test_alot.vim b/src/nvim/testdir/test_alot.vim index e50602ccad..b5c50b5894 100644 --- a/src/nvim/testdir/test_alot.vim +++ b/src/nvim/testdir/test_alot.vim @@ -10,6 +10,7 @@ source test_cursor_func.vim source test_ex_equal.vim source test_ex_undo.vim source test_ex_z.vim +source test_ex_mode.vim source test_execute_func.vim source test_expand_func.vim source test_feedkeys.vim diff --git a/src/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim index a1968807ac..5c4f68c700 100644 --- a/src/nvim/testdir/test_cmdline.vim +++ b/src/nvim/testdir/test_cmdline.vim @@ -477,7 +477,7 @@ func Test_expand_star_star() call delete('a', 'rf') endfunc -func Test_paste_in_cmdline() +func Test_cmdline_paste() let @a = "def" call feedkeys(":abc \a ghi\\"\", 'tx') call assert_equal('"abc def ghi', @:) @@ -517,18 +517,38 @@ func Test_paste_in_cmdline() bwipe! endfunc -func Test_remove_char_in_cmdline() - call feedkeys(":abc def\\\\"\", 'tx') - call assert_equal('"abc ef', @:) +func Test_cmdline_remove_char() + let encoding_save = &encoding + + " for e in ['utf8', 'latin1'] + for e in ['utf8'] + exe 'set encoding=' . e + + call feedkeys(":abc def\\\\"\", 'tx') + call assert_equal('"abc ef', @:, e) + + call feedkeys(":abc def\\\\"\", 'tx') + call assert_equal('"abcdef', @:) + + call feedkeys(":abc def ghi\\\\"\", 'tx') + call assert_equal('"abc ghi', @:, e) - call feedkeys(":abc def\\\\"\", 'tx') - call assert_equal('"abcdef', @:) + call feedkeys(":abc def\\\\"\", 'tx') + call assert_equal('"def', @:, e) + endfor + + let &encoding = encoding_save +endfunc - call feedkeys(":abc def ghi\\\\"\", 'tx') - call assert_equal('"abc ghi', @:) +func Test_cmdline_keymap_ctrl_hat() + if !has('keymap') + return + endif - call feedkeys(":abc def\\\\"\", 'tx') - call assert_equal('"def', @:) + set keymap=esperanto + call feedkeys(":\"Jxauxdo \Jxauxdo \Jxauxdo\", 'tx') + call assert_equal('"Jxauxdo Ĵaŭdo Jxauxdo', @:) + set keymap= endfunc func Test_illegal_address1() @@ -863,20 +883,20 @@ func Test_cmdline_overstrike() " Test overstrike in the middle of the command line. call feedkeys(":\"01234\\\ab\\cd\", 'xt') - call assert_equal('"0ab1cd4', @:) + call assert_equal('"0ab1cd4', @:, e) " Test overstrike going beyond end of command line. call feedkeys(":\"01234\\\ab\\cdefgh\", 'xt') - call assert_equal('"0ab1cdefgh', @:) + call assert_equal('"0ab1cdefgh', @:, e) " Test toggling insert/overstrike a few times. call feedkeys(":\"01234\\ab\\cd\\ef\", 'xt') - call assert_equal('"ab0cd3ef4', @:) + call assert_equal('"ab0cd3ef4', @:, e) endfor " Test overstrike with multi-byte characters. call feedkeys(":\"テキストエディタ\\\ab\\cd\", 'xt') - call assert_equal('"テabキcdエディタ', @:) + call assert_equal('"テabキcdエディタ', @:, e) let &encoding = encoding_save endfunc diff --git a/src/nvim/testdir/test_ex_mode.vim b/src/nvim/testdir/test_ex_mode.vim new file mode 100644 index 0000000000..87c23a2fe8 --- /dev/null +++ b/src/nvim/testdir/test_ex_mode.vim @@ -0,0 +1,56 @@ +" Test editing line in Ex mode (see :help Q and :help gQ). + +" Helper function to test editing line in Q Ex mode +func Ex_Q(cmd) + " Is there a simpler way to test editing Ex line? + call feedkeys("Q" + \ .. "let s:test_ex =<< END\" + \ .. a:cmd .. "\" + \ .. "END\" + \ .. "visual\", 'tx') + return s:test_ex[0] +endfunc + +" Helper function to test editing line in gQ Ex mode +func Ex_gQ(cmd) + call feedkeys("gQ" .. a:cmd .. "\\"\", 'tx') + let ret = @:[1:] " Remove leading quote. + call feedkeys("visual\", 'tx') + return ret +endfunc + +" Helper function to test editing line with both Q and gQ Ex mode. +func Ex(cmd) + return [Ex_Q(a:cmd), Ex_gQ(a:cmd)] +endfunc + +" Test editing line in Ex mode (both Q and gQ) +func Test_ex_mode() + throw 'skipped: TODO: ' + let encoding_save = &encoding + set sw=2 + + " for e in ['utf8', 'latin1'] + for e in ['utf8'] + exe 'set encoding=' . e + + call assert_equal(['bar', 'bar'], Ex("foo bar\bar"), e) + call assert_equal(["1\2", "1\2"], Ex("1\\2"), e) + call assert_equal(["1\2\3", '213'], Ex("1\2\3"), e) + call assert_equal(['0123', '2013'], Ex("01\2\3"), e) + call assert_equal(['0123', '0213'], Ex("01\2\3"), e) + call assert_equal(['01234', '0342'], Ex("012\\\3\4"), e) + call assert_equal(["foo bar\", 'foo '], Ex("foo bar\"), e) + call assert_equal(['foo', 'foo'], Ex("fooba\\"), e) + call assert_equal(["foo\tbar", 'foobar'], Ex("foo\bar"), e) + call assert_equal(["abbrev\t", 'abbreviate'], Ex("abbrev\"), e) + call assert_equal([' 1', "1\\"], Ex("1\\"), e) + call assert_equal([' 1', "1\\"], Ex("1\\\"), e) + call assert_equal([' foo', ' foo'], Ex(" foo\"), e) + call assert_equal(['foo', ' foo0'], Ex(" foo0\"), e) + call assert_equal(['foo', ' foo^'], Ex(" foo^\"), e) + endfor + + set sw& + let &encoding = encoding_save +endfunc -- cgit