diff options
| -rw-r--r-- | src/nvim/insexpand.c | 7 | ||||
| -rw-r--r-- | test/old/testdir/test_ins_complete.vim | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/nvim/insexpand.c b/src/nvim/insexpand.c index 9b6805404f..04e4a59f54 100644 --- a/src/nvim/insexpand.c +++ b/src/nvim/insexpand.c @@ -1162,6 +1162,7 @@ static int ins_compl_build_pum(void) // Need to build the popup menu list. compl_match_arraysize = 0; compl_T *comp = compl_first_match; + compl_T *after_first_compl = NULL; // If it's user complete function and refresh_always, // do not use "compl_leader" as prefix filter. @@ -1230,6 +1231,9 @@ static int ins_compl_build_pum(void) } cur = i; } else if (compl_fuzzy_match) { + if (i == 0) { + after_first_compl = comp; + } // Update the maximum fuzzy score and the shown match // if the current item's score is higher if (comp->cp_score > max_fuzzy_score) { @@ -1248,6 +1252,9 @@ static int ins_compl_build_pum(void) || (compl_leader == NULL || lead_len == 0))) { shown_match_ok = true; cur = 0; + if (match_at_original_text(compl_shown_match)) { + compl_shown_match = after_first_compl; + } } } diff --git a/test/old/testdir/test_ins_complete.vim b/test/old/testdir/test_ins_complete.vim index ac08da9743..f8fed8d16c 100644 --- a/test/old/testdir/test_ins_complete.vim +++ b/test/old/testdir/test_ins_complete.vim @@ -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 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 set completeopt+=noselect call feedkeys("S\<C-x>\<C-o>fb", 'tx') @@ -2635,6 +2642,7 @@ func Test_complete_fuzzy_match() augroup! AAAAA_Group delfunc OnPumChange delfunc Omni_test + delfunc Comp unlet g:item unlet g:word endfunc |