IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(options): restore exists() behavior for options (#21510)

Browse Source 
Duplicating get_option_value() logic for an obscure future refactor
isn't really worthwhile, and findoption() isn't used anywhere else
outside the options code.
This commit is contained in:
zeertzjq 2022-12-23 13:56:32 +08:00 committed by GitHub
parent 98daaa798e
commit 30f606fc60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/eval.c
View File

@ -3674,6 +3674,7 @@ static int eval_index(char **arg, typval_T *rettv, int evaluate, int verbose)
int get_option_tv(const char **const arg, typval_T *const rettv, const bool evaluate) int get_option_tv(const char **const arg, typval_T *const rettv, const bool evaluate)
FUNC_ATTR_NONNULL_ARG(1) FUNC_ATTR_NONNULL_ARG(1)
{ {
const bool working = (**arg == '+'); // has("+option")
int scope; int scope;
// Isolate the option name and find its value. // Isolate the option name and find its value.
@ -3718,6 +3719,10 @@ int get_option_tv(const char **const arg, typval_T *const rettv, const bool eval
rettv->v_type = VAR_STRING; rettv->v_type = VAR_STRING;
rettv->vval.v_string = stringval; rettv->vval.v_string = stringval;
} }
} else if (working && (opt_type == gov_hidden_bool
|| opt_type == gov_hidden_number
|| opt_type == gov_hidden_string)) {
ret = FAIL;
} }
*option_end = c; // put back for error messages *option_end = c; // put back for error messages

11
src/nvim/eval/funcs.c
View File

@ -1721,14 +1721,9 @@ static void f_exists(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
xfree(exp); xfree(exp);
} }
} else if (*p == '&' || *p == '+') { // Option. } else if (*p == '&' || *p == '+') { // Option.
bool working = (*p == '+'); // whether option needs to be working n = (get_option_tv(&p, NULL, true) == OK);
int opt_flags; if (*skipwhite(p) != NUL) {
n = false; // Trailing garbage.
if (find_option_end(&p, &opt_flags) != NULL) {
int opt_idx = findoption(p);
n = (opt_idx >= 0 && (!working || get_varp_scope(get_option(opt_idx), opt_flags) != NULL));
} else {
n = false;
} }
} else if (*p == '*') { // Internal or user defined function. } else if (*p == '*') { // Internal or user defined function.
n = function_exists(p + 1, false); n = function_exists(p + 1, false);

5
test/functional/ui/highlight_spec.lua
View File

@ -6,6 +6,7 @@ local command, exec = helpers.command, helpers.exec
local eval = helpers.eval local eval = helpers.eval
local feed_command, eq = helpers.feed_command, helpers.eq local feed_command, eq = helpers.feed_command, helpers.eq
local curbufmeths = helpers.curbufmeths local curbufmeths = helpers.curbufmeths
local funcs = helpers.funcs
local meths = helpers.meths local meths = helpers.meths
describe('colorscheme compatibility', function() describe('colorscheme compatibility', function()
@ -13,7 +14,9 @@ describe('colorscheme compatibility', function()
clear() clear()
end) end)
it('t_Co is set to 256 by default', function() it('&t_Co exists and is set to 256 by default', function()
eq(1, funcs.exists('&t_Co'))
eq(1, funcs.exists('+t_Co'))
eq('256', eval('&t_Co')) eq('256', eval('&t_Co'))
end) end)
end) end)