PublicArchive/neovim
2
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-05-06 16:29:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.2.0380: completion: a few issues in completion code (#39264)

Browse Source 
Problem: ins_compl_stop() sets compl_best_matches = 0, but that's a
         pointer, should reset compl_num_bests instead,
         find_common_prefix() reads cpt_sources_array[cur_source] without
         checking cur_source != -1 which causes an OOB for -1,
         find_next_completion_match(): second `if` in the pending loop
         should be `else if`. Forward paging only moves one step per call.

Solution: Reset compl_num_bests instead, add a check for cur_source not
          equal -1, change if to else if (glepnir)

closes: vim/vim#20000

https://github.com/vim/vim/commit/b328686d6a1eae1c519a0cdc0420c0d87b6d1fd1

Co-authored-by: glepnir <glephunter@gmail.com>
(cherry picked from commit 3f9500e75d)
This commit is contained in:
zeertzjq
2026-04-21 09:18:30 +08:00
committed by github-actions[bot]
parent f7e3cf127c
commit 187a34d59b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nvim/insexpand.c
+4 -4
View File
@@ -2701,7 +2701,7 @@ static bool ins_compl_stop(const int c, const int prev_mode, bool retval)
}
compl_autocomplete = false;
compl_from_nonkeyword = false;
compl_best_matches = 0;
compl_num_bests = 0;
compl_ins_end_col = 0;
if (c == Ctrl_C && cmdwin_type != 0) {
@@ -5053,7 +5053,8 @@ static char *find_common_prefix(size_t *prefix_len, bool curbuf_only)
}
if (!match_limit_exceeded
&& (!curbuf_only || cpt_sources_array[cur_source].cs_flag == '.')) {
&& (!curbuf_only || (cur_source != -1
&& cpt_sources_array[cur_source].cs_flag == '.'))) {
if (first == NULL && strncmp(ins_compl_leader(), compl->cp_str.data,
ins_compl_leader_len()) == 0) {
first = compl->cp_str.data;
@@ -5286,8 +5287,7 @@ static int find_next_completion_match(bool allow_get_expansion, int todo, bool a
if (compl_pending > 0 && compl_shown_match->cp_next != NULL) {
compl_shown_match = compl_shown_match->cp_next;
compl_pending--;
}
if (compl_pending < 0 && compl_shown_match->cp_prev != NULL) {
} else if (compl_pending < 0 && compl_shown_match->cp_prev != NULL) {
compl_shown_match = compl_shown_match->cp_prev;
compl_pending++;
} else {