Commit: patch 9.2.0762: duplicated sub-option name check in :set completion

[Christian Brabandt]

patch 9.2.0762: duplicated sub-option name check in :set completion

Commit: https://github.com/vim/vim/commit/979602fd89da678590e722a815e6177fbc15d684
Author: Shane Harper <sh...@shaneharper.net>
Date: Wed Jul 1 20:40:51 2026 +0000

patch 9.2.0762: duplicated sub-option name check in :set completion

Problem: The same sub-option name check appears ten times.
Solution: Extract the check into new completing_value_for_subopt()
function (Shane Harper).

No functional change.

Previously is_borderhighlight in expand_set_popupoption() was always
false: STRNCMP was given "highlight:" instead of "borderhighlight:" as
its second argument. There was no user-visible problem with this:
is_highlight was already true for "borderhighlight:" (it ends in
"highlight:") and the completions for both "borderhighlight:" and
"highlight:" are the same.

closes: #20676

Co-authored-by: Claude Opus 4.8 <nor...@anthropic.com>
Signed-off-by: Shane Harper <sh...@shaneharper.net>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/optionstr.c b/src/optionstr.c
index b187dc319..d2ce36e76 100644
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -1131,6 +1131,16 @@ did_set_ambiwidth(optset_T *args UNUSED)
return check_chars_options();
}

+ static bool
+completing_value_for_subopt(optexpand_T *args, char *name_suffix)
+{
+ char_u *colon = args->oe_xp->xp_pattern - 1;
+ int len = (int)STRLEN(name_suffix);
+
+ return colon - args->oe_set_arg >= len
+ && STRNCMP(colon - len, name_suffix, len) == 0;
+}
+
int
expand_set_ambiwidth(optexpand_T *args, int *numMatches, char_u ***matches)
{
@@ -2204,10 +2214,7 @@ expand_set_diffopt(optexpand_T *args, int *numMatches, char_u ***matches)

if (xp->xp_pattern > args->oe_set_arg && *(xp->xp_pattern-1) == ':')
{
- // Within "algorithm:", we have a subgroup of possible options.
- int algo_len = (int)STRLEN("algorithm:");
- if (xp->xp_pattern - args->oe_set_arg >= algo_len &&
- STRNCMP(xp->xp_pattern - algo_len, "algorithm:", algo_len) == 0)
+ if (completing_value_for_subopt(args, "algorithm"))
{
return expand_set_opt_string(
args,
@@ -2216,10 +2223,7 @@ expand_set_diffopt(optexpand_T *args, int *numMatches, char_u ***matches)
numMatches,
matches);
}
- // Within "inline:", we have a subgroup of possible options.
- int inline_len = (int)STRLEN("inline:");
- if (xp->xp_pattern - args->oe_set_arg >= inline_len &&
- STRNCMP(xp->xp_pattern - inline_len, "inline:", inline_len) == 0)
+ if (completing_value_for_subopt(args, "inline"))
{
return expand_set_opt_string(
args,
@@ -3508,20 +3512,9 @@ expand_set_popupoption(optexpand_T *args, int *numMatches, char_u ***matches,

if (xp->xp_pattern > args->oe_set_arg && *(xp->xp_pattern-1) == ':')
{
- // Within "highlight:"/"border:"/"align:", we have a subgroup of possible options.
- int border_len = (int)STRLEN("border:");
- int close_len = (int)STRLEN("close:");
- int resize_len = (int)STRLEN("resize:");
- int shadow_len = (int)STRLEN("shadow:");
- int is_border = xp->xp_pattern - args->oe_set_arg >= border_len &&
- STRNCMP(xp->xp_pattern - border_len, "border:", border_len) == 0;
- int is_close = xp->xp_pattern - args->oe_set_arg >= close_len &&
- STRNCMP(xp->xp_pattern - close_len, "close:", close_len) == 0;
- int is_resize = xp->xp_pattern - args->oe_set_arg >= resize_len &&
- STRNCMP(xp->xp_pattern - resize_len, "resize:", resize_len) == 0;
- int is_shadow = xp->xp_pattern - args->oe_set_arg >= shadow_len &&
- STRNCMP(xp->xp_pattern - shadow_len, "shadow:", shadow_len) == 0;
- if (is_close || is_resize || is_shadow)
+ if (completing_value_for_subopt(args, "close")
+ || completing_value_for_subopt(args, "resize")
+ || completing_value_for_subopt(args, "shadow"))
{
return expand_set_opt_string(
args,
@@ -3530,7 +3523,7 @@ expand_set_popupoption(optexpand_T *args, int *numMatches, char_u ***matches,
numMatches,
matches);
}
- if (is_border)
+ if (completing_value_for_subopt(args, "border"))
{
return expand_set_opt_string(
args,
@@ -3541,9 +3534,7 @@ expand_set_popupoption(optexpand_T *args, int *numMatches, char_u ***matches,
numMatches,
matches);
}
- int align_len = (int)STRLEN("align:");
- if (xp->xp_pattern - args->oe_set_arg >= align_len &&
- STRNCMP(xp->xp_pattern - align_len, "align:", align_len) == 0)
+ if (completing_value_for_subopt(args, "align"))
{
return expand_set_opt_string(
args,
@@ -3552,16 +3543,8 @@ expand_set_popupoption(optexpand_T *args, int *numMatches, char_u ***matches,
numMatches,
matches);
}
- int highlight_len = (int)STRLEN("highlight:");
- int borderhighlight_len = (int)STRLEN("borderhighlight:");
- int is_highlight = xp->xp_pattern - args->oe_set_arg >= highlight_len
- && STRNCMP(xp->xp_pattern - highlight_len, "highlight:",
- highlight_len) == 0;
- int is_borderhighlight
- = xp->xp_pattern - args->oe_set_arg >= borderhighlight_len
- && STRNCMP(xp->xp_pattern - borderhighlight_len, "highlight:",
- borderhighlight_len) == 0;
- if (is_highlight || is_borderhighlight)
+ if (completing_value_for_subopt(args, "highlight")
+ || completing_value_for_subopt(args, "borderhighlight"))
{
// Return the list of all highlight names
return expand_set_opt_generic(
@@ -4042,10 +4025,7 @@ expand_set_tabpanelopt(optexpand_T *args, int *numMatches, char_u ***matches)

if (xp->xp_pattern > args->oe_set_arg && *(xp->xp_pattern-1) == ':')
{
- // Within "align:", we have a subgroup of possible options.
- int align_len = (int)STRLEN("align:");
- if (xp->xp_pattern - args->oe_set_arg >= align_len &&
- STRNCMP(xp->xp_pattern - align_len, "align:", align_len) == 0)
+ if (completing_value_for_subopt(args, "align"))
{
return expand_set_opt_string(
args,
diff --git a/src/version.c b/src/version.c
index 7546d0319..89cd188cb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 762,
/**/
761,
/**/

[Tony Mechelynck]

On Wed, Jul 1, 2026 at 10:45 PM Christian Brabandt <cbl...@256bit.org> wrote:
>
> patch 9.2.0762: duplicated sub-option name check in :set completion
>
> Commit: https://github.com/vim/vim/commit/979602fd89da678590e722a815e6177fbc15d684
> Author: Shane Harper <sh...@shaneharper.net>
> Date: Wed Jul 1 20:40:51 2026 +0000
>
> patch 9.2.0762: duplicated sub-option name check in :set completion
>
> Problem: The same sub-option name check appears ten times.
> Solution: Extract the check into new completing_value_for_subopt()
> function (Shane Harper).

[...]

Warning in Tiny build only: completing_value_for_subopt defined but
not used (optionstr.c:1135:1)

gcc (SUSE Linux) 15.3.0 © 2025 FSF

Best regards,
Tony.