aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-11-16 23:24:03 -05:00
Code Activity

patch 9.0.2018: complete_info() returns wrong index

Browse Source 
Problem:  complete_info() returns wrong index
Solution: Make order of 'info' in completion_info consistent

Start the iteration from the same point and follow the same direction as
done when assigning the completion numbers. This way we remove the
dependence on the completion direction and make the order of 'info'
consistent.

closes: #12230
closes: #12971

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: LemonBoy <thatlemon@gmail.com>
This commit is contained in:
LemonBoy
2023-10-11 21:55:56 +02:00
committed by Christian Brabandt
parent dd75fcfbdf
commit 69fb5afb3b
3 changed files with 79 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/insexpand.c
View File

@@ -3040,6 +3040,43 @@ ins_compl_update_sequence_numbers(void)
}
}
static int
info_add_completion_info(list_T *li)
{
compl_T *match;
if (compl_first_match == NULL)
return OK;
// Skip the element with the CP_ORIGINAL_TEXT flag at the beginning, in case of
// forward completion, or at the end, in case of backward completion.
match = compl_dir_forward()
? compl_first_match->cp_next : compl_first_match->cp_prev->cp_prev;
while (match != NULL && !match_at_original_text(match))
{
dict_T *di = dict_alloc();
if (di == NULL)
return FAIL;
if (list_append_dict(li, di) == FAIL)
return FAIL;
dict_add_string(di, "word", match->cp_str);
dict_add_string(di, "abbr", match->cp_text[CPT_ABBR]);
dict_add_string(di, "menu", match->cp_text[CPT_MENU]);
dict_add_string(di, "kind", match->cp_text[CPT_KIND]);
dict_add_string(di, "info", match->cp_text[CPT_INFO]);
if (match->cp_user_data.v_type == VAR_UNKNOWN)
// Add an empty string for backwards compatibility
dict_add_string(di, "user_data", (char_u *)"");
else
dict_add_tv(di, "user_data", &match->cp_user_data);
match = compl_dir_forward() ? match->cp_next : match->cp_prev;
}
return OK;
}
/*
* Get complete information
*/
@@ -3088,41 +3125,13 @@ get_complete_info(list_T *what_list, dict_T *retdict)
if (ret == OK && (what_flag & CI_WHAT_ITEMS))
{
list_T *li;
dict_T *di;
compl_T *match;
li = list_alloc();
if (li == NULL)
return;
ret = dict_add_list(retdict, "items", li);
if (ret == OK && compl_first_match != NULL)
{
match = compl_first_match;
do
{
if (!match_at_original_text(match))
{
di = dict_alloc();
if (di == NULL)
return;
ret = list_append_dict(li, di);
if (ret != OK)
return;
dict_add_string(di, "word", match->cp_str);
dict_add_string(di, "abbr", match->cp_text[CPT_ABBR]);
dict_add_string(di, "menu", match->cp_text[CPT_MENU]);
dict_add_string(di, "kind", match->cp_text[CPT_KIND]);
dict_add_string(di, "info", match->cp_text[CPT_INFO]);
if (match->cp_user_data.v_type == VAR_UNKNOWN)
// Add an empty string for backwards compatibility
dict_add_string(di, "user_data", (char_u *)"");
else
dict_add_tv(di, "user_data", &match->cp_user_data);
}
match = match->cp_next;
}
while (match != NULL && !is_first_match(match));
}
if (ret == OK)
ret = info_add_completion_info(li);
}
if (ret == OK && (what_flag & CI_WHAT_SELECTED))