From 4431975210b58c6b0403ee50172bad3c8729bbb2 Mon Sep 17 00:00:00 2001 From: Shougo Matsushita Date: Sat, 10 Dec 2016 17:02:02 +0900 Subject: vim-patch:0 completion-related patches #5745 #5829 vim-patch:8.0.0058 Problem: Positioning of the popup menu is not good. Solution: Position it better. (Hirohito Higashi) https://github.com/vim/vim/commit/91e44a3305ef6bf2d43496c351dcff0a45c6bfb8 vim-patch:8.0.0099 Problem: Popup menu always appears above the cursor when it is in the lower half of the screen. (Matt Gardner) Solution: Compute the available space better. (Hirohito Higashi, closes vim/vim#1241) https://github.com/vim/vim/commit/73095288da839f7c738a49baa109773e76106806 vim-patch:8.0.0127 Problem: Cancelling completion still inserts text when formatting is done for 'textwidth'. (lacygoill) Solution: Don't format when CTRL-E was typed. (Hirohito Higashi, closes vim/vim#1312) https://github.com/vim/vim/commit/73fd4988866c3adc15b5d093efdf5e8cf70d093d vim-patch:7.4.2188 Problem: Completion does not work properly with some plugins. Solution: Revert the part related to typing CTRL-E. (closes vim/vim#972) https://github.com/vim/vim/commit/c9fb77c69244870a97384152f20845665c19fe39 vim-patch:7.4.2146 Problem: Not enough testing for popup menu. CTRL-E does not always work properly. Solution: Add more tests. When using CTRL-E check if the popup menu is visible. (Christian Brabandt) https://github.com/vim/vim/commit/472472898ab71ac80a86fedc37f8eb91461788dd vim-patch:7.4.2147 Problem: test_alot fails. Solution: Close window. https://github.com/vim/vim/commit/abb71fbd399772d467aaa7b34b958b0f975c7e65 vim-patch:7.4.2149 Problem: If a test leaves a window open a following test may fail. Solution: Always close extra windows after running a test. https://github.com/vim/vim/commit/7cba71d7e3576639679b6a3aedeeb1ac07f7f2f5 vim-patch:7.4.2321 Problem: When a test is commented out we forget about it. Solution: Let a test throw an exception with "Skipped" and list skipped test functions. (Christian Brabandt) https://github.com/vim/vim/commit/dac1947bb366ef43cd6da95acc730554e76d8b84 vim-patch:7.4.2331 Problem: Using CTRL-X CTRL-V to complete a command line from Insert mode does not work after entering an expression on the command line. Solution: Don't use "ccline" when not actually using a command line. (test by Hirohito Higashi) https://github.com/vim/vim/commit/33a80eeb859a78ba93432da6fa585786cfd77249 vim-patch:8.0.0008 Problem: Popup complete test is disabled. Solution: Enable the test and change the assert. (Hirohito Higashi) https://github.com/vim/vim/commit/9e02cfa226b2577ec867b544a1a450a428a19880 vim-patch:8.0.0047 Problem: Crash when using the preview window from an unnamed buffer. (lifepillar) Solution: Do not clear the wrong buffer. (closes vim/vim#1200) https://github.com/vim/vim/commit/50e5376926dc2ec4a26a7a16f8f0f3213c4afdf0 vim-patch:8.0.0053 Problem: No test for what 8.0.0047 fixes. Solution: Add a test. (Hirohito Higashi) https://github.com/vim/vim/commit/60ef3e81f4a54d9f7ee617d57021f0811ec8ada5 --- src/nvim/testdir/runtest.vim | 9 +- src/nvim/testdir/test_popup.vim | 381 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 352 insertions(+), 38 deletions(-) (limited to 'src/nvim/testdir') diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim index ac9774abc3..931013877d 100644 --- a/src/nvim/testdir/runtest.vim +++ b/src/nvim/testdir/runtest.vim @@ -76,6 +76,9 @@ function RunTheTest(test) let s:done += 1 try exe 'call ' . a:test + catch /^\cskipped/ + call add(s:messages, ' Skipped') + call add(s:skipped, 'SKIPPED ' . a:test . ': ' . substitute(v:exception, '^\S*\s\+', '', '')) catch call add(v:errors, 'Caught exception in ' . a:test . ': ' . v:exception . ' @ ' . v:throwpoint) endtry @@ -92,6 +95,7 @@ let s:done = 0 let s:fail = 0 let s:errors = [] let s:messages = [] +let s:skipped = [] if expand('%') =~ 'test_viml.vim' " this test has intentional s:errors, don't use try/catch. source % @@ -166,7 +170,10 @@ if s:fail > 0 call extend(s:messages, s:errors) endif -" Append messages to "messages" +" Add SKIPPED messages +call extend(s:messages, s:skipped) + +" Append messages to the file "messages" split messages call append(line('$'), '') call append(line('$'), 'From ' . g:testname . ':') diff --git a/src/nvim/testdir/test_popup.vim b/src/nvim/testdir/test_popup.vim index 8615e32cfd..50110dd622 100644 --- a/src/nvim/testdir/test_popup.vim +++ b/src/nvim/testdir/test_popup.vim @@ -1,69 +1,294 @@ " Test for completion menu -function! ComplTest() abort - call complete(1, ['source', 'soundfold']) - return '' -endfunction +let g:months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'] +let g:setting = '' -function! Test() abort - call complete(1, ['source', 'soundfold']) +func! ListMonths() + if g:setting != '' + exe ":set" g:setting + endif + let mth=copy(g:months) + let entered = strcharpart(getline('.'),0,col('.')) + if !empty(entered) + let mth=filter(mth, 'v:val=~"^".entered') + endif + call complete(1, mth) return '' -endfunction +endfunc -func Test_noinsert_complete() +func! Test_popup_complete2() + " Although the popupmenu is not visible, this does not mean completion mode + " has ended. After pressing to complete the currently typed char, Vim + " still stays in the first state of the completion (:h ins-completion-menu), + " although the popupmenu wasn't shown will remove the inserted + " completed text (:h complete_CTRL-E), while the following will behave + " like expected (:h i_CTRL-E) new - set completeopt+=noinsert - inoremap =ComplTest() - call feedkeys("i\soun\\\.", 'tx') - call assert_equal('soundfold', getline(1)) - call assert_equal('soundfold', getline(2)) - bwipe! + inoremap =ListMonths() + call append(1, ["December2015"]) + :1 + call feedkeys("aD\\\\\\\", 'tx') + call assert_equal(["Dece", "", "December2015"], getline(1,3)) + %d + bw! +endfu +func! Test_popup_complete() new - inoremap =Test() - call feedkeys("i\\\", 'tx') - call assert_equal('source', getline(1)) - bwipe! + inoremap =ListMonths() - set completeopt-=noinsert - iunmap -endfunc + " - select original typed text before the completion started + call feedkeys("aJu\\\\", 'tx') + call assert_equal(["Ju"], getline(1,2)) + %d -let g:months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'] -let g:setting = '' + " - accept current match + call feedkeys("a\". repeat("\",7). "\\", 'tx') + call assert_equal(["August"], getline(1,2)) + %d + + " - Delete one character from the inserted text (state: 1) + " TODO: This should not end the completion, but it does. + " This should according to the documentation: + " January + " but instead, this does + " Januar + " (idea is, C-L inserts the match from the popup menu + " but if the menu is closed, it will insert the character + call feedkeys("aJ\\\\", 'tx') + call assert_equal(["Januar "], getline(1,2)) + %d + + " any-non special character: Stop completion without changing the match + " and insert the typed character + call feedkeys("a\20", 'tx') + call assert_equal(["January20"], getline(1,2)) + %d + + " any-non printable, non-white character: Add this character and + " reduce number of matches + call feedkeys("aJu\\l\", 'tx') + call assert_equal(["Jul"], getline(1,2)) + %d + + " any-non printable, non-white character: Add this character and + " reduce number of matches + call feedkeys("aJu\\l\\", 'tx') + call assert_equal(["July"], getline(1,2)) + %d + + " any-non printable, non-white character: Add this character and + " reduce number of matches + call feedkeys("aJu\\l\", 'tx') + call assert_equal(["Jul"], getline(1,2)) + %d + + " - Delete one character from the inserted text (state: 2) + call feedkeys("a\\\", 'tx') + call assert_equal(["Februar"], getline(1,2)) + %d + + " - Insert one character from the current match + call feedkeys("aJ\".repeat("\",3)."\\", 'tx') + call assert_equal(["J "], getline(1,2)) + %d + + " - Insert one character from the current match + call feedkeys("aJ\".repeat("\",4)."\\", 'tx') + call assert_equal(["January "], getline(1,2)) + %d + + " - Accept current selected match + call feedkeys("aJ\\\", 'tx') + call assert_equal(["January"], getline(1,2)) + %d + + " - End completion, go back to what was there before selecting a match + call feedkeys("aJu\\\", 'tx') + call assert_equal(["Ju"], getline(1,2)) + %d + + " - Select a match several entries back + call feedkeys("a\\\\", 'tx') + call assert_equal([""], getline(1,2)) + %d + + " - Select a match several entries back + call feedkeys("a\\\\\", 'tx') + call assert_equal(["December"], getline(1,2)) + %d + + " - Select a match several entries back + call feedkeys("a\\\\\\", 'tx') + call assert_equal(["February"], getline(1,2)) + %d + + " - Select a match several entries further + call feedkeys("a\\\\", 'tx') + call assert_equal(["November"], getline(1,2)) + %d + + " - Select a match several entries further + call feedkeys("a\\\\\", 'tx') + call assert_equal(["December"], getline(1,2)) + %d + + " - Select a match several entries further + call feedkeys("a\\\\\\", 'tx') + call assert_equal([""], getline(1,2)) + %d + + " - Select a match several entries further + call feedkeys("a\".repeat("\",4)."\\", 'tx') + call assert_equal(["October"], getline(1,2)) + %d + + " - Select a match don't insert yet + call feedkeys("a\\\\", 'tx') + call assert_equal([""], getline(1,2)) + %d + + " - Select a match don't insert yet + call feedkeys("a\\\\\", 'tx') + call assert_equal(["December"], getline(1,2)) + %d + + " - Select a match don't insert yet + call feedkeys("a\\\\\\", 'tx') + call assert_equal(["November"], getline(1,2)) + %d + + " - Stop completion and insert the match + call feedkeys("a\\\\", 'tx') + call assert_equal(["January "], getline(1,2)) + %d + + " - Stop completion and insert the match + call feedkeys("a\".repeat("\",5)." \", 'tx') + call assert_equal(["September "], getline(1,2)) + %d + + " - Use the text and insert line break (state: 1) + call feedkeys("a\\\", 'tx') + call assert_equal(["January", ''], getline(1,2)) + %d + + " - Insert the current selected text (state: 2) + call feedkeys("a\".repeat("\",5)."\\", 'tx') + call assert_equal(["September"], getline(1,2)) + %d + + " Insert match immediately, if there is only one match + " selects a character from the line above + call append(0, ["December2015"]) + call feedkeys("aD\\\\\\\", 'tx') + call assert_equal(["December2015", "December2015", ""], getline(1,3)) + %d + + " use menuone for 'completeopt' + " Since for the first the menu is still shown, will only select + " three letters from the line above + set completeopt&vim + set completeopt+=menuone + call append(0, ["December2015"]) + call feedkeys("aD\\\\\\\", 'tx') + call assert_equal(["December2015", "December201", ""], getline(1,3)) + %d + + " use longest for 'completeopt' + set completeopt&vim + call feedkeys("aM\\\\\\", 'tx') + set completeopt+=longest + call feedkeys("aM\\\\\\", 'tx') + call assert_equal(["M", "Ma", ""], getline(1,3)) + %d + + " use noselect/noinsert for 'completeopt' + set completeopt&vim + call feedkeys("aM\\\", 'tx') + set completeopt+=noselect + call feedkeys("aM\\\", 'tx') + set completeopt-=noselect completeopt+=noinsert + call feedkeys("aM\\\", 'tx') + call assert_equal(["March", "M", "March"], getline(1,4)) + %d +endfu -func ListMonths() - if g:setting != '' - exe ":set" g:setting - endif - call complete(col('.'), g:months) - return '' -endfunc func! Test_popup_completion_insertmode() - inoremap =ListMonths() new - call feedkeys("a\\\\", 'tx') + inoremap =ListMonths() + + call feedkeys("a\\\\", 'tx') call assert_equal('February', getline(1)) %d + " Set noinsertmode let g:setting = 'noinsertmode' - call feedkeys("a\\\\", 'tx') + call feedkeys("a\\\\", 'tx') call assert_equal('February', getline(1)) call assert_false(pumvisible()) %d + " Go through all matches, until none is selected let g:setting = '' - call feedkeys("a\". repeat("\",12)."\\", 'tx') + call feedkeys("a\". repeat("\",12)."\\", 'tx') call assert_equal('', getline(1)) %d - call feedkeys("a\\\\", 'tx') + " select previous entry + call feedkeys("a\\\\", 'tx') call assert_equal('', getline(1)) %d - call feedkeys("a\\\\\", 'tx') + " select last entry + call feedkeys("a\\\\\", 'tx') call assert_equal('December', getline(1)) + + iunmap +endfunc + +func Test_noinsert_complete() + function! s:complTest1() abort + call complete(1, ['source', 'soundfold']) + return '' + endfunction + + function! s:complTest2() abort + call complete(1, ['source', 'soundfold']) + return '' + endfunction + + new + set completeopt+=noinsert + inoremap =s:complTest1() + call feedkeys("i\soun\\\.", 'tx') + call assert_equal('soundfold', getline(1)) + call assert_equal('soundfold', getline(2)) + bwipe! + + new + inoremap =s:complTest2() + call feedkeys("i\\\", 'tx') + call assert_equal('source', getline(1)) bwipe! + + set completeopt-=noinsert iunmap endfunc +func Test_compl_vim_cmds_after_register_expr() + function! s:test_func() + return 'autocmd ' + endfunction + augroup AAAAA_Group + au! + augroup END + + new + call feedkeys("i\=s:test_func()\\\\", 'tx') + call assert_equal('autocmd AAAAA_Group', getline(1)) + autocmd! AAAAA_Group + augroup! AAAAA_Group + bwipe! +endfunc + func DummyCompleteOne(findstart, base) if a:findstart return 0 @@ -153,7 +378,7 @@ func DummyCompleteFour(findstart, base) endif endfunc -:"Test that 'completefunc' works when it's OK. +" Test that 'omnifunc' works when it's OK. func Test_omnifunc_with_check() new setlocal omnifunc=DummyCompleteFour @@ -175,4 +400,86 @@ func Test_omnifunc_with_check() q! endfunc +function UndoComplete() + call complete(1, ['January', 'February', 'March', + \ 'April', 'May', 'June', 'July', 'August', 'September', + \ 'October', 'November', 'December']) + return '' +endfunc + +" Test that no undo item is created when no completion is inserted +func Test_complete_no_undo() + set completeopt=menu,preview,noinsert,noselect + inoremap =UndoComplete() + new + call feedkeys("ixxx\\yyy\k", 'xt') + call feedkeys("iaaa\0", 'xt') + call assert_equal('aaa', getline(2)) + call feedkeys("i\\", 'xt') + call assert_equal('aaa', getline(2)) + call feedkeys("u", 'xt') + call assert_equal('', getline(2)) + + call feedkeys("ibbb\0", 'xt') + call assert_equal('bbb', getline(2)) + call feedkeys("A\\\\", 'xt') + call assert_equal('January', getline(2)) + call feedkeys("u", 'xt') + call assert_equal('bbb', getline(2)) + + call feedkeys("A\\\", 'xt') + call assert_equal('January', getline(2)) + call feedkeys("u", 'xt') + call assert_equal('bbb', getline(2)) + + iunmap + set completeopt& + q! +endfunc + +function! DummyCompleteFive(findstart, base) + if a:findstart + return 0 + else + return [ + \ { 'word': 'January', 'info': "info1-1\n1-2\n1-3" }, + \ { 'word': 'February', 'info': "info2-1\n2-2\n2-3" }, + \ { 'word': 'March', 'info': "info3-1\n3-2\n3-3" }, + \ { 'word': 'April', 'info': "info4-1\n4-2\n4-3" }, + \ { 'word': 'May', 'info': "info5-1\n5-2\n5-3" }, + \ ] + endif +endfunc + +" Test that 'completefunc' on Scratch buffer with preview window works when +" it's OK. +func Test_completefunc_with_scratch_buffer() + new +setlocal\ buftype=nofile\ bufhidden=wipe\ noswapfile + set completeopt+=preview + setlocal completefunc=DummyCompleteFive + call feedkeys("A\\\\\\", "x") + call assert_equal(['April'], getline(1, '$')) + pclose + q! + set completeopt& +endfunc + +" - select original typed text before the completion started without +" auto-wrap text. +func Test_completion_ctrl_e_without_autowrap() + new + let tw_save=&tw + set tw=78 + let li = [ + \ '" zzz', + \ '" zzzyyyyyyyyyyyyyyyyyyy'] + call setline(1, li) + 0 + call feedkeys("A\\\\", "tx") + call assert_equal(li, getline(1, '$')) + + let &tw=tw_save + q! +endfunc + " vim: shiftwidth=2 sts=2 expandtab -- cgit