mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-05-27 15:25:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(excmd): nlua_call_excmd require() failure is a "lua_error"

Browse Source 
Although `nlua_call_excmd` is semantically for implementing Ex-commands,
the `require()` should never fail, so that's a "Lua error".

But if the call itself fails (the later `semsg` call), that's an "Ex
cmd" error.
This commit is contained in:
Justin M. Keyes
2026-04-19 17:37:03 +02:00
parent 919a109951
commit a38451be40
5 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/lua/executor.c
View File

@@ -1785,8 +1785,7 @@ bool nlua_call_excmd(const char *module, const char *func, exarg_T *eap, const c
lua_getglobal(lstate, "require");
lua_pushstring(lstate, module);
if (lua_pcall(lstate, 1, 1, 0) != 0) {
semsg("E5108: %s", lua_tostring(lstate, -1));
lua_pop(lstate, 1);
nlua_error(lstate, "E5108: %s");
return false;
}
lua_getfield(lstate, -1, func);
@@ -1802,7 +1801,8 @@ bool nlua_call_excmd(const char *module, const char *func, exarg_T *eap, const c
}
if (nlua_pcall(lstate, nargs, 0)) {
semsg("E5108: %s", lua_tostring(lstate, -1));
// Not "E5108" because this is a logical/application error, not a "Lua error".
emsg(lua_tostring(lstate, -1));
lua_pop(lstate, 1);
return false;
}