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.1053: "nosort" enables fuzzy filtering even if "fuzzy" isn't in 'completeopt'

Browse Source 
Problem:  "nosort" enables fuzzy filtering even if "fuzzy" isn't in
          'completeopt' (after v9.1.1049)
Solution: Only enable fuzzy filtering when "fuzzy" is in 'completeopt'.
          (zeertzjq)

closes: vim/vim#16510

d65aa1bbdb
This commit is contained in:
zeertzjq 2025-01-25 22:34:54 +08:00
parent 63aa167f94
commit 689c23b2ac
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/insexpand.c
View File

@ -1212,8 +1212,8 @@ static int ins_compl_build_pum(void)
int max_fuzzy_score = 0;
unsigned cur_cot_flags = get_cot_flags();
bool compl_no_select = (cur_cot_flags & kOptCotFlagNoselect) != 0;
bool fuzzy_nosort = (cur_cot_flags & kOptCotFlagNosort) != 0;
bool fuzzy_filter = fuzzy_nosort || (cur_cot_flags & kOptCotFlagFuzzy) != 0;
bool fuzzy_filter = (cur_cot_flags & kOptCotFlagFuzzy) != 0;
bool fuzzy_sort = fuzzy_filter && !(cur_cot_flags & kOptCotFlagNosort);
compl_T *match_head = NULL, *match_tail = NULL;
// If the current match is the original text don't find the first
@ -1268,13 +1268,13 @@ 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_nosort && comp->cp_score > max_fuzzy_score) {
if (fuzzy_sort && comp->cp_score > max_fuzzy_score) {
did_find_shown_match = true;
max_fuzzy_score = comp->cp_score;
if (!compl_no_select) {
compl_shown_match = comp;
}
} else if (fuzzy_nosort && i == 0 && !compl_no_select) {
} else if (!fuzzy_sort && i == 0 && !compl_no_select) {
compl_shown_match = shown_compl;
}
if (!shown_match_ok && comp == compl_shown_match && !compl_no_select) {
@ -1326,7 +1326,7 @@ static int ins_compl_build_pum(void)
comp = match_next;
}
if (fuzzy_filter && !fuzzy_nosort && compl_leader.data != NULL && compl_leader.size > 0) {
if (fuzzy_sort && compl_leader.data != NULL && compl_leader.size > 0) {
for (i = 0; i < compl_match_arraysize; i++) {
compl_match_array[i].pum_idx = i;
}

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

@ -2839,8 +2839,8 @@ func Test_complete_fuzzy_match()
" test case for nosort option
set cot=menuone,menu,noinsert,fuzzy,nosort
" fooBaz" should have a higher score when the leader is "fb".
" With `nosort`, "foobar" should still be shown first in the popup menu.
" "fooBaz" should have a higher score when the leader is "fb".
" With "nosort", "foobar" should still be shown first in the popup menu.
call feedkeys("S\<C-x>\<C-o>fb", 'tx')
call assert_equal('foobar', g:word)
call feedkeys("S\<C-x>\<C-o>好", 'tx')
@ -2852,6 +2852,11 @@ func Test_complete_fuzzy_match()
call feedkeys("S\<C-x>\<C-o>好\<C-N>", 'tx')
call assert_equal('你好吗', g:word)
" "nosort" shouldn't enable fuzzy filtering when "fuzzy" isn't present.
set cot=menuone,noinsert,nosort
call feedkeys("S\<C-x>\<C-o>fooB\<C-Y>", 'tx')
call assert_equal('fooBaz', getline('.'))
" clean up
set omnifunc=
bw!