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.0484: Sorting of completeopt+=fuzzy is not stable (#29338)

Browse Source 
Problem:  Sorting of completeopt+=fuzzy is not stable.
Solution: Compare original indexes when scores are the same.
          (zeertzjq)

closes: vim/vim#14988

8e56747fd2
This commit is contained in:
zeertzjq 2024-06-15 04:33:19 +08:00 committed by GitHub
parent aa47af7e69
commit fd950d4998
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/insexpand.c
View File

@ -1144,11 +1144,13 @@ static void trigger_complete_changed_event(int cur)
}
/// pumitem qsort compare func
static int ins_compl_fuzzy_sort(const void *a, const void *b)
static int ins_compl_fuzzy_cmp(const void *a, const void *b)
{
const int sa = (*(pumitem_T *)a).pum_score;
const int sb = (*(pumitem_T *)b).pum_score;
return sa == sb ? 0 : sa < sb ? 1 : -1;
const int ia = (*(pumitem_T *)a).pum_idx;
const int ib = (*(pumitem_T *)b).pum_idx;
return sa == sb ? (ia == ib ? 0 : (ia < ib ? -1 : 1)) : (sa < sb ? 1 : -1);
}
/// Build a popup menu to show the completion matches.
@ -1284,9 +1286,12 @@ static int ins_compl_build_pum(void)
} while (comp != NULL && !is_first_match(comp));
if (compl_fuzzy_match && compl_leader != NULL && lead_len > 0) {
for (i = 0; i < compl_match_arraysize; i++) {
compl_match_array[i].pum_idx = i;
}
// sort by the largest score of fuzzy match
qsort(compl_match_array, (size_t)compl_match_arraysize, sizeof(pumitem_T),
ins_compl_fuzzy_sort);
ins_compl_fuzzy_cmp);
}
if (!shown_match_ok) { // no displayed match at all

1
src/nvim/popupmenu.h
View File

@ -15,6 +15,7 @@ typedef struct {
char *pum_extra; ///< extra menu text (may be truncated)
char *pum_info; ///< extra info
int pum_score; ///< fuzzy match score
int pum_idx; ///< index of item before sorting by score
} pumitem_T;
EXTERN ScreenGrid pum_grid INIT( = SCREEN_GRID_INIT);

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

@ -2639,4 +2639,24 @@ func Test_complete_fuzzy_match()
unlet g:word
endfunc
" Check that tie breaking is stable for completeopt+=fuzzy (which should
" behave the same on different platforms).
func Test_complete_fuzzy_match_tie()
new
set completeopt+=fuzzy,noselect
call setline(1, ['aaabbccc', 'aaabbCCC', 'aaabbcccc', 'aaabbCCCC', ''])
call feedkeys("Gcc\<C-X>\<C-N>ab\<C-N>\<C-Y>", 'tx')
call assert_equal('aaabbccc', getline('.'))
call feedkeys("Gcc\<C-X>\<C-N>ab\<C-N>\<C-N>\<C-Y>", 'tx')
call assert_equal('aaabbCCC', getline('.'))
call feedkeys("Gcc\<C-X>\<C-N>ab\<C-N>\<C-N>\<C-N>\<C-Y>", 'tx')
call assert_equal('aaabbcccc', getline('.'))
call feedkeys("Gcc\<C-X>\<C-N>ab\<C-N>\<C-N>\<C-N>\<C-N>\<C-Y>", 'tx')
call assert_equal('aaabbCCCC', getline('.'))
bwipe!
set completeopt&
endfunc
" vim: shiftwidth=2 sts=2 expandtab nofoldenable