IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0447: completion may be wrong when deleting all chars (#29040)

Browse Source 
Problem:  completion may be wrong when deleting all chars.
Solution: reset compl_shown_match (glepnir).

closes: https://github.com/vim/vim/pull/14854

53387c55a1
This commit is contained in:
glepnir 2024-05-27 22:02:24 +08:00 committed by GitHub
parent 48251134ee
commit dbc2678f46
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/insexpand.c
View File

@ -1198,6 +1198,10 @@ static int ins_compl_build_pum(void)
// match after it, don't highlight anything. // match after it, don't highlight anything.
bool shown_match_ok = match_at_original_text(compl_shown_match); bool shown_match_ok = match_at_original_text(compl_shown_match);
if (strequal(compl_leader, compl_orig_text) && !shown_match_ok) {
compl_shown_match = compl_no_select ? compl_first_match : compl_first_match->cp_next;
}
compl_T *shown_compl = NULL; compl_T *shown_compl = NULL;
bool did_find_shown_match = false; bool did_find_shown_match = false;
int cur = -1; int cur = -1;

16
test/old/testdir/test_ins_complete.vim
View File

@ -700,14 +700,14 @@ func Test_pum_with_preview_win()
CheckScreendump CheckScreendump
let lines =<< trim END let lines =<< trim END
funct Omni_test(findstart, base) funct Omni_test(findstart, base)
if a:findstart if a:findstart
return col(".") - 1 return col(".") - 1
endif endif
return [#{word: "one", info: "1info"}, #{word: "two", info: "2info"}, #{word: "three", info: "3info"}] return [#{word: "one", info: "1info"}, #{word: "two", info: "2info"}, #{word: "three", info: "3info"}]
endfunc endfunc
set omnifunc=Omni_test set omnifunc=Omni_test
set completeopt+=longest set completeopt+=longest
END END
call writefile(lines, 'Xpreviewscript') call writefile(lines, 'Xpreviewscript')

2
test/old/testdir/test_popup.vim
View File

@ -1178,6 +1178,8 @@ func Test_CompleteChanged()
set completeopt=menu,menuone set completeopt=menu,menuone
call feedkeys("i\<C-X>\<C-O>\<BS>\<BS>\<BS>f", 'tx') call feedkeys("i\<C-X>\<C-O>\<BS>\<BS>\<BS>f", 'tx')
call assert_equal('five', g:word) call assert_equal('five', g:word)
call feedkeys("i\<C-X>\<C-O>\<BS>\<BS>\<BS>f\<BS>", 'tx')
call assert_equal('one', g:word)
autocmd! AAAAA_Group autocmd! AAAAA_Group
set complete& completeopt& set complete& completeopt&