mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-10 13:28:19 +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

13
src/nvim/api/private/helpers.c
View File

@@ -30,6 +30,7 @@
#include "nvim/message.h"
#include "nvim/msgpack_rpc/unpacker.h"
#include "nvim/pos_defs.h"
#include "nvim/runtime.h"
#include "nvim/types_defs.h"
#ifdef INCLUDE_GENERATED_DECLARATIONS
@@ -1057,10 +1058,18 @@ const char *get_default_stl_hl(win_T *wp, bool use_winbar, int stc_hl_id)
sctx_T api_set_sctx(uint64_t channel_id)
{
sctx_T old_current_sctx = current_sctx;
// The script context is already properly set when calling an API from Vimscript.
if (channel_id != VIML_INTERNAL_CALL) {
current_sctx.sc_sid = channel_id == LUA_INTERNAL_CALL ? SID_LUA : SID_API_CLIENT;
current_sctx.sc_lnum = 0;
current_sctx.sc_chan = channel_id;
if (channel_id == LUA_INTERNAL_CALL) {
// When the current script is a Lua script, don't override sc_sid.
if (!script_is_lua(current_sctx.sc_sid)) {
current_sctx.sc_sid = SID_LUA;
}
} else {
current_sctx.sc_sid = SID_API_CLIENT;
current_sctx.sc_chan = channel_id;
}
}
return old_current_sctx;
}