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

refactor(option.c): de-nest set_option_value

Browse Source
This commit is contained in:
Lewis Russell
2023-01-18 14:45:54 +00:00
parent f90d78654a
commit 29215d3a49
1 changed files with 52 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/nvim/option.c
View File

@@ -2992,58 +2992,62 @@ char *set_option_value(const char *const name, const long number, const char *co
int opt_idx = findoption(name); int opt_idx = findoption(name);
if (opt_idx < 0) { if (opt_idx < 0) {
semsg(_("E355: Unknown option: %s"), name); semsg(_("E355: Unknown option: %s"), name);
} else { return NULL;
uint32_t flags = options[opt_idx].flags; }
// Disallow changing some options in the sandbox
if (sandbox > 0 && (flags & P_SECURE)) {
emsg(_(e_sandbox));
return NULL;
}
if (flags & P_STRING) {
const char *s = string;
if (s == NULL || opt_flags & OPT_CLEAR) {
s = "";
}
return set_string_option(opt_idx, s, opt_flags);
}
char_u *varp = (char_u *)get_varp_scope(&(options[opt_idx]), opt_flags); uint32_t flags = options[opt_idx].flags;
if (varp != NULL) { // hidden option is not changed // Disallow changing some options in the sandbox
if (number == 0 && string != NULL) { if (sandbox > 0 && (flags & P_SECURE)) {
int idx; emsg(_(e_sandbox));
return NULL;
}
// Either we are given a string or we are setting option if (flags & P_STRING) {
// to zero. const char *s = string;
for (idx = 0; string[idx] == '0'; idx++) {} if (s == NULL || opt_flags & OPT_CLEAR) {
if (string[idx] != NUL || idx == 0) { s = "";
// There's another character after zeros or the string }
// is empty. In both cases, we are trying to set a return set_string_option(opt_idx, s, opt_flags);
// num option using a string. }
semsg(_("E521: Number required: &%s = '%s'"),
name, string); char_u *varp = (char_u *)get_varp_scope(&(options[opt_idx]), opt_flags);
return NULL; // do nothing as we hit an error if (varp == NULL) {
} // hidden option is not changed
} return NULL;
long numval = number; }
if (opt_flags & OPT_CLEAR) {
if ((int *)varp == &curbuf->b_p_ar) { if (number == 0 && string != NULL) {
numval = -1; int idx;
} else if ((long *)varp == &curbuf->b_p_ul) {
numval = NO_LOCAL_UNDOLEVEL; // Either we are given a string or we are setting option
} else if ((long *)varp == &curwin->w_p_so || (long *)varp == &curwin->w_p_siso) { // to zero.
numval = -1; for (idx = 0; string[idx] == '0'; idx++) {}
} else { if (string[idx] != NUL || idx == 0) {
char *s = NULL; // There's another character after zeros or the string
(void)get_option_value(name, &numval, &s, NULL, OPT_GLOBAL); // is empty. In both cases, we are trying to set a
} // num option using a string.
} semsg(_("E521: Number required: &%s = '%s'"),
if (flags & P_NUM) { name, string);
return set_num_option(opt_idx, varp, numval, NULL, 0, opt_flags); return NULL; // do nothing as we hit an error
}
return set_bool_option(opt_idx, varp, (int)numval, opt_flags);
} }
} }
return NULL; long numval = number;
if (opt_flags & OPT_CLEAR) {
if ((int *)varp == &curbuf->b_p_ar) {
numval = -1;
} else if ((long *)varp == &curbuf->b_p_ul) {
numval = NO_LOCAL_UNDOLEVEL;
} else if ((long *)varp == &curwin->w_p_so || (long *)varp == &curwin->w_p_siso) {
numval = -1;
} else {
char *s = NULL;
(void)get_option_value(name, &numval, &s, NULL, OPT_GLOBAL);
}
}
if (flags & P_NUM) {
return set_num_option(opt_idx, varp, numval, NULL, 0, opt_flags);
}
return set_bool_option(opt_idx, varp, (int)numval, opt_flags);
} }
/// Call set_option_value() and when an error is returned report it. /// Call set_option_value() and when an error is returned report it.