mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-07-09 02:49:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:partial:9.2.0762: duplicated sub-option name check in :set completion (#40535)

Browse Source 
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.

closes: vim/vim#20676

979602fd89

Co-authored-by: Shane Harper <shane@shaneharper.net>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
zeertzjq
2026-07-02 08:29:44 +08:00
committed by GitHub
parent 0d0772c937
commit e4e9eebbae
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvim/optionstr.c
View File

@@ -536,6 +536,15 @@ static int expand_set_opt_listflag(optexpand_T *args, char *flags, int *numMatch
return OK;
}
static bool completing_value_for_subopt(optexpand_T *args, const char *name_suffix)
{
const char *colon = args->oe_xp->xp_pattern - 1;
const size_t len = strlen(name_suffix);
return colon - args->oe_set_arg >= (int)len
&& strncmp(colon - len, name_suffix, len) == 0;
}
/// The 'ambiwidth' option is changed.
const char *did_set_ambiwidth(optset_T *args)
{
@@ -1068,20 +1077,14 @@ int expand_set_diffopt(optexpand_T *args, int *numMatches, char ***matches)
expand_T *xp = args->oe_xp;
if (xp->xp_pattern > args->oe_set_arg && *(xp->xp_pattern - 1) == ':') {
// Within "algorithm:", we have a subgroup of possible options.
const size_t algo_len = strlen("algorithm:");
if (xp->xp_pattern - args->oe_set_arg >= (int)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,
opt_dip_algorithm_values,
ARRAY_SIZE(opt_dip_algorithm_values) - 1,
numMatches,
matches);
}
// Within "inline:", we have a subgroup of possible options.
const size_t inline_len = strlen("inline:");
if (xp->xp_pattern - args->oe_set_arg >= (int)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,
opt_dip_inline_values,
ARRAY_SIZE(opt_dip_inline_values) - 1,