patch 9.1.0629: Rename of pum hl_group is incomplete
Problem: Rename of pum hl_group is incomplete in source.
Solution: Also rename the test function. Rename to user_hlattr in code
to avoid confusion with pum_extra. Add test with matched text
highlighting (zeertzjq).
closes: #15348
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/insexpand.c b/src/insexpand.c
index 02d29704..7a5298f 100644
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -114,7 +114,7 @@
int cp_flags; // CP_ values
int cp_number; // sequence number
int cp_score; // fuzzy match score
- int cp_extrahlattr; // extra highlight group attr
+ int cp_user_hlattr; // highlight attribute to combine with
};
// values for cp_flags
@@ -206,7 +206,7 @@
static int *compl_fuzzy_scores;
-static int ins_compl_add(char_u *str, int len, char_u *fname, char_u **cptext, typval_T *user_data, int cdir, int flags, int adup, int extrahl);
+static int ins_compl_add(char_u *str, int len, char_u *fname, char_u **cptext, typval_T *user_data, int cdir, int flags, int adup, int user_hlattr);
static void ins_compl_longest_match(compl_T *match);
static void ins_compl_del_pum(void);
static void ins_compl_files(int count, char_u **files, int thesaurus, int flags, regmatch_T *regmatch, char_u *buf, int *dir);
@@ -780,7 +780,7 @@
int cdir,
int flags_arg,
int adup, // accept duplicate match
- int extra_hlattr)
+ int user_hlattr)
{
compl_T *match;
int dir = (cdir == 0 ? compl_direction : cdir);
@@ -844,7 +844,7 @@
else
match->cp_fname = NULL;
match->cp_flags = flags;
- match->cp_extrahlattr = extra_hlattr;
+ match->cp_user_hlattr = user_hlattr;
if (cptext != NULL)
{
@@ -1341,7 +1341,7 @@
compl_match_array[i].pum_kind = compl->cp_text[CPT_KIND];
compl_match_array[i].pum_info = compl->cp_text[CPT_INFO];
compl_match_array[i].pum_score = compl->cp_score;
- compl_match_array[i].pum_extrahlattr = compl->cp_extrahlattr;
+ compl_match_array[i].pum_user_hlattr = compl->cp_user_hlattr;
if (compl->cp_text[CPT_MENU] != NULL)
compl_match_array[i++].pum_extra =
compl->cp_text[CPT_MENU];
@@ -2860,8 +2860,8 @@
char_u *(cptext[CPT_COUNT]);
typval_T user_data;
int status;
- char_u *extra_hlname;
- int extra_hlattr = -1;
+ char_u *user_hlname;
+ int user_hlattr = -1;
user_data.v_type = VAR_UNKNOWN;
if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)
@@ -2871,9 +2871,9 @@
cptext[CPT_MENU] = dict_get_string(tv->vval.v_dict, "menu", FALSE);
cptext[CPT_KIND] = dict_get_string(tv->vval.v_dict, "kind", FALSE);
cptext[CPT_INFO] = dict_get_string(tv->vval.v_dict, "info", FALSE);
- extra_hlname = dict_get_string(tv->vval.v_dict, "hl_group", FALSE);
- if (extra_hlname != NULL && *extra_hlname != NUL)
- extra_hlattr = syn_name2attr(extra_hlname);
+ user_hlname = dict_get_string(tv->vval.v_dict, "hl_group", FALSE);
+ if (user_hlname != NULL && *user_hlname != NUL)
+ user_hlattr = syn_name2attr(user_hlname);
dict_get_tv(tv->vval.v_dict, "user_data", &user_data);
if (dict_get_string(tv->vval.v_dict, "icase", FALSE) != NULL
@@ -2898,7 +2898,7 @@
return FAIL;
}
status = ins_compl_add(word, -1, NULL, cptext,
- &user_data, dir, flags, dup, extra_hlattr);
+ &user_data, dir, flags, dup, user_hlattr);
if (status != OK)
clear_tv(&user_data);
return status;