diff options
| author | glepnir <glephunter@gmail.com> | 2025-04-03 14:09:49 +0800 |
|---|---|---|
| committer | glepnir <glephunter@gmail.com> | 2025-04-03 14:21:37 +0800 |
| commit | 8cf413e450bfbe1a9887f2bbf869bf9462403a77 (patch) | |
| tree | ad8d1a7d6e7448e78b78f1d09e5f80270e2f645a | |
| parent | 18caa5fb239542107f27c054e54e0bf3a33a2278 (diff) | |
| download | rneovim-8cf413e450bfbe1a9887f2bbf869bf9462403a77.tar.gz rneovim-8cf413e450bfbe1a9887f2bbf869bf9462403a77.tar.bz2 rneovim-8cf413e450bfbe1a9887f2bbf869bf9462403a77.zip | |
vim-patch:9.1.1269: completion: compl_shown_match is updated when starting keyword completion
Problem: compl_shown_match is updated when starting keyword completion
and does not include fuzzy matching.
Solution: Do not update compl_shown_match when starting keyword
completion, since it is the one already selected by the
keyword completion direction. (glepnir)
closes: vim/vim#17033
https://github.com/vim/vim/commit/e4e4d1c381e9d0af55f6111e9bcaf98ad60461fc
Co-authored-by: glepnir <glephunter@gmail.com>
| -rw-r--r-- | src/nvim/insexpand.c | 8 | ||||
| -rw-r--r-- | test/old/testdir/test_ins_complete.vim | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/nvim/insexpand.c b/src/nvim/insexpand.c index 422eb409fe..9049b1f298 100644 --- a/src/nvim/insexpand.c +++ b/src/nvim/insexpand.c @@ -1291,6 +1291,12 @@ static int ins_compl_build_pum(void) // match after it, don't highlight anything. bool shown_match_ok = match_at_original_text(compl_shown_match); + bool update_shown_match = fuzzy_filter; + if (fuzzy_filter && ctrl_x_mode_normal() + && compl_leader.data == NULL && compl_shown_match->cp_score > 0) { + update_shown_match = false; + } + if (strequal(compl_leader.data, compl_orig_text.data) && !shown_match_ok) { compl_shown_match = compl_no_select ? compl_first_match : compl_first_match->cp_next; } @@ -1339,7 +1345,7 @@ static int ins_compl_build_pum(void) } // Update the maximum fuzzy score and the shown match // if the current item's score is higher - if (fuzzy_sort && comp->cp_score > max_fuzzy_score) { + if (fuzzy_sort && comp->cp_score > max_fuzzy_score && update_shown_match) { did_find_shown_match = true; max_fuzzy_score = comp->cp_score; if (!compl_no_select) { diff --git a/test/old/testdir/test_ins_complete.vim b/test/old/testdir/test_ins_complete.vim index 0e4f051f5a..187d0acc00 100644 --- a/test/old/testdir/test_ins_complete.vim +++ b/test/old/testdir/test_ins_complete.vim @@ -2861,6 +2861,12 @@ func Test_complete_opt_fuzzy() call feedkeys("i\<C-R>=CompAnother()\<CR>\<C-P>\<C-P>", 'tx') call assert_equal("for", g:abbr) + set cot=menu,fuzzy + call feedkeys("Sblue\<CR>bar\<CR>b\<C-X>\<C-P>\<C-Y>\<ESC>", 'tx') + call assert_equal('bar', getline('.')) + call feedkeys("Sb\<C-X>\<C-N>\<C-Y>\<ESC>", 'tx') + call assert_equal('blue', getline('.')) + " clean up set omnifunc= bw! |