mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-01-06 13:27:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17200 from lewis6991/_loadfile

Browse Source 
refactor(lua): call `loadfile` internally instead of `luaL_loadfile`
This commit is contained in:
bfredl
2022-02-18 15:05:50 +01:00
committed by GitHub
parent 720bb5844d adad10284d
commit 5064ff126d
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1241,6 +1241,9 @@ void ex_luafile(exarg_T *const eap)
/// execute lua code from a file.
///
/// Note: we call the lua global loadfile as opposed to calling luaL_loadfile
/// in case loadfile has been overridden in the users environment.
///
/// @param path path of the file
///
/// @return true if everything ok, false if there was an error (echoed)
@@ -1249,11 +1252,30 @@ bool nlua_exec_file(const char *path)
{
lua_State *const lstate = global_lstate;
if (luaL_loadfile(lstate, path)) {
nlua_error(lstate, _("E5112: Error while creating lua chunk: %.*s"));
lua_getglobal(lstate, "loadfile");
lua_pushstring(lstate, path);
if (nlua_pcall(lstate, 1, 2)) {
nlua_error(lstate, _("E5111: Error calling lua: %.*s"));
return false;
}
// loadstring() returns either:
// 1. nil, error
// 2. chunk, nil
if (lua_isnil(lstate, -2)) {
// 1
nlua_error(lstate, _("E5112: Error while creating lua chunk: %.*s"));
assert(lua_isnil(lstate, -1));
lua_pop(lstate, 1);
return false;
}
// 2
assert(lua_isnil(lstate, -1));
lua_pop(lstate, 1);
if (nlua_pcall(lstate, 0, 0)) {
nlua_error(lstate, _("E5113: Error while calling lua chunk: %.*s"));
return false;