kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-23 12:45:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0927: style issues in insexpand.c (#31581)

Browse Source 
Problem:  style issues in insexpand.c
Solution: add braces, use ternary operator to improve style
          (glepnir)

closes: vim/vim#16210

6e19993991

vim-patch:9.1.0922: wrong MIN macro in popupmenu.c
vim-patch:9.1.0923: too many strlen() calls in filepath.c
vim-patch:9.1.0924: patch 9.1.0923 causes issues

Co-authored-by: glepnir <glephunter@gmail.com>
This commit is contained in:
zeertzjq 2024-12-15 08:19:18 +08:00 committed by GitHub
parent 805b84c619
commit 852b6a6bce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/nvim/insexpand.c
View File

@ -756,7 +756,7 @@ int ins_compl_add_infercase(char *str_arg, int len, bool icase, char *fname, Dir
// "char_len" may be smaller than "compl_char_len" when using // "char_len" may be smaller than "compl_char_len" when using
// thesaurus, only use the minimum when comparing. // thesaurus, only use the minimum when comparing.
int min_len = char_len < compl_char_len ? char_len : compl_char_len; int min_len = MIN(char_len, compl_char_len);
str = ins_compl_infercase_gettext(str, char_len, compl_char_len, min_len, &tofree); str = ins_compl_infercase_gettext(str, char_len, compl_char_len, min_len, &tofree);
} }
@ -1007,9 +1007,9 @@ static void ins_compl_add_matches(int num_matches, char **matches, int icase)
Direction dir = compl_direction; Direction dir = compl_direction;
for (int i = 0; i < num_matches && add_r != FAIL; i++) { for (int i = 0; i < num_matches && add_r != FAIL; i++) {
if ((add_r = ins_compl_add(matches[i], -1, NULL, NULL, false, NULL, dir, add_r = ins_compl_add(matches[i], -1, NULL, NULL, false, NULL, dir,
CP_FAST | (icase ? CP_ICASE : 0), CP_FAST | (icase ? CP_ICASE : 0), false, NULL);
false, NULL)) == OK) { if (add_r == OK) {
// If dir was BACKWARD then honor it just once. // If dir was BACKWARD then honor it just once.
dir = FORWARD; dir = FORWARD;
} }
@ -1277,21 +1277,15 @@ static int ins_compl_build_pum(void)
i = 0; i = 0;
comp = match_head; comp = match_head;
while (comp != NULL) { while (comp != NULL) {
if (comp->cp_text[CPT_ABBR] != NULL) { compl_match_array[i].pum_text = comp->cp_text[CPT_ABBR] != NULL
compl_match_array[i].pum_text = comp->cp_text[CPT_ABBR]; ? comp->cp_text[CPT_ABBR] : comp->cp_str;
} else {
compl_match_array[i].pum_text = comp->cp_str;
}
compl_match_array[i].pum_kind = comp->cp_text[CPT_KIND]; compl_match_array[i].pum_kind = comp->cp_text[CPT_KIND];
compl_match_array[i].pum_info = comp->cp_text[CPT_INFO]; compl_match_array[i].pum_info = comp->cp_text[CPT_INFO];
compl_match_array[i].pum_score = comp->cp_score; compl_match_array[i].pum_score = comp->cp_score;
compl_match_array[i].pum_user_abbr_hlattr = comp->cp_user_abbr_hlattr; compl_match_array[i].pum_user_abbr_hlattr = comp->cp_user_abbr_hlattr;
compl_match_array[i].pum_user_kind_hlattr = comp->cp_user_kind_hlattr; compl_match_array[i].pum_user_kind_hlattr = comp->cp_user_kind_hlattr;
if (comp->cp_text[CPT_MENU] != NULL) { compl_match_array[i++].pum_extra = comp->cp_text[CPT_MENU] != NULL
compl_match_array[i++].pum_extra = comp->cp_text[CPT_MENU]; ? comp->cp_text[CPT_MENU] : comp->cp_fname;
} else {
compl_match_array[i++].pum_extra = comp->cp_fname;
}
compl_T *match_next = comp->cp_match_next; compl_T *match_next = comp->cp_match_next;
comp->cp_match_next = NULL; comp->cp_match_next = NULL;
comp = match_next; comp = match_next;
@ -1578,11 +1572,7 @@ static void ins_compl_files(int count, char **files, bool thesaurus, int flags,
char *ptr = buf; char *ptr = buf;
while (vim_regexec(regmatch, buf, (colnr_T)(ptr - buf))) { while (vim_regexec(regmatch, buf, (colnr_T)(ptr - buf))) {
ptr = regmatch->startp[0]; ptr = regmatch->startp[0];
if (ctrl_x_mode_line_or_eval()) { ptr = ctrl_x_mode_line_or_eval() ? find_line_end(ptr) : find_word_end(ptr);
ptr = find_line_end(ptr);
} else {
ptr = find_word_end(ptr);
}
int add_r = ins_compl_add_infercase(regmatch->startp[0], int add_r = ins_compl_add_infercase(regmatch->startp[0],
(int)(ptr - regmatch->startp[0]), (int)(ptr - regmatch->startp[0]),
p_ic, files[i], *dir, false); p_ic, files[i], *dir, false);