patch 9.1.2105: tests: not enough tests for using plain_vgetc()

Problem:  Not enough tests for using plain_vgetc().
Solution: Add tests for using plain_vgetc() during various commands.
          (zeertzjq)

closes: #19236

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/test_input.vim b/src/testdir/test_input.vim
index 3b1e2eb2df4672a1a107a9a12f34ca2656a4ab43..46f5858aeb34a4496efa264f3c5ac877584e1536 100644 (file)
--- a/src/testdir/test_input.vim
+++ b/src/testdir/test_input.vim
@@ -58,4 +58,54 @@ func Test_input_simplify_timedout()
   bw!
 endfunc
 
+" Check that <Ignore> and <MouseMove> are no-op in the middle of various
+" commands as they are ignored by plain_vgetc().
+func Test_input_noop_keys()
+  for key in ["\<Ignore>", "\<MouseMove>"]
+    20new
+    setlocal scrolloff=0
+
+    let lines = range(1, 100)->mapnew({_, n -> $'line {n}'})
+    call setline(1, lines)
+    let InsertNoopKeys = {s -> key .. split(s, '\zs')->join(key) .. key}
+
+    call feedkeys(InsertNoopKeys("60z\<CR>\<C-\>\<C-N>"), 'tnix')
+    call assert_equal(60, line('w0'))
+    call assert_equal('line 60', getline('.'))
+
+    call feedkeys(InsertNoopKeys("gg20ddi\<C-V>x5F\<Esc>"), 'tnix')
+    call assert_equal(80, line('$'))
+    call assert_equal('_line 21', getline('.'))
+
+    call feedkeys(InsertNoopKeys("fea\<C-K>,.\<C-\>\<C-N>"), 'tnix')
+    call assert_equal('_line… 21', getline('.'))
+
+    call feedkeys(InsertNoopKeys("Iabcde\<C-G>ufghij\<Esc>u"), 'tnix')
+    call assert_equal('abcde_line… 21', getline('.'))
+    call feedkeys("\<C-R>$2Feg~tj", 'tnix')
+    call assert_equal('abcdEFGHIj_line… 21', getline('.'))
+
+    let @g = 'FOO'
+    call feedkeys(InsertNoopKeys("A\<C-R>g\<C-R>\<C-O>g\<Esc>"), 'tnix')
+    call assert_equal('abcdEFGHIj_line… 21FOOFOO', getline('.'))
+
+    call feedkeys(InsertNoopKeys("0v10l\<C-G>\<C-R>g?!!\<Esc>"), 'tnix')
+    call assert_equal('abcdEFGHIj_', @g)
+    call assert_equal('?!!line… 21FOOFOO', getline('.'))
+
+    let @g = 'BAR'
+    call feedkeys(InsertNoopKeys("$:\"abc\<C-R>\<C-R>\<C-W>\<CR>"), 'tnix')
+    call assert_equal('"abc21FOOFOO', @:)
+    call feedkeys(InsertNoopKeys(":\<C-\>e'\"foo'\<CR>\<C-R>g\<CR>"), 'tnix')
+    call assert_equal('"fooBAR', @:)
+
+    call feedkeys(InsertNoopKeys("z10\<CR>"), 'tnix')
+    call assert_equal(10, winheight(0))
+    call feedkeys(InsertNoopKeys("\<C-W>10+"), 'tnix')
+    call assert_equal(20, winheight(0))
+
+    bwipe!
+  endfor
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/version.c b/src/version.c
index 30c54f9f23cf9dd4ff005c05a79cbb7ee1454546..1852977ac8c3464fb4cc5a7f817ea2764e55c58c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2105,
 /**/
     2104,
 /**/