kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-23 20:55:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(eval): handle wrong v:lua in expr option properly (#29953)

Browse Source
This commit is contained in:
zeertzjq 2024-08-02 16:00:27 +08:00 committed by GitHub
parent 76dea5feaa
commit 2a3561819e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/eval.c
View File

@ -2630,7 +2630,7 @@ static int may_call_simple_func(const char *arg, typval_T *rettv)
if (parens != NULL && *skipwhite(parens + 2) == NUL) {
if (strnequal(arg, "v:lua.", 6)) {
const char *p = arg + 6;
if (skip_luafunc_name(p) == parens) {
if (p != parens && skip_luafunc_name(p) == parens) {
r = call_simple_luafunc(p, (size_t)(parens - p), rettv);
}
} else {

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

@ -1779,6 +1779,9 @@ theend:
int call_simple_luafunc(const char *funcname, size_t len, typval_T *rettv)
FUNC_ATTR_NONNULL_ALL
{
rettv->v_type = VAR_NUMBER; // default rettv is number zero
rettv->vval.v_number = 0;
typval_T argvars[1];
argvars[0].v_type = VAR_UNKNOWN;
nlua_typval_call(funcname, len, argvars, 0, rettv);

37
test/functional/lua/luaeval_spec.lua
View File

@ -13,6 +13,7 @@ local fn = n.fn
local clear = n.clear
local eval = n.eval
local feed = n.feed
local assert_alive = n.assert_alive
local NIL = vim.NIL
local eq = t.eq
@ -558,5 +559,41 @@ describe('v:lua', function()
eq("Vim:E107: Missing parentheses: v:lua", pcall_err(eval, "'bad'->v:lua"))
eq("Vim:E1085: Not a callable type: v:lua", pcall_err(eval, "'bad'->v:lua()"))
eq([[Vim:E15: Invalid expression: "v:lua.()"]], pcall_err(eval, "'bad'->v:lua.()"))
eq("Vim:E1085: Not a callable type: v:lua", pcall_err(eval, "v:lua()"))
eq([[Vim:E15: Invalid expression: "v:lua.()"]], pcall_err(eval, "v:lua.()"))
end)
describe('invalid use in fold text', function()
before_each(function()
feed('ifoo<CR>bar<Esc>')
command('1,2fold')
end)
it('with missing function name when used as simple function', function()
api.nvim_set_option_value('debug', 'throw', {})
eq(
[[Vim(eval):E15: Invalid expression: "v:lua.()"]],
pcall_err(command, 'set foldtext=v:lua.() | eval foldtextresult(1)')
)
end)
it('with missing function name when used in expression', function()
api.nvim_set_option_value('debug', 'throw', {})
eq(
[[Vim(eval):E15: Invalid expression: "+v:lua.()"]],
pcall_err(command, 'set foldtext=+v:lua.() | eval foldtextresult(1)')
)
end)
it('with non-existent function when used as simple function', function()
command('set foldtext=v:lua.NoSuchFunc() | eval foldtextresult(1)')
assert_alive()
end)
it('with non-existent function when used in expression', function()
command('set foldtext=+v:lua.NoSuchFunc() | eval foldtextresult(1)')
assert_alive()
end)
end)
end)