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(eval): check for v:lua when calling callback (#19855)

Browse Source 
This makes callback_call() match call_vim_function() when calling a function.
This commit is contained in:
zeertzjq 2022-08-20 15:52:35 +08:00 committed by GitHub
parent 1a57cd3836
commit bffaf1e27e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/eval.c
View File

@ -5842,7 +5842,17 @@ bool callback_call(Callback *const callback, const int argcount_in, typval_T *co
switch (callback->type) {
case kCallbackFuncref:
name = callback->data.funcref;
partial = NULL;
int len = (int)STRLEN(name);
if (len >= 6 && !memcmp(name, "v:lua.", 6)) {
name += 6;
len = check_luafunc_name(name, false);
if (len == 0) {
return false;
}
partial = vvlua_partial;
} else {
partial = NULL;
}
break;
case kCallbackPartial:

2
src/nvim/ops.c
View File

@ -6191,7 +6191,7 @@ static void op_function(const oparg_T *oap)
finish_op = false;
typval_T rettv;
if (callback_call(&opfunc_cb, 1, argv, &rettv) != FAIL) {
if (callback_call(&opfunc_cb, 1, argv, &rettv)) {
tv_clear(&rettv);
}

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

@ -467,7 +467,6 @@ describe('v:lua', function()
end
end
end
vim.api.nvim_buf_set_option(0, 'omnifunc', 'v:lua.mymod.omni')
]])
end)
@ -515,6 +514,7 @@ describe('v:lua', function()
[5] = {bold = true, foreground = Screen.colors.SeaGreen4},
})
screen:attach()
meths.buf_set_option(0, 'omnifunc', 'v:lua.mymod.omni')
feed('isome st<c-x><c-o>')
screen:expect{grid=[[
some stuff^ |
@ -526,6 +526,9 @@ describe('v:lua', function()
{1:~ }|
{4:-- Omni completion (^O^N^P) }{5:match 1 of 3} |
]]}
meths.set_option('operatorfunc', 'v:lua.mymod.noisy')
feed('<Esc>g@g@')
eq("hey line", meths.get_current_line())
end)
it('supports packages', function()