mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-09 04:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(lua): don't override script ID from :source (#32626)

Browse Source 
Problem:  When setting an option, mapping etc. from Lua without -V1, the
          script ID is set to SID_LUA even if there already is a script
          ID assigned by :source.
Solution: Don't set script ID to SID_LUA if it is already a Lua script.
          Also add _editor.lua to ignorelist to make script context more
          useful when using vim.cmd().
This commit is contained in:
zeertzjq
2025-02-26 07:40:21 +08:00
committed by GitHub
parent af0a2157ad
commit e2aca58bcc
8 changed files with 188 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2110,7 +2110,8 @@ bool nlua_execute_on_key(int c, char *typed_buf)
// @param[out] current
void nlua_set_sctx(sctx_T *current)
{
if (p_verbose <= 0 || current->sc_sid != SID_LUA) {
if (p_verbose <= 0 || (current->sc_sid > 0 && current->sc_lnum > 0)
|| !script_is_lua(current->sc_sid)) {
return;
}
lua_State *const lstate = global_lstate;
@@ -2119,6 +2120,7 @@ void nlua_set_sctx(sctx_T *current)
// Files where internal wrappers are defined so we can ignore them
// like vim.o/opt etc are defined in _options.lua
char *ignorelist[] = {
"vim/_editor.lua",
"vim/_options.lua",
"vim/keymap.lua",
};
@@ -2153,7 +2155,8 @@ void nlua_set_sctx(sctx_T *current)
if (sid > 0) {
xfree(source_path);
} else {
new_script_item(source_path, &sid);
scriptitem_T *si = new_script_item(source_path, &sid);
si->sn_lua = true;
}
current->sc_sid = sid;
current->sc_seq = -1;