aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-24 10:45:12 -04:00
Code

patch 9.1.0487: completed item not update on fuzzy completion

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

closes: #14955

Signed-off-by: glepnir <glephunter@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
glepnir 2024-06-14 21:11:56 +02:00 committed by Christian Brabandt
parent 82a579e15a
commit f94c9c482a
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/insexpand.c
View File

@ -1222,6 +1222,7 @@ ins_compl_build_pum(void)
{ {
compl_T *compl; compl_T *compl;
compl_T *shown_compl = NULL; compl_T *shown_compl = NULL;
compl_T *after_first_compl = NULL;
int did_find_shown_match = FALSE; int did_find_shown_match = FALSE;
int shown_match_ok = FALSE; int shown_match_ok = FALSE;
int i; int i;
@ -1298,6 +1299,8 @@ ins_compl_build_pum(void)
} }
else if (compl_fuzzy_match) else if (compl_fuzzy_match)
{ {
if (i == 0)
after_first_compl = compl;
// 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 (compl->cp_score > max_fuzzy_score) if (compl->cp_score > max_fuzzy_score)
@ -1318,6 +1321,8 @@ ins_compl_build_pum(void)
{ {
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
src/testdir/test_ins_complete.vim
View File

@ -2559,6 +2559,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')
@ -2574,6 +2581,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

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
487,
/**/ /**/
486, 486,
/**/ /**/