mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-10 21:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17459 from rktjmp/lua-error-tostring

Browse Source 
feat: __tostring lua errors if possible before showing in messages
This commit is contained in:
bfredl
2022-03-18 00:57:48 +01:00
committed by GitHub
parent cac90d2de7 81bffbd147
commit c1b98cfa5e
2 changed files with 54 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,7 +92,22 @@ static void nlua_error(lua_State *const lstate, const char *const msg)
FUNC_ATTR_NONNULL_ALL
{
size_t len;
const char *const str = lua_tolstring(lstate, -1, &len);
const char *str = NULL;
if (luaL_getmetafield(lstate, -1, "__tostring")) {
if (lua_isfunction(lstate, -1) && luaL_callmeta(lstate, -2, "__tostring")) {
// call __tostring, convert the result and pop result.
str = lua_tolstring(lstate, -1, &len);
lua_pop(lstate, 1);
}
// pop __tostring.
lua_pop(lstate, 1);
}
if (!str) {
// defer to lua default conversion, this will render tables as [NULL].
str = lua_tolstring(lstate, -1, &len);
}
msg_ext_set_kind("lua_error");
semsg_multiline(msg, (int)len, str);