mirror of
https://github.com/vim/vim
synced 2025-07-15 16:51:57 +00:00
patch 9.1.1428: completion: register completion needs cleanup
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:
committed by
Christian Brabandt
parent
b29e37133d
commit
86d46a7018
@ -4905,11 +4905,11 @@ get_register_completion(void)
|
||||
int dir = compl_direction;
|
||||
yankreg_T *reg = NULL;
|
||||
void *reg_ptr = NULL;
|
||||
int adding_mode = compl_status_adding();
|
||||
|
||||
for (int i = 0; i < NUM_REGISTERS; i++)
|
||||
{
|
||||
int regname = 0;
|
||||
|
||||
if (i == 0)
|
||||
regname = '"'; // unnamed register
|
||||
else if (i < 10)
|
||||
@ -4935,14 +4935,14 @@ get_register_completion(void)
|
||||
|
||||
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)
|
||||
continue;
|
||||
char_u *str = reg->y_array[j].string;
|
||||
if (str == NULL)
|
||||
continue;
|
||||
|
||||
if (adding_mode)
|
||||
{
|
||||
int str_len = (int)STRLEN(str);
|
||||
if (str_len == 0)
|
||||
continue;
|
||||
@ -4953,19 +4953,13 @@ get_register_completion(void)
|
||||
: STRNCMP(str, compl_orig_text.string,
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
for (int j = 0; j < reg->y_size; j++)
|
||||
else
|
||||
{
|
||||
char_u *str = reg->y_array[j].string;
|
||||
if (str == NULL)
|
||||
continue;
|
||||
|
||||
// Calculate the safe end of string to avoid null byte issues
|
||||
char_u *str_end = str + STRLEN(str);
|
||||
char_u *p = str;
|
||||
|
@ -709,6 +709,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1428,
|
||||
/**/
|
||||
1427,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user