GitHub/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-07-16 01:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1428: completion: register completion needs cleanup

Browse Source 
Problem:  completion: register completion needs cleanup
Solution: slightly refactor get_register_completion()
          (glepnir)

closes: #17432

Signed-off-by: glepnir <glephunter@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
glepnir
2025-06-03 21:04:44 +02:00
committed by Christian Brabandt
parent b29e37133d
commit 86d46a7018
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/insexpand.c
View File

@ -4905,11 +4905,11 @@ get_register_completion(void)
int dir = compl_direction; int dir = compl_direction;
yankreg_T *reg = NULL; yankreg_T *reg = NULL;
void *reg_ptr = NULL; void *reg_ptr = NULL;
int adding_mode = compl_status_adding();
for (int i = 0; i < NUM_REGISTERS; i++) for (int i = 0; i < NUM_REGISTERS; i++)
{ {
int regname = 0; int regname = 0;
if (i == 0) if (i == 0)
regname = '"'; // unnamed register regname = '"'; // unnamed register
else if (i < 10) else if (i < 10)
@ -4935,14 +4935,14 @@ get_register_completion(void)
reg = (yankreg_T *)reg_ptr; reg = (yankreg_T *)reg_ptr;
if (compl_status_adding()) for (int j = 0; j < reg->y_size; j++)
{ {
for (int j = 0; j < reg->y_size; j++) char_u *str = reg->y_array[j].string;
{ if (str == NULL)
char_u *str = reg->y_array[j].string; continue;
if (str == NULL)
continue;
if (adding_mode)
{
int str_len = (int)STRLEN(str); int str_len = (int)STRLEN(str);
if (str_len == 0) if (str_len == 0)
continue; continue;
@ -4953,19 +4953,13 @@ get_register_completion(void)
: STRNCMP(str, compl_orig_text.string, : STRNCMP(str, compl_orig_text.string,
compl_orig_text.length) == 0)) compl_orig_text.length) == 0))
{ {
if (ins_compl_add_infercase(str, str_len, p_ic, NULL, dir, FALSE, 0) == OK) if (ins_compl_add_infercase(str, str_len, p_ic, NULL,
dir, FALSE, 0) == OK)
dir = FORWARD; dir = FORWARD;
} }
} }
} else
else
{
for (int j = 0; j < reg->y_size; j++)
{ {
char_u *str = reg->y_array[j].string;
if (str == NULL)
continue;
// Calculate the safe end of string to avoid null byte issues // Calculate the safe end of string to avoid null byte issues
char_u *str_end = str + STRLEN(str); char_u *str_end = str + STRLEN(str);
char_u *p = str; char_u *p = str;

2
src/version.c
View File

@ -709,6 +709,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1428,
/**/ /**/
1427, 1427,
/**/ /**/