mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-30 06:58:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(option.c): factor out set op parsing

Browse Source
This commit is contained in:
Lewis Russell
2023-01-25 17:12:21 +00:00
parent 25310af060
commit 0f3fa5a30a
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/nvim/option.c
View File

@@ -1164,6 +1164,21 @@ static void do_set_string(int opt_idx, int opt_flags, char **argp, int nextchar,
*argp = arg; *argp = arg;
} }
static set_op_T get_op(const char *arg)
{
set_op_T op = OP_NONE;
if (*arg != NUL && *(arg + 1) == '=') {
if (*arg == '+') {
op = OP_ADDING; // "+="
} else if (*arg == '^') {
op = OP_PREPENDING; // "^="
} else if (*arg == '-') {
op = OP_REMOVING; // "-="
}
}
return op;
}
static void do_set_option(int opt_flags, char **argp, bool *did_show, char *errbuf, static void do_set_option(int opt_flags, char **argp, bool *did_show, char *errbuf,
size_t errbuflen, char **errmsg) size_t errbuflen, char **errmsg)
{ {
@@ -1229,19 +1244,11 @@ static void do_set_option(int opt_flags, char **argp, bool *did_show, char *errb
len++; len++;
} }
set_op_T op = OP_NONE; set_op_T op = get_op(arg + len);
if (arg[len] != NUL && arg[len + 1] == '=') { if (op != OP_NONE) {
if (arg[len] == '+') {
op = OP_ADDING; // "+="
len++;
} else if (arg[len] == '^') {
op = OP_PREPENDING; // "^="
len++;
} else if (arg[len] == '-') {
op = OP_REMOVING; // "-="
len++; len++;
} }
}
uint8_t nextchar = (uint8_t)arg[len]; // next non-white char after option name uint8_t nextchar = (uint8_t)arg[len]; // next non-white char after option name
if (opt_idx == -1 && key == 0) { // found a mismatch: skip if (opt_idx == -1 && key == 0) { // found a mismatch: skip