summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-03-15 18:36:20 +0100
committerBram Moolenaar <Bram@vim.org>2021-03-15 18:36:20 +0100
commitf4fcedc59d4cc5ae6b5270a933e8377030283c1c (patch)
tree48cc894ac3c0164afda58b86680a1c4844a4637f
parent02b4d9b18a03549b68e364e428392b7a62766c74 (diff)
downloadvim-git-f4fcedc59d4cc5ae6b5270a933e8377030283c1c.tar.gz
patch 8.2.2608: character input not fully testedv8.2.2608
Problem: Character input not fully tested. Solution: Add more tests. (Yegappan Lakshmanan, closes #7963)
-rw-r--r--src/testdir/test_functions.vim8
-rw-r--r--src/testdir/test_messages.vim11
-rw-r--r--src/testdir/test_paste.vim14
-rw-r--r--src/testdir/test_registers.vim10
-rw-r--r--src/testdir/test_undo.vim14
-rw-r--r--src/version.c2
6 files changed, 59 insertions, 0 deletions
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 64afe5481..ca57c3086 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -1430,6 +1430,14 @@ func Test_input_func()
delfunc Tcomplete
call assert_equal('item1 item2 item3', c)
+ " Test for using special characters as default input
+ call feedkeys(":let c = input('name? ', \"x\<BS>y\")\<CR>\<CR>", 'xt')
+ call assert_equal('y', c)
+
+ " Test for using <CR> as default input
+ call feedkeys(":let c = input('name? ', \"\\<CR>\")\<CR>x\<CR>", 'xt')
+ call assert_equal(' x', c)
+
call assert_fails("call input('F:', '', 'invalid')", 'E180:')
call assert_fails("call input('F:', '', [])", 'E730:')
endfunc
diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim
index 4f8c75112..375cb0146 100644
--- a/src/testdir/test_messages.vim
+++ b/src/testdir/test_messages.vim
@@ -259,6 +259,17 @@ func Test_message_more()
call term_sendkeys(buf, 'q')
call WaitForAssert({-> assert_equal('100', term_getline(buf, 5))})
+ " Execute a : command from the more prompt
+ call term_sendkeys(buf, ":%p#\n")
+ call term_wait(buf)
+ call WaitForAssert({-> assert_equal('-- More --', term_getline(buf, 6))})
+ call term_sendkeys(buf, ":")
+ call term_wait(buf)
+ call WaitForAssert({-> assert_equal(':', term_getline(buf, 6))})
+ call term_sendkeys(buf, "echo 'Hello'\n")
+ call term_wait(buf)
+ call WaitForAssert({-> assert_equal('Hello ', term_getline(buf, 5))})
+
call StopVimInTerminal(buf)
endfunc
diff --git a/src/testdir/test_paste.vim b/src/testdir/test_paste.vim
index 8995b971a..df732f156 100644
--- a/src/testdir/test_paste.vim
+++ b/src/testdir/test_paste.vim
@@ -149,4 +149,18 @@ func Test_xrestore()
bwipe!
endfunc
+" Test for 'pastetoggle'
+func Test_pastetoggle()
+ new
+ set pastetoggle=<F4>
+ set nopaste
+ call feedkeys("iHello\<F4>", 'xt')
+ call assert_true(&paste)
+ call feedkeys("i\<F4>", 'xt')
+ call assert_false(&paste)
+ call assert_equal('Hello', getline(1))
+ set pastetoggle&
+ bwipe!
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_registers.vim b/src/testdir/test_registers.vim
index b2916f4d0..c10af2946 100644
--- a/src/testdir/test_registers.vim
+++ b/src/testdir/test_registers.vim
@@ -709,4 +709,14 @@ func Test_insert_small_delete()
bwipe!
endfunc
+" Record in insert mode using CTRL-O
+func Test_record_in_insert_mode()
+ new
+ let @r = ''
+ call setline(1, ['foo'])
+ call feedkeys("i\<C-O>qrbaz\<C-O>q", 'xt')
+ call assert_equal('baz', @r)
+ bwipe!
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_undo.vim b/src/testdir/test_undo.vim
index dd4b902b9..f12e1525c 100644
--- a/src/testdir/test_undo.vim
+++ b/src/testdir/test_undo.vim
@@ -733,4 +733,18 @@ func Test_undofile_cryptmethod_blowfish2()
set undofile& undolevels& cryptmethod&
endfunc
+" Test for redoing with incrementing numbered registers
+func Test_redo_repeat_numbered_register()
+ new
+ for [i, v] in [[1, 'one'], [2, 'two'], [3, 'three'],
+ \ [4, 'four'], [5, 'five'], [6, 'six'],
+ \ [7, 'seven'], [8, 'eight'], [9, 'nine']]
+ exe 'let @' .. i .. '="' .. v .. '\n"'
+ endfor
+ call feedkeys('"1p.........', 'xt')
+ call assert_equal(['', 'one', 'two', 'three', 'four', 'five', 'six',
+ \ 'seven', 'eight', 'nine', 'nine'], getline(1, '$'))
+ bwipe!
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 0b1ece6a6..9d46da68c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2608,
+/**/
2607,
/**/
2606,