Mercurial > vim
view src/testdir/test_virtualedit.vim @ 33674:021e5bb88513 v9.0.2074
patch 9.0.2074: Completion menu may be wrong
Commit: https://github.com/vim/vim/commit/daef8c74375141974d61b85199b383017644978c
Author: Christian Brabandt <cb@256bit.org>
Date: Fri Oct 27 19:16:26 2023 +0200
patch 9.0.2074: Completion menu may be wrong
Problem: Completion menu may be wrong
Solution: Check for the original direction of the completion menu,
add more tests, make it work with 'noselect'
completion: move in right direction when filling completion_info()
When moving through the insert completion menu and switching directions,
we need to make sure we start at the correct position in the list and
move correctly forward/backwards through it, so that we do not skip
entries and the selected item points to the correct entry in the list
of completion entries generated by the completion_info() function.
The general case is this:
1) CTRL-X CTRL-N, we will traverse the list starting from
compl_first_match and then go forwards (using the cp->next pointer)
through the list (skipping the very first entry, which has the
CP_ORIGINAL_TEXT flag set (since that is the empty/non-selected entry
2) CTRL-X CTRL-P, we will traverse the list starting from
compl_first_match (which now points to the last entry). The previous
entry will have the CP_ORIGINAL_TEXT flag set, so we need to start
traversing the list from the second prev pointer.
There are in fact 2 special cases after starting the completion menu
with CTRL-X:
3) CTRL-N and then going backwards by pressing CTRL-P again.
compl_first_match will point to the same entry as in step 1 above,
but since compl_dir_foward() has been switched by pressing CTRL-P
to backwards we need to pretend to be in still in case 1 and still
traverse the list in forward direction using the cp_next pointer
4) CTRL-P and then going forwards by pressing CTRL-N again.
compl_first_match will point to the same entry as in step 2 above,
but since compl_dir_foward() has been switched by pressing CTRL-N
to forwards we need to pretend to be in still in case 2 and still
traverse the list in backward direction using the cp_prev pointer
For the 'noselect' case however, this is slightly different again. When
going backwards, we only need to go one cp_prev pointer back. And
resting of the direction works again slightly different. So we need to
take the noselect option into account when deciding in which direction
to iterate through the list of matches.
related: #13402
related: #12971
closes: #13408
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 27 Oct 2023 19:30:05 +0200 |
| parents | f47ee07ae029 |
| children | df8faa0124f7 |
line wrap: on
line source
" Tests for 'virtualedit'. func Test_yank_move_change() new call setline(1, [ \ "func foo() error {", \ "\tif n, err := bar();", \ "\terr != nil {", \ "\t\treturn err", \ "\t}", \ "\tn = n * n", \ ]) set virtualedit=all set ts=4 function! MoveSelectionDown(count) abort normal! m` silent! exe "'<,'>move'>+".a:count norm! `` endfunction xmap ]e :<C-U>call MoveSelectionDown(v:count1)<CR> 2 normal 2gg normal J normal jVj normal ]e normal ce bwipe! set virtualedit= set ts=8 endfunc func Test_paste_end_of_line() new set virtualedit=all call setline(1, ['456', '123']) normal! gg0"ay$ exe "normal! 2G$lllA\<C-O>:normal! \"agP\r" call assert_equal('123456', getline(2)) bwipe! set virtualedit= endfunc func Test_replace_end_of_line() new set virtualedit=all call setline(1, range(20)) exe "normal! gg2jv10lr-" call assert_equal(["1", "-----------", "3"], getline(2,4)) call setline(1, range(20)) exe "normal! gg2jv10lr\<c-k>hh" call assert_equal(["1", "───────────", "3"], getline(2,4)) bwipe! set virtualedit= endfunc func Test_edit_CTRL_G() new set virtualedit=insert call setline(1, ['123', '1', '12']) exe "normal! ggA\<c-g>jx\<c-g>jx" call assert_equal(['123', '1 x', '12 x'], getline(1,'$')) set virtualedit=all %d_ call setline(1, ['1', '12']) exe "normal! ggllix\<c-g>jx" call assert_equal(['1 x', '12x'], getline(1,'$')) bwipe! set virtualedit= endfunc func Test_edit_change() new set virtualedit=all call setline(1, "\t⒌") normal Cx call assert_equal('x', getline(1)) " Do a visual block change call setline(1, ['a', 'b', 'c']) exe "normal gg3l\<C-V>2jcx" call assert_equal(['a x', 'b x', 'c x'], getline(1, '$')) bwipe! set virtualedit= endfunc func Test_edit_special_char() new se ve=all norm a0 sil! exe "norm o00000\<Nul>k<a0s" bwipe! set virtualedit= endfunc " Tests for pasting at the beginning, end and middle of a tab character " in virtual edit mode. func Test_paste_in_tab() new call append(0, '') set virtualedit=all " Tests for pasting a register with characterwise mode type call setreg('"', 'xyz', 'c') " paste (p) unnamed register at the beginning of a tab call setline(1, "a\tb") call cursor(1, 2, 0) normal p call assert_equal('a xyz b', getline(1)) " paste (P) unnamed register at the beginning of a tab call setline(1, "a\tb") call cursor(1, 2, 0) normal P call assert_equal("axyz\tb", getline(1)) " paste (p) unnamed register at the end of a tab call setline(1, "a\tb") call cursor(1, 2, 6) normal p call assert_equal("a\txyzb", getline(1)) " paste (P) unnamed register at the end of a tab call setline(1, "a\tb") call cursor(1, 2, 6) normal P call assert_equal('a xyz b', getline(1)) " Tests for pasting a register with blockwise mode type call setreg('"', 'xyz', 'b') " paste (p) unnamed register at the beginning of a tab call setline(1, "a\tb") call cursor(1, 2, 0) normal p call assert_equal('a xyz b', getline(1)) " paste (P) unnamed register at the beginning of a tab call setline(1, "a\tb") call cursor(1, 2, 0) normal P call assert_equal("axyz\tb", getline(1)) " paste (p) unnamed register at the end of a tab call setline(1, "a\tb") call cursor(1, 2, 6) normal p call assert_equal("a\txyzb", getline(1)) " paste (P) unnamed register at the end of a tab call setline(1, "a\tb") call cursor(1, 2, 6) normal P call assert_equal('a xyz b', getline(1)) " Tests for pasting with gp and gP in virtual edit mode " paste (gp) unnamed register at the beginning of a tab call setline(1, "a\tb") call cursor(1, 2, 0) normal gp call assert_equal('a xyz b', getline(1)) call assert_equal([0, 1, 12, 0, 12], getcurpos()) " paste (gP) unnamed register at the beginning of a tab call setline(1, "a\tb") call cursor(1, 2, 0) normal gP call assert_equal("axyz\tb", getline(1)) call assert_equal([0, 1, 5, 0, 5], getcurpos()) " paste (gp) unnamed register at the end of a tab call setline(1, "a\tb") call cursor(1, 2, 6) normal gp call assert_equal("a\txyzb", getline(1)) call assert_equal([0, 1, 6, 0, 12], getcurpos()) " paste (gP) unnamed register at the end of a tab call setline(1, "a\tb") call cursor(1, 2, 6) normal gP call assert_equal('a xyz b', getline(1)) call assert_equal([0, 1, 12, 0, 12], getcurpos()) " Tests for pasting a named register let @r = 'xyz' " paste (gp) named register in the middle of a tab call setline(1, "a\tb") call cursor(1, 2, 2) normal "rgp call assert_equal('a xyz b', getline(1)) call assert_equal([0, 1, 8, 0, 8], getcurpos()) " paste (gP) named register in the middle of a tab call setline(1, "a\tb") call cursor(1, 2, 2) normal "rgP call assert_equal('a xyz b', getline(1)) call assert_equal([0, 1, 7, 0, 7], getcurpos()) bwipe! set virtualedit= endfunc " Test for yanking a few spaces within a tab to a register func Test_yank_in_tab() new let @r = '' call setline(1, "a\tb") set virtualedit=all call cursor(1, 2, 2) normal "ry5l call assert_equal(' ', @r) bwipe! set virtualedit= endfunc " Insert "keyword keyw", ESC, C CTRL-N, shows "keyword ykeyword". " Repeating CTRL-N fixes it. (Mary Ellen Foster) func Test_ve_completion() new set completeopt&vim set virtualedit=all exe "normal ikeyword keyw\<Esc>C\<C-N>" call assert_equal('keyword keyword', getline(1)) bwipe! set virtualedit= endfunc " Using "C" then <CR> moves the last remaining character to the next " line. (Mary Ellen Foster) func Test_ve_del_to_eol() new set virtualedit=all call append(0, 'all your base are belong to us') call search('are', 'w') exe "normal C\<CR>are belong to vim" call assert_equal(['all your base ', 'are belong to vim'], getline(1, 2)) bwipe! set virtualedit= endfunc " When past the end of a line that ends in a single character "b" skips " that word. func Test_ve_b_past_eol() new set virtualedit=all call append(0, '1 2 3 4 5 6') normal gg^$15lbC7 call assert_equal('1 2 3 4 5 7', getline(1)) bwipe! set virtualedit= endfunc " Make sure 'i', 'C', 'a', 'A' and 'D' works func Test_ve_ins_del() new set virtualedit=all call append(0, ["'i'", "'C'", "'a'", "'A'", "'D'"]) call cursor(1, 1) normal $4lix call assert_equal("'i' x", getline(1)) call cursor(2, 1) normal $4lCx call assert_equal("'C' x", getline(2)) call cursor(3, 1) normal $4lax call assert_equal("'a' x", getline(3)) call cursor(4, 1) normal $4lAx call assert_equal("'A'x", getline(4)) call cursor(5, 1) normal $4lDix call assert_equal("'D' x", getline(5)) bwipe! set virtualedit= endfunc " Test for yank bug reported by Mark Waggoner. func Test_yank_block() new set virtualedit=block call append(0, repeat(['this is a test'], 3)) exe "normal gg^2w\<C-V>3jy" call assert_equal("a\na\na\n ", @") bwipe! set virtualedit= endfunc " Test "r" beyond the end of the line func Test_replace_after_eol() new set virtualedit=all call append(0, '"r"') normal gg$5lrxa call assert_equal('"r" x', getline(1)) " visual block replace %d _ call setline(1, ['a', '', 'b']) exe "normal 2l\<C-V>2jrx" call assert_equal(['a x', ' x', 'b x'], getline(1, '$')) " visual characterwise selection replace after eol %d _ call setline(1, 'a') normal 4lv2lrx call assert_equal('a xxx', getline(1)) bwipe! set virtualedit= endfunc " Test "r" on a tab " Note that for this test, 'ts' must be 8 (the default). func Test_replace_on_tab() new set virtualedit=all call append(0, "'r'\t") normal gg^5lrxAy call assert_equal("'r' x y", getline(1)) call setline(1, 'aaaaaaaaaaaa') exe "normal! gg2lgR\<Tab>" call assert_equal("aa\taaaa", getline(1)) bwipe! set virtualedit= endfunc " Test to make sure 'x' can delete control characters func Test_ve_del_ctrl_chars() new set virtualedit=all call append(0, "a\<C-V>b\<CR>sd") set display=uhex normal gg^xxxxxxi[text] set display= call assert_equal('[text]', getline(1)) bwipe! set virtualedit= endfunc " Test for ^Y/^E due to bad w_virtcol value, reported by " Roy <royl@netropolis.net>. func Test_ins_copy_char() new set virtualedit=all call append(0, 'abcv8efi.him2kl') exe "normal gg^O\<Esc>3li\<C-E>\<Esc>4li\<C-E>\<Esc>4li\<C-E> <--" exe "normal j^o\<Esc>4li\<C-Y>\<Esc>4li\<C-Y>\<Esc>4li\<C-Y> <--" call assert_equal(' v i m <--', getline(1)) call assert_equal(' 8 . 2 <--', getline(3)) bwipe! set virtualedit= endfunc " Test for yanking and pasting using the small delete register func Test_yank_paste_small_del_reg() new set virtualedit=all call append(0, "foo, bar") normal ggdewve"-p call assert_equal(', foo', getline(1)) bwipe! set virtualedit= endfunc " Test for delete that breaks a tab into spaces func Test_delete_break_tab() new call setline(1, "one\ttwo") set virtualedit=all normal v3ld call assert_equal(' two', getline(1)) set virtualedit& close! endfunc " Test for using <BS>, <C-W> and <C-U> in virtual edit mode " to erase character, word and line. func Test_ve_backspace() new call setline(1, 'sample') set virtualedit=all set backspace=indent,eol,start exe "normal 15|i\<BS>\<BS>" call assert_equal([0, 1, 7, 5], getpos('.')) exe "normal 15|i\<C-W>" call assert_equal([0, 1, 6, 0], getpos('.')) exe "normal 15|i\<C-U>" call assert_equal([0, 1, 1, 0], getpos('.')) set backspace& set virtualedit& close! endfunc " Test for delete (x) on EOL character and after EOL func Test_delete_past_eol() new call setline(1, "ab") set virtualedit=all exe "normal 2lx" call assert_equal('ab', getline(1)) exe "normal 10lx" call assert_equal('ab', getline(1)) set virtualedit& bw! endfunc " After calling s:TryVirtualeditReplace(), line 1 will contain one of these " two strings, depending on whether virtual editing is on or off. let s:result_ve_on = 'a x' let s:result_ve_off = 'x' " Utility function for Test_global_local_virtualedit() func s:TryVirtualeditReplace() call setline(1, 'a') normal gg7l normal rx endfunc " Test for :set and :setlocal func Test_global_local_virtualedit() new " Verify that 'virtualedit' is initialized to empty, can be set globally to " all and to empty, and can be set locally to all and to empty. call s:TryVirtualeditReplace() call assert_equal(s:result_ve_off, getline(1)) set ve=all call s:TryVirtualeditReplace() call assert_equal(s:result_ve_on, getline(1)) set ve= call s:TryVirtualeditReplace() call assert_equal(s:result_ve_off, getline(1)) setlocal ve=all call s:TryVirtualeditReplace() call assert_equal(s:result_ve_on, getline(1)) setlocal ve= call s:TryVirtualeditReplace() call assert_equal(s:result_ve_off, getline(1)) " Verify that :set affects multiple windows. split set ve=all call s:TryVirtualeditReplace() call assert_equal(s:result_ve_on, getline(1)) wincmd p call s:TryVirtualeditReplace() call assert_equal(s:result_ve_on, getline(1)) set ve= wincmd p call s:TryVirtualeditReplace() call assert_equal(s:result_ve_off, getline(1)) bwipe! " Verify that :setlocal affects only the current window. new split setlocal ve=all call s:TryVirtualeditReplace() call assert_equal(s:result_ve_on, getline(1)) wincmd p call s:TryVirtualeditReplace() call assert_equal(s:result_ve_off, getline(1)) bwipe! call s:TryVirtualeditReplace() call assert_equal(s:result_ve_off, getline(1)) " Verify that the buffer 'virtualedit' state follows the global value only " when empty and that "none" works as expected. " " 'virtualedit' State " +--------+--------------------------+ " | Local | Global | " | | | " +--------+--------+--------+--------+ " | | "" | "all" | "none" | " +--------+--------+--------+--------+ " | "" | off | on | off | " | "all" | on | on | on | " | "none" | off | off | off | " +--------+--------+--------+--------+ new setglobal ve= setlocal ve= call s:TryVirtualeditReplace() call assert_equal(s:result_ve_off, getline(1)) setlocal ve=all call s:TryVirtualeditReplace() call assert_equal(s:result_ve_on, getline(1)) setlocal ve=none call s:TryVirtualeditReplace() call assert_equal(s:result_ve_off, getline(1)) setglobal ve=all setlocal ve= call s:TryVirtualeditReplace() call assert_equal(s:result_ve_on, getline(1)) setlocal ve=all call s:TryVirtualeditReplace() call assert_equal(s:result_ve_on, getline(1)) setlocal ve=none call s:TryVirtualeditReplace() call assert_equal(s:result_ve_off, getline(1)) setlocal ve=NONE call s:TryVirtualeditReplace() call assert_equal(s:result_ve_off, getline(1)) setglobal ve=none setlocal ve= call s:TryVirtualeditReplace() call assert_equal(s:result_ve_off, getline(1)) setlocal ve=all call s:TryVirtualeditReplace() call assert_equal(s:result_ve_on, getline(1)) setlocal ve=none call s:TryVirtualeditReplace() call assert_equal(s:result_ve_off, getline(1)) bwipe! " Verify that the 'virtualedit' state is copied to new windows. new call s:TryVirtualeditReplace() call assert_equal(s:result_ve_off, getline(1)) split setlocal ve=all call s:TryVirtualeditReplace() call assert_equal(s:result_ve_on, getline(1)) split call s:TryVirtualeditReplace() call assert_equal(s:result_ve_on, getline(1)) setlocal ve= split call s:TryVirtualeditReplace() call assert_equal(s:result_ve_off, getline(1)) bwipe! setlocal virtualedit& set virtualedit& endfunc func Test_virtualedit_setlocal() enew setglobal virtualedit=all setlocal virtualedit=all normal! l redraw setlocal virtualedit=none call assert_equal(1, wincol()) setlocal virtualedit& set virtualedit& endfunc func Test_virtualedit_mouse() let save_mouse = &mouse set mouse=a set virtualedit=all botright new let row = win_screenpos(0)[0] 20vsplit wincmd p call setline(1, ["text\tword"]) redraw call test_setmouse(row, 21 + 4) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 1, 4, 0, 4], getcurpos()) call test_setmouse(row, 21 + 5) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 1, 5, 0, 5], getcurpos()) call test_setmouse(row, 21 + 6) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 1, 5, 1, 6], getcurpos()) call test_setmouse(row, 21 + 7) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 1, 5, 2, 7], getcurpos()) call test_setmouse(row, 21 + 8) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 1, 5, 3, 8], getcurpos()) call test_setmouse(row, 21 + 9) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 1, 6, 0, 9], getcurpos()) call test_setmouse(row, 21 + 12) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 1, 9, 0, 12], getcurpos()) call test_setmouse(row, 21 + 13) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 1, 10, 0, 13], getcurpos()) call test_setmouse(row, 21 + 15) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 1, 10, 2, 15], getcurpos()) call test_setmouse(row, 21 + 20) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 1, 10, 7, 20], getcurpos()) setlocal nowrap call setline(2, repeat('a', 19)) normal! j14zl redraw call test_setmouse(row, 21 + 1) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 1, 10, 2, 15], getcurpos()) call test_setmouse(row, 21 + 11) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 1, 10, 12, 25], getcurpos()) call test_setmouse(row + 1, 21 + 1) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 2, 15, 0, 15], getcurpos()) call test_setmouse(row + 1, 21 + 11) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 2, 20, 5, 25], getcurpos()) setlocal number numberwidth=2 redraw call test_setmouse(row, 21 + 3) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 1, 10, 2, 15], getcurpos()) call test_setmouse(row, 21 + 13) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 1, 10, 12, 25], getcurpos()) call test_setmouse(row + 1, 21 + 3) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 2, 15, 0, 15], getcurpos()) call test_setmouse(row + 1, 21 + 13) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 2, 20, 5, 25], getcurpos()) setlocal nonumber if has('signs') sign define Sign1 text=口 sign place 1 name=Sign1 line=1 sign place 2 name=Sign1 line=2 redraw call test_setmouse(row, 21 + 3) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 1, 10, 2, 15], getcurpos()) call test_setmouse(row, 21 + 13) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 1, 10, 12, 25], getcurpos()) call test_setmouse(row + 1, 21 + 3) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 2, 15, 0, 15], getcurpos()) call test_setmouse(row + 1, 21 + 13) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 2, 20, 5, 25], getcurpos()) sign unplace 1 sign unplace 2 sign undefine Sign1 endif wincmd h 4wincmd > normal! gg24I. redraw call test_setmouse(row + 1, 12) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 1, 24 + 9, 0, 24 + 12], getcurpos()) call test_setmouse(row + 1, 13) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 1, 24 + 10, 0, 24 + 13], getcurpos()) call test_setmouse(row + 1, 15) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 1, 24 + 10, 2, 24 + 15], getcurpos()) call test_setmouse(row + 1, 20) call feedkeys("\<LeftMouse>", "xt") call assert_equal([0, 1, 24 + 10, 7, 24 + 20], getcurpos()) bwipe! let &mouse = save_mouse set virtualedit& endfunc " this was replacing the NUL at the end of the line func Test_virtualedit_replace_after_tab() new s/\v/ 0 set ve=all let @" = '' sil! norm vPvr0 call assert_equal("\t0", getline(1)) set ve& bwipe! endfunc " vim: shiftwidth=2 sts=2 expandtab