kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-24 21:25:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix: has() should preserve v:shell_error #18280

Browse Source 
fixes #18278
This commit is contained in:
Andrey Mishchenko 2022-04-26 23:58:25 -04:00 committed by GitHub
parent d98e5357af
commit 3933592338
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4278,6 +4278,8 @@ static void f_has(typval_T *argvars, typval_T *rettv, FunPtr fptr)
"nvim", "nvim",
}; };
// XXX: eval_has_provider() may shell out :(
const int save_shell_error = get_vim_var_nr(VV_SHELL_ERROR);
bool n = false; bool n = false;
const char *const name = tv_get_string(&argvars[0]); const char *const name = tv_get_string(&argvars[0]);
for (size_t i = 0; i < ARRAY_SIZE(has_list); i++) { for (size_t i = 0; i < ARRAY_SIZE(has_list); i++) {
@ -4334,6 +4336,7 @@ static void f_has(typval_T *argvars, typval_T *rettv, FunPtr fptr)
n = true; n = true;
} }
set_vim_var_nr(VV_SHELL_ERROR, save_shell_error);
rettv->vval.v_number = n; rettv->vval.v_number = n;
} }

7
test/functional/vimscript/has_spec.lua
View File

@ -68,4 +68,11 @@ describe('has()', function()
eq(0, funcs.has('wsl')) eq(0, funcs.has('wsl'))
end end
end) end)
it('does not change v:shell_error', function()
local nvim_prog = helpers.nvim_prog
funcs.system({nvim_prog, '-es', '+73cquit'})
funcs.has('python3') -- use a call whose implementation shells out
eq(73, funcs.eval('v:shell_error'))
end)
end) end)