neovim
diff --git a/‎runtime/lua/vim/shared.lua
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎runtime/lua/vim/shared.lua
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/nvim/lua/executor.c
Copy file name to clipboard
+40-18Lines changed: 40 additions & 18 deletions b/‎src/nvim/lua/executor.c
Copy file name to clipboard
+40-18Lines changed: 40 additions & 18 deletions
diff --git a/‎test/functional/lua/api_spec.lua
Copy file name to clipboard
+17-16Lines changed: 17 additions & 16 deletions b/‎test/functional/lua/api_spec.lua
Copy file name to clipboard
+17-16Lines changed: 17 additions & 16 deletions
diff --git a/‎test/functional/lua/commands_spec.lua
Copy file name to clipboard
+14-13Lines changed: 14 additions & 13 deletions b/‎test/functional/lua/commands_spec.lua
Copy file name to clipboard
+14-13Lines changed: 14 additions & 13 deletions
diff --git a/‎test/functional/lua/loop_spec.lua
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions b/‎test/functional/lua/loop_spec.lua
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎test/functional/lua/luaeval_spec.lua
Copy file name to clipboard
+4-3Lines changed: 4 additions & 3 deletions b/‎test/functional/lua/luaeval_spec.lua
Copy file name to clipboard
+4-3Lines changed: 4 additions & 3 deletions
@@ -605,7 +605,7 @@ do
   function vim.validate(opt)
     local ok, err_msg = is_valid(opt)
     if not ok then
-      error(debug.traceback(err_msg, 2), 2)
+      error(err_msg, 2)
     end
   end
 end
 
@@ -85,6 +85,27 @@ static void nlua_error(lua_State *const lstate, const char *const msg)
   lua_pop(lstate, 1);
 }
 
+/// Like lua_pcall, but use debug.traceback as errfunc.
+///
+/// @param lstate Lua interpreter state
+/// @param[in] nargs Number of arguments expected by the function being called.
+/// @param[in] nresults Number of results the function returns.
+static int nlua_pcall(lua_State *lstate, int nargs, int nresults)
+{
+  lua_getglobal(lstate, "debug");
+  lua_getfield(lstate, -1, "traceback");
+  lua_remove(lstate, -2);
+  lua_insert(lstate, -2 - nargs);
+  int status = lua_pcall(lstate, nargs, nresults, -2 - nargs);
+  if (status) {
+    lua_remove(lstate, -2);
+  } else {
+    lua_remove(lstate, -1 - nresults);
+  }
+  return status;
+}
+
+
 /// Gets the version of the current Nvim build.
 ///
 /// @param  lstate  Lua interpreter state.
@@ -115,7 +136,7 @@ static int nlua_luv_cfpcall(lua_State *lstate, int nargs, int nresult, int flags
   in_fast_callback++;
 
   int top = lua_gettop(lstate);
-  int status = lua_pcall(lstate, nargs, nresult, 0);
+  int status = nlua_pcall(lstate, nargs, nresult);
   if (status) {
     if (status == LUA_ERRMEM && !(flags & LUVF_CALLBACK_NOEXIT)) {
       // consider out of memory errors unrecoverable, just like xmalloc()
@@ -146,7 +167,7 @@ static void nlua_schedule_event(void **argv)
   lua_State *const lstate = global_lstate;
   nlua_pushref(lstate, cb);
   nlua_unref(lstate, cb);
-  if (lua_pcall(lstate, 0, 0, 0)) {
+  if (nlua_pcall(lstate, 0, 0)) {
     nlua_error(lstate, _("Error executing vim.schedule lua callback: %.*s"));
   }
 }
@@ -183,7 +204,7 @@ static void dummy_timer_close_cb(TimeWatcher *tw, void *data)
 static bool nlua_wait_condition(lua_State *lstate, int *status, bool *callback_result)
 {
   lua_pushvalue(lstate, 2);
-  *status = lua_pcall(lstate, 0, 1, 0);
+  *status = nlua_pcall(lstate, 0, 1);
   if (*status) {
     return true;  // break on error, but keep error on stack
   }
@@ -385,7 +406,7 @@ static int nlua_state_init(lua_State *const lstate) FUNC_ATTR_NONNULL_ALL
   {
     const char *code = (char *)&shared_module[0];
     if (luaL_loadbuffer(lstate, code, strlen(code), "@vim/shared.lua")
-        || lua_pcall(lstate, 0, 0, 0)) {
+        || nlua_pcall(lstate, 0, 0)) {
       nlua_error(lstate, _("E5106: Error while creating shared module: %.*s"));
       return 1;
     }
@@ -397,7 +418,7 @@ static int nlua_state_init(lua_State *const lstate) FUNC_ATTR_NONNULL_ALL
 
     const char *code = (char *)&inspect_module[0];
     if (luaL_loadbuffer(lstate, code, strlen(code), "@vim/inspect.lua")
-        || lua_pcall(lstate, 0, 1, 0)) {
+        || nlua_pcall(lstate, 0, 1)) {
       nlua_error(lstate, _("E5106: Error while creating inspect module: %.*s"));
       return 1;
     }
@@ -406,7 +427,7 @@ static int nlua_state_init(lua_State *const lstate) FUNC_ATTR_NONNULL_ALL
 
     code = (char *)&lua_F_module[0];
     if (luaL_loadbuffer(lstate, code, strlen(code), "@vim/F.lua")
-        || lua_pcall(lstate, 0, 1, 0)) {
+        || nlua_pcall(lstate, 0, 1)) {
       nlua_error(lstate, _("E5106: Error while creating vim.F module: %.*s"));
       return 1;
     }
@@ -419,7 +440,7 @@ static int nlua_state_init(lua_State *const lstate) FUNC_ATTR_NONNULL_ALL
   {
     const char *code = (char *)&vim_module[0];
     if (luaL_loadbuffer(lstate, code, strlen(code), "@vim.lua")
-        || lua_pcall(lstate, 0, 0, 0)) {
+        || nlua_pcall(lstate, 0, 0)) {
       nlua_error(lstate, _("E5106: Error while creating vim module: %.*s"));
       return 1;
     }
@@ -431,7 +452,7 @@ static int nlua_state_init(lua_State *const lstate) FUNC_ATTR_NONNULL_ALL
 
     const char *code = (char *)&lua_meta_module[0];
     if (luaL_loadbuffer(lstate, code, strlen(code), "@vim/_meta.lua")
-        || lua_pcall(lstate, 0, 1, 0)) {
+        || nlua_pcall(lstate, 0, 1)) {
       nlua_error(lstate, _("E5106: Error while creating vim._meta module: %.*s"));
       return 1;
     }
@@ -549,6 +570,7 @@ static int nlua_print(lua_State *const lstate)
   for (; curargidx <= nargs; curargidx++) {
     lua_pushvalue(lstate, -1);  // tostring
     lua_pushvalue(lstate, curargidx);  // arg
+    // Do not use nlua_pcall here to avoid duplicate stack trace information
     if (lua_pcall(lstate, 1, 1, 0)) {
       errmsg = lua_tolstring(lstate, -1, &errmsg_len);
       goto nlua_print_error;
@@ -616,7 +638,7 @@ static int nlua_debug(lua_State *lstate)
     if (luaL_loadbuffer(lstate, (const char *)input.vval.v_string,
                         STRLEN(input.vval.v_string), "=(debug command)")) {
       nlua_error(lstate, _("E5115: Error while loading debug string: %.*s"));
-    } else if (lua_pcall(lstate, 0, 0, 0)) {
+    } else if (nlua_pcall(lstate, 0, 0)) {
       nlua_error(lstate, _("E5116: Error while calling debug string: %.*s"));
     }
     tv_clear(&input);
@@ -909,7 +931,7 @@ static void nlua_typval_exec(const char *lcmd, size_t lcmd_len, const char *name
 
   PUSH_ALL_TYPVALS(lstate, args, argcount, special);
 
-  if (lua_pcall(lstate, argcount, ret_tv ? 1 : 0, 0)) {
+  if (nlua_pcall(lstate, argcount, ret_tv ? 1 : 0)) {
     nlua_error(lstate, _("E5108: Error executing lua %.*s"));
     return;
   }
@@ -964,7 +986,7 @@ int typval_exec_lua_callable(lua_State *lstate, LuaCallable lua_cb, int argcount
 
   PUSH_ALL_TYPVALS(lstate, argvars, argcount, false);
 
-  if (lua_pcall(lstate, argcount, 1, 0)) {
+  if (nlua_pcall(lstate, argcount, 1)) {
     nlua_print(lstate);
     return ERROR_OTHER;
   }
@@ -999,7 +1021,7 @@ Object nlua_exec(const String str, const Array args, Error *err)
     nlua_push_Object(lstate, args.items[i], false);
   }
 
-  if (lua_pcall(lstate, (int)args.size, 1, 0)) {
+  if (nlua_pcall(lstate, (int)args.size, 1)) {
     size_t len;
     const char *errstr = lua_tolstring(lstate, -1, &len);
     api_set_error(err, kErrorTypeException,
@@ -1032,7 +1054,7 @@ Object nlua_call_ref(LuaRef ref, const char *name, Array args, bool retval, Erro
     nlua_push_Object(lstate, args.items[i], false);
   }
 
-  if (lua_pcall(lstate, nargs, retval ? 1 : 0, 0)) {
+  if (nlua_pcall(lstate, nargs, retval ? 1 : 0)) {
     // if err is passed, the caller will deal with the error.
     if (err) {
       size_t len;
@@ -1126,7 +1148,7 @@ void ex_luado(exarg_T *const eap)
   if (lcmd_len >= IOSIZE) {
     xfree(lcmd);
   }
-  if (lua_pcall(lstate, 0, 1, 0)) {
+  if (nlua_pcall(lstate, 0, 1)) {
     nlua_error(lstate, _("E5110: Error executing lua: %.*s"));
     return;
   }
@@ -1138,7 +1160,7 @@ void ex_luado(exarg_T *const eap)
     const char *old_line = (const char *)ml_get_buf(curbuf, l, false);
     lua_pushstring(lstate, old_line);
     lua_pushnumber(lstate, (lua_Number)l);
-    if (lua_pcall(lstate, 2, 1, 0)) {
+    if (nlua_pcall(lstate, 2, 1)) {
       nlua_error(lstate, _("E5111: Error calling lua: %.*s"));
       break;
     }
@@ -1189,7 +1211,7 @@ bool nlua_exec_file(const char *path)
     return false;
   }
 
-  if (lua_pcall(lstate, 0, 0, 0)) {
+  if (nlua_pcall(lstate, 0, 0)) {
     nlua_error(lstate, _("E5113: Error while calling lua chunk: %.*s"));
     return false;
   }
@@ -1241,7 +1263,7 @@ int nlua_expand_pat(expand_T *xp, char_u *pat, int *num_results, char_u ***resul
   // [ vim, vim._on_key, buf ]
   lua_pushlstring(lstate, (const char *)pat, STRLEN(pat));
 
-  if (lua_pcall(lstate, 1, 2, 0) != 0) {
+  if (nlua_pcall(lstate, 1, 2) != 0) {
     nlua_error(lstate,
                _("Error executing vim._expand_pat: %.*s"));
     return FAIL;
@@ -1394,7 +1416,7 @@ void nlua_execute_on_key(int c)
   // [ vim, vim._on_key, buf ]
   lua_pushlstring(lstate, (const char *)buf, buf_len);
 
-  if (lua_pcall(lstate, 1, 0, 0)) {
+  if (nlua_pcall(lstate, 1, 0)) {
     nlua_error(lstate,
                _("Error executing  vim.on_key Lua callback: %.*s"));
   }
 
@@ -2,6 +2,7 @@
 local helpers = require('test.functional.helpers')(after_each)
 
 local exc_exec = helpers.exc_exec
+local remove_trace = helpers.remove_trace
 local funcs = helpers.funcs
 local clear = helpers.clear
 local eval = helpers.eval
@@ -159,44 +160,44 @@ describe('luaeval(vim.api.…)', function()
   it('errors out correctly when working with API', function()
     -- Conversion errors
     eq('Vim(call):E5108: Error executing lua [string "luaeval()"]:1: Cannot convert given lua type',
-       exc_exec([[call luaeval("vim.api.nvim__id(vim.api.nvim__id)")]]))
+       remove_trace(exc_exec([[call luaeval("vim.api.nvim__id(vim.api.nvim__id)")]])))
     eq('Vim(call):E5108: Error executing lua [string "luaeval()"]:1: Cannot convert given lua table',
-       exc_exec([[call luaeval("vim.api.nvim__id({1, foo=42})")]]))
+       remove_trace(exc_exec([[call luaeval("vim.api.nvim__id({1, foo=42})")]])))
     eq('Vim(call):E5108: Error executing lua [string "luaeval()"]:1: Cannot convert given lua type',
-       exc_exec([[call luaeval("vim.api.nvim__id({42, vim.api.nvim__id})")]]))
+       remove_trace(exc_exec([[call luaeval("vim.api.nvim__id({42, vim.api.nvim__id})")]])))
     -- Errors in number of arguments
     eq('Vim(call):E5108: Error executing lua [string "luaeval()"]:1: Expected 1 argument',
-       exc_exec([[call luaeval("vim.api.nvim__id()")]]))
+       remove_trace(exc_exec([[call luaeval("vim.api.nvim__id()")]])))
     eq('Vim(call):E5108: Error executing lua [string "luaeval()"]:1: Expected 1 argument',
-       exc_exec([[call luaeval("vim.api.nvim__id(1, 2)")]]))
+       remove_trace(exc_exec([[call luaeval("vim.api.nvim__id(1, 2)")]])))
     eq('Vim(call):E5108: Error executing lua [string "luaeval()"]:1: Expected 2 arguments',
-       exc_exec([[call luaeval("vim.api.nvim_set_var(1, 2, 3)")]]))
+       remove_trace(exc_exec([[call luaeval("vim.api.nvim_set_var(1, 2, 3)")]])))
     -- Error in argument types
     eq('Vim(call):E5108: Error executing lua [string "luaeval()"]:1: Expected lua string',
-       exc_exec([[call luaeval("vim.api.nvim_set_var(1, 2)")]]))
+       remove_trace(exc_exec([[call luaeval("vim.api.nvim_set_var(1, 2)")]])))
 
     eq('Vim(call):E5108: Error executing lua [string "luaeval()"]:1: Expected lua number',
-       exc_exec([[call luaeval("vim.api.nvim_buf_get_lines(0, 'test', 1, false)")]]))
+       remove_trace(exc_exec([[call luaeval("vim.api.nvim_buf_get_lines(0, 'test', 1, false)")]])))
     eq('Vim(call):E5108: Error executing lua [string "luaeval()"]:1: Number is not integral',
-       exc_exec([[call luaeval("vim.api.nvim_buf_get_lines(0, 1.5, 1, false)")]]))
+       remove_trace(exc_exec([[call luaeval("vim.api.nvim_buf_get_lines(0, 1.5, 1, false)")]])))
 
     eq('Vim(call):E5108: Error executing lua [string "luaeval()"]:1: Expected lua table',
-       exc_exec([[call luaeval("vim.api.nvim__id_float('test')")]]))
+       remove_trace(exc_exec([[call luaeval("vim.api.nvim__id_float('test')")]])))
     eq('Vim(call):E5108: Error executing lua [string "luaeval()"]:1: Unexpected type',
-       exc_exec([[call luaeval("vim.api.nvim__id_float({[vim.type_idx]=vim.types.dictionary})")]]))
+       remove_trace(exc_exec([[call luaeval("vim.api.nvim__id_float({[vim.type_idx]=vim.types.dictionary})")]])))
 
     eq('Vim(call):E5108: Error executing lua [string "luaeval()"]:1: Expected lua table',
-       exc_exec([[call luaeval("vim.api.nvim__id_array(1)")]]))
+       remove_trace(exc_exec([[call luaeval("vim.api.nvim__id_array(1)")]])))
     eq('Vim(call):E5108: Error executing lua [string "luaeval()"]:1: Unexpected type',
-       exc_exec([[call luaeval("vim.api.nvim__id_array({[vim.type_idx]=vim.types.dictionary})")]]))
+       remove_trace(exc_exec([[call luaeval("vim.api.nvim__id_array({[vim.type_idx]=vim.types.dictionary})")]])))
 
     eq('Vim(call):E5108: Error executing lua [string "luaeval()"]:1: Expected lua table',
-       exc_exec([[call luaeval("vim.api.nvim__id_dictionary(1)")]]))
+       remove_trace(exc_exec([[call luaeval("vim.api.nvim__id_dictionary(1)")]])))
     eq('Vim(call):E5108: Error executing lua [string "luaeval()"]:1: Unexpected type',
-       exc_exec([[call luaeval("vim.api.nvim__id_dictionary({[vim.type_idx]=vim.types.array})")]]))
+       remove_trace(exc_exec([[call luaeval("vim.api.nvim__id_dictionary({[vim.type_idx]=vim.types.array})")]])))
 
     eq('Vim(call):E5108: Error executing lua [string "luaeval()"]:1: Expected lua table',
-       exc_exec([[call luaeval("vim.api.nvim_set_keymap('', '', '', '')")]]))
+       remove_trace(exc_exec([[call luaeval("vim.api.nvim_set_keymap('', '', '', '')")]])))
 
     -- TODO: check for errors with Tabpage argument
     -- TODO: check for errors with Window argument
 
@@ -17,6 +17,7 @@ local pcall_err = helpers.pcall_err
 local write_file = helpers.write_file
 local exec_capture = helpers.exec_capture
 local curbufmeths = helpers.curbufmeths
+local remove_trace = helpers.remove_trace
 
 before_each(clear)
 
@@ -46,9 +47,9 @@ describe(':lua command', function()
     eq([[Vim(lua):E5107: Error loading lua [string ":lua"]:0: unexpected symbol near ')']],
        pcall_err(command, 'lua ()'))
     eq([[Vim(lua):E5108: Error executing lua [string ":lua"]:1: TEST]],
-       exc_exec('lua error("TEST")'))
+       remove_trace(exc_exec('lua error("TEST")')))
     eq([[Vim(lua):E5108: Error executing lua [string ":lua"]:1: Invalid buffer id: -10]],
-       exc_exec('lua vim.api.nvim_buf_set_lines(-10, 1, 1, false, {"TEST"})'))
+       remove_trace(exc_exec('lua vim.api.nvim_buf_set_lines(-10, 1, 1, false, {"TEST"})')))
     eq({''}, curbufmeths.get_lines(0, 100, false))
   end)
   it('works with NULL errors', function()
@@ -95,15 +96,15 @@ describe(':lua command', function()
 
     feed(':lua error("fail\\nmuch error\\nsuch details")<cr>')
     screen:expect{grid=[[
-                                              |
-      {1:~                                       }|
-      {1:~                                       }|
-      {1:~                                       }|
       {2:                                        }|
       {3:E5108: Error executing lua [string ":lua}|
       {3:"]:1: fail}                              |
       {3:much error}                              |
       {3:such details}                            |
+      {3:stack traceback:}                        |
+      {3:        [C]: in function 'error'}        |
+      {3:        [string ":lua"]:1: in main chunk}|
+                                              |
       {4:Press ENTER or type command to continue}^ |
     ]]}
     feed('<cr>')
@@ -119,24 +120,24 @@ describe(':lua command', function()
       {1:~                                       }|
                                               |
     ]]}
-    eq('E5108: Error executing lua [string ":lua"]:1: fail\nmuch error\nsuch details', eval('v:errmsg'))
+    eq('E5108: Error executing lua [string ":lua"]:1: fail\nmuch error\nsuch details', remove_trace(eval('v:errmsg')))
 
     local status, err = pcall(command,'lua error("some error\\nin a\\nAPI command")')
     local expected = 'Vim(lua):E5108: Error executing lua [string ":lua"]:1: some error\nin a\nAPI command'
     eq(false, status)
-    eq(expected, string.sub(err, -string.len(expected)))
+    eq(expected, string.sub(remove_trace(err), -string.len(expected)))
 
     feed(':messages<cr>')
     screen:expect{grid=[[
-                                              |
-      {1:~                                       }|
-      {1:~                                       }|
-      {1:~                                       }|
       {2:                                        }|
       {3:E5108: Error executing lua [string ":lua}|
       {3:"]:1: fail}                              |
       {3:much error}                              |
       {3:such details}                            |
+      {3:stack traceback:}                        |
+      {3:        [C]: in function 'error'}        |
+      {3:        [string ":lua"]:1: in main chunk}|
+                                              |
       {4:Press ENTER or type command to continue}^ |
     ]]}
   end)
@@ -219,7 +220,7 @@ describe(':luafile', function()
        exc_exec('luafile ' .. fname))
     write_file(fname, 'vimm.api.nvim_buf_set_lines(1, 1, 2, false, {"ETTS"})')
     eq(("Vim(luafile):E5113: Error while calling lua chunk: %s:1: attempt to index global 'vimm' (a nil value)"):format(fname),
-       exc_exec('luafile ' .. fname))
+        remove_trace(exc_exec('luafile ' .. fname)))
   end)
   it('works with NULL errors', function()
     write_file(fname, 'error(nil)')
 
@@ -84,14 +84,14 @@ describe('vim.loop', function()
 
     screen:expect([[
                                                         |
-      {1:~                                                 }|
-      {1:~                                                 }|
-      {1:~                                                 }|
-      {1:~                                                 }|
       {2:                                                  }|
       {3:Error executing luv callback:}                     |
       {3:[string "<nvim>"]:5: E5560: nvim_set_var must not }|
       {3:be called in a lua loop callback}                  |
+      {3:stack traceback:}                                  |
+      {3:        [C]: in function 'nvim_set_var'}           |
+      {3:        [string "<nvim>"]:5: in function <[string }|
+      {3:"<nvim>"]:2>}                                      |
       {4:Press ENTER or type command to continue}^           |
     ]])
     feed('<cr>')
 
@@ -4,6 +4,7 @@ local Screen = require('test.functional.ui.screen')
 
 local pcall_err = helpers.pcall_err
 local exc_exec = helpers.exc_exec
+local remove_trace = helpers.remove_trace
 local exec_lua = helpers.exec_lua
 local command = helpers.command
 local meths = helpers.meths
@@ -424,11 +425,11 @@ describe('luaeval()', function()
   it('errors out correctly when doing incorrect things in lua', function()
     -- Conversion errors
     eq('Vim(call):E5108: Error executing lua [string "luaeval()"]:1: attempt to call field \'xxx_nonexistent_key_xxx\' (a nil value)',
-       exc_exec([[call luaeval("vim.xxx_nonexistent_key_xxx()")]]))
+       remove_trace(exc_exec([[call luaeval("vim.xxx_nonexistent_key_xxx()")]])))
     eq('Vim(call):E5108: Error executing lua [string "luaeval()"]:1: ERROR',
-       exc_exec([[call luaeval("error('ERROR')")]]))
+       remove_trace(exc_exec([[call luaeval("error('ERROR')")]])))
     eq('Vim(call):E5108: Error executing lua [NULL]',
-       exc_exec([[call luaeval("error(nil)")]]))
+       remove_trace(exc_exec([[call luaeval("error(nil)")]])))
   end)
 
   it('does not leak memory when called with too long line',