mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-29 06:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0487: completed item not update on fuzzy completion (#29341)

Browse Source 
Problem:  completed item not update on fuzzy completion
Solution: reset compl_shown_match when at original match position
          (glepnir)

closes: vim/vim#14955

f94c9c482a

Co-authored-by: glepnir <glephunter@gmail.com>
This commit is contained in:
zeertzjq
2024-06-15 07:20:38 +08:00
committed by GitHub
parent 6e28589e00
commit 199d852d9f
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/insexpand.c
View File

@@ -1162,6 +1162,7 @@ static int ins_compl_build_pum(void)
// Need to build the popup menu list. // Need to build the popup menu list.
compl_match_arraysize = 0; compl_match_arraysize = 0;
compl_T *comp = compl_first_match; compl_T *comp = compl_first_match;
compl_T *after_first_compl = NULL;
// If it's user complete function and refresh_always, // If it's user complete function and refresh_always,
// do not use "compl_leader" as prefix filter. // do not use "compl_leader" as prefix filter.
@@ -1230,6 +1231,9 @@ static int ins_compl_build_pum(void)
} }
cur = i; cur = i;
} else if (compl_fuzzy_match) { } else if (compl_fuzzy_match) {
if (i == 0) {
after_first_compl = comp;
}
// Update the maximum fuzzy score and the shown match // Update the maximum fuzzy score and the shown match
// if the current item's score is higher // if the current item's score is higher
if (comp->cp_score > max_fuzzy_score) { if (comp->cp_score > max_fuzzy_score) {
@@ -1248,6 +1252,9 @@ static int ins_compl_build_pum(void)
|| (compl_leader == NULL || lead_len == 0))) { || (compl_leader == NULL || lead_len == 0))) {
shown_match_ok = true; shown_match_ok = true;
cur = 0; cur = 0;
if (match_at_original_text(compl_shown_match)) {
compl_shown_match = after_first_compl;
}
} }
} }

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

@@ -2620,6 +2620,13 @@ func Test_complete_fuzzy_match()
call feedkeys("S\<C-x>\<C-o>fb\<C-p>\<C-p>\<C-p>\<C-p>", 'tx') call feedkeys("S\<C-x>\<C-o>fb\<C-p>\<C-p>\<C-p>\<C-p>", 'tx')
call assert_equal('fooBaz', g:word) call assert_equal('fooBaz', g:word)
func Comp()
call complete(col('.'), ["fooBaz", "foobar", "foobala"])
return ''
endfunc
call feedkeys("i\<C-R>=Comp()\<CR>", 'tx')
call assert_equal('fooBaz', g:word)
" respect noselect " respect noselect
set completeopt+=noselect set completeopt+=noselect
call feedkeys("S\<C-x>\<C-o>fb", 'tx') call feedkeys("S\<C-x>\<C-o>fb", 'tx')
@@ -2635,6 +2642,7 @@ func Test_complete_fuzzy_match()
augroup! AAAAA_Group augroup! AAAAA_Group
delfunc OnPumChange delfunc OnPumChange
delfunc Omni_test delfunc Omni_test
delfunc Comp
unlet g:item unlet g:item
unlet g:word unlet g:word
endfunc endfunc