From 727754377281aa442767c0ad9c25fec7dd2533ab Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 2 Jul 2022 09:40:06 +0800 Subject: vim-patch:8.2.0316: ex_getln.c code has insufficient test coverage Problem: ex_getln.c code has insufficient test coverage. Solution: Add more tests. Fix a problem. (Yegappan Lakshmanan, closes vim/vim#5693) https://github.com/vim/vim/commit/8d588ccee57390aa01c2395fc599bbe6506ee13a --- src/nvim/ex_getln.c | 2 +- src/nvim/testdir/test_cmdline.vim | 31 ++++++++++++++++++++++++ src/nvim/testdir/test_history.vim | 51 +++++++++++++++++++++++++++++++++++++++ src/nvim/testdir/test_menu.vim | 36 +++++++++++++++++++++++++++ 4 files changed, 119 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 49f946d6c0..1982b2dace 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -6293,7 +6293,7 @@ static int calc_hist_idx(int histype, int num) wrapped = TRUE; } } - if (hist[i].hisnum == num && hist[i].hisstr != NULL) { + if (i >= 0 && hist[i].hisnum == num && hist[i].hisstr != NULL) { return i; } } else if (-num <= hislen) { diff --git a/src/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim index d3295b6223..aedcad5296 100644 --- a/src/nvim/testdir/test_cmdline.vim +++ b/src/nvim/testdir/test_cmdline.vim @@ -71,6 +71,12 @@ func Test_complete_wildmenu() cunmap endif + " Completion using a relative path + cd Xdir1/Xdir2 + call feedkeys(":e ../\\\\\\"\", 'tx') + call assert_equal('"e Xtestfile3 Xtestfile4', @:) + cd - + " cleanup %bwipe call delete('Xdir1/Xdir2/Xtestfile4') @@ -581,6 +587,10 @@ func Test_cmdline_paste() " ignore error E32 endtry call assert_equal("Xtestfile", bufname("%")) + + " Use an invalid expression for e + call assert_beeps('call feedkeys(":\einvalid\", "tx")') + bwipe! endfunc @@ -876,6 +886,8 @@ func Test_getcmdtype() cnoremap Check_cmdline('=') call feedkeys("a\=MyCmd a\\\", "xt") cunmap + + call assert_equal('', getcmdline()) endfunc func Test_getcmdwintype() @@ -1138,6 +1150,10 @@ func Test_cmdwin_jump_to_win() call assert_equal(1, winnr('$')) call feedkeys("q/:exit\", "xt") call assert_equal(1, winnr('$')) + + " opening command window twice should fail + call assert_beeps('call feedkeys("q:q:\\", "xt")') + call assert_equal(1, winnr('$')) endfunc " Test for backtick expression in the command line @@ -1195,6 +1211,21 @@ func Test_cmd_bang_E135() %bwipe! endfunc +" Test for using ~ for home directory in cmdline completion matches +func Test_cmdline_expand_home() + call mkdir('Xdir') + call writefile([], 'Xdir/Xfile1') + call writefile([], 'Xdir/Xfile2') + cd Xdir + let save_HOME = $HOME + let $HOME = getcwd() + call feedkeys(":e ~/\\\"\", 'xt') + call assert_equal('"e ~/Xfile1 ~/Xfile2', @:) + let $HOME = save_HOME + cd .. + call delete('Xdir', 'rf') +endfunc + " test that ";" works to find a match at the start of the first line func Test_zero_line_search() new diff --git a/src/nvim/testdir/test_history.vim b/src/nvim/testdir/test_history.vim index 2f0dc2dae1..3b3dc17f44 100644 --- a/src/nvim/testdir/test_history.vim +++ b/src/nvim/testdir/test_history.vim @@ -86,6 +86,8 @@ function Test_History() call assert_fails('call histget([])', 'E730:') call assert_equal(-1, histnr('abc')) call assert_fails('call histnr([])', 'E730:') + call assert_fails('history xyz', 'E488:') + call assert_fails('history ,abc', 'E488:') endfunction function Test_Search_history_window() @@ -109,3 +111,52 @@ function Test_history_completion() call feedkeys(":history \\\"\", 'tx') call assert_equal('"history / : = > ? @ all cmd debug expr input search', @:) endfunc + +" Test for increasing the 'history' option value +func Test_history_size() + let save_histsz = &history + call histdel(':') + set history=5 + for i in range(1, 5) + call histadd(':', 'cmd' .. i) + endfor + call assert_equal(5, histnr(':')) + call assert_equal('cmd5', histget(':', -1)) + + set history=10 + for i in range(6, 10) + call histadd(':', 'cmd' .. i) + endfor + call assert_equal(10, histnr(':')) + call assert_equal('cmd1', histget(':', 1)) + call assert_equal('cmd10', histget(':', -1)) + + set history=5 + call histadd(':', 'abc') + call assert_equal('', histget(':', 6)) + call assert_equal('', histget(':', 12)) + call assert_equal('cmd7', histget(':', 7)) + call assert_equal('abc', histget(':', -1)) + + let &history=save_histsz +endfunc + +" Test for recalling old search patterns in / +func Test_history_search() + call histdel('/') + let g:pat = [] + func SavePat() + call add(g:pat, getcmdline()) + return '' + endfunc + cnoremap eSavePat() + call histadd('/', 'pat1') + call histadd('/', 'pat2') + let @/ = '' + call feedkeys("/\\\\\\\\", 'xt') + call assert_equal(['pat2', 'pat1', ''], g:pat) + cunmap + delfunc SavePat +endfunc + +" vim: shiftwidth=2 sts=2 expandtab diff --git a/src/nvim/testdir/test_menu.vim b/src/nvim/testdir/test_menu.vim index 61c3a16125..a2ef6e5c67 100644 --- a/src/nvim/testdir/test_menu.vim +++ b/src/nvim/testdir/test_menu.vim @@ -89,3 +89,39 @@ func Test_menu_commands() unlet g:did_menu endfun + +" Test for menu item completion in command line +func Test_menu_expand() + " Create the menu itmes for test + for i in range(1, 4) + let m = 'menu Xmenu.A' .. i .. '.A' .. i + for j in range(1, 4) + exe m .. 'B' .. j .. ' :echo "A' .. i .. 'B' .. j .. '"' .. "" + endfor + endfor + set wildmenu + + " Test for selecting a submenu + call feedkeys(":emenu Xmenu.A\\\x\\\"\", 'xt') + call assert_equal('"emenu Xmenu.A1.A1B2', @:) + + " Test for selecting a submenu + call feedkeys(":emenu Xmenu.A\\\\" .. + \ "\\\"\", 'xt') + call assert_equal('"emenu Xmenu.A3.A3B1 A3B2 A3B3 A3B4', @:) + + " Test for to go up a submenu + call feedkeys(":emenu Xmenu.A\\\\\" .. + \ "\\\\\"\", 'xt') + call assert_equal('"emenu Xmenu.A2.A2B1 A2B2 A2B3 A2B4', @:) + + " Test for to go up a menu + call feedkeys(":emenu Xmenu.A\\\\\" .. + \ "\\\"\", 'xt') + call assert_equal('"emenu Buffers. Xmenu.', @:) + + set wildmenu& + unmenu Xmenu +endfunc + +" vim: shiftwidth=2 sts=2 expandtab -- cgit