mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-08-26 09:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.2.1007: fuzzy completion list wrongly sorted after complete() (#41498)

Browse Source 
Problem:  With 'completeopt' "fuzzy", a re-sort after complete() leaves the
          last match unsorted at the end of the list.
Solution: Find the original text by its flag instead of assuming
          compl_shows_dir points at it.

closes: vim/vim#21103

7e74722999
This commit is contained in:
glepnir
2026-08-26 12:32:09 +08:00
committed by GitHub
parent 35ae925da9
commit f97bcbdf77
2 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/nvim/insexpand.c
View File

@@ -671,6 +671,23 @@ static bool is_first_match(const compl_T *const match)
return match == compl_first_match;
}
/// Return the entry holding the original text, NULL if not found.
/// It is the first item, or the last one for backward completion.
static compl_T *find_original_text_match(void)
{
if (compl_first_match == NULL) {
return NULL;
}
if (match_at_original_text(compl_first_match)) {
return compl_first_match;
}
if (compl_first_match->cp_prev != NULL
&& match_at_original_text(compl_first_match->cp_prev)) {
return compl_first_match->cp_prev;
}
return NULL;
}
static void do_autocmd_completedone(int c, int mode, String *word)
{
save_v_event_T save_v_event;
@@ -1617,16 +1634,20 @@ static void set_fuzzy_score(void)
} while (comp != NULL && !is_first_match(comp));
}
/// Sort completion matches, excluding the node that contains the leader.
/// Sort completion matches, leaving the entry with the original text in place.
static void sort_compl_match_list(MergeSortCompareFunc compare)
{
if (!compl_first_match || is_first_match(compl_first_match->cp_next)) {
return;
}
compl_T *comp = compl_first_match->cp_prev;
compl_T *orig_text = find_original_text_match();
if (orig_text == NULL) {
return;
}
ins_compl_make_linear();
if (compl_shows_dir_forward()) {
if (orig_text == compl_first_match) {
compl_first_match->cp_next->cp_prev = NULL;
compl_first_match->cp_next = mergesort_list(compl_first_match->cp_next,
cp_get_next, cp_set_next,
@@ -1634,15 +1655,15 @@ static void sort_compl_match_list(MergeSortCompareFunc compare)
compare);
compl_first_match->cp_next->cp_prev = compl_first_match;
} else {
comp->cp_prev->cp_next = NULL;
orig_text->cp_prev->cp_next = NULL;
compl_first_match = mergesort_list(compl_first_match, cp_get_next, cp_set_next,
cp_get_prev, cp_set_prev, compare);
compl_T *tail = compl_first_match;
while (tail->cp_next != NULL) {
tail = tail->cp_next;
}
tail->cp_next = comp;
comp->cp_prev = tail;
tail->cp_next = orig_text;
orig_text->cp_prev = tail;
}
(void)ins_compl_make_cyclic();
}
@@ -2573,16 +2594,13 @@ static void ins_compl_set_original_text(char *str, size_t len)
FUNC_ATTR_NONNULL_ALL
{
// Replace the original text entry.
// The CP_ORIGINAL_TEXT flag is either at the first item or might possibly
// be at the last item for backward completion
if (match_at_original_text(compl_first_match)) { // safety check
API_CLEAR_STRING(compl_first_match->cp_str);
compl_first_match->cp_str = cbuf_to_string(str, len);
} else if (compl_first_match->cp_prev != NULL
&& match_at_original_text(compl_first_match->cp_prev)) {
API_CLEAR_STRING(compl_first_match->cp_prev->cp_str);
compl_first_match->cp_prev->cp_str = cbuf_to_string(str, len);
compl_T *match = find_original_text_match();
if (match == NULL) {
return;
}
API_CLEAR_STRING(match->cp_str);
match->cp_str = cbuf_to_string(str, len);
}
/// Append one character to the match leader. May reduce the number of

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

@@ -6851,4 +6851,21 @@ func Test_complete_info_hlgroup()
bwipe!
endfunc
func Test_complete_fuzzy_resort()
new
set completeopt=menu,menuone,noselect,fuzzy
inoremap <buffer> <F5> <Cmd>call complete(1, ['xxxb', 'xb', 'b'])<CR>
call feedkeys("i\<F5>b\<C-R>=string(map(complete_info(['items']).items, 'v:val.word'))\<CR>\<Esc>", 'tx')
call assert_equal("b['b', 'xb', 'xxxb']", getline(1))
%d _
call setline(1, ['xxxbar', 'xbar', 'bar'])
call feedkeys("Go\<C-P>b\<C-R>=string(map(complete_info(['items']).items, 'v:val.word'))\<CR>\<Esc>", 'tx')
call assert_equal("b['bar', 'xbar', 'xxxbar']", getline('$'))
bwipe!
set completeopt&
endfunc
" vim: shiftwidth=2 sts=2 expandtab nofoldenable