From 89d6d6f25cf22175e8c8eedef7181d8d618f9898 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Thu, 27 Feb 2025 21:49:57 +0800 Subject: fix(lua): wrong script context for option set by func from nvim_exec2 (#32659) Problem: Wrong script context for option set by function defined by nvim_exec2 in a Lua script. Solution: Call nlua_set_sctx() after adding SOURCING_LNUM and always set sc_lnum for a Lua script. This is a bug discovered when testing #28486. Not sure if this actually happens in practice, but it's easy to fix and required for #28486. --- src/nvim/lua/executor.c | 16 ++++++++++++---- src/nvim/option.c | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c index c4c6c19439..bd00df395c 100644 --- a/src/nvim/lua/executor.c +++ b/src/nvim/lua/executor.c @@ -2106,12 +2106,20 @@ bool nlua_execute_on_key(int c, char *typed_buf) return discard; } -// Sets the editor "script context" during Lua execution. Used by :verbose. -// @param[out] current +/// Sets the editor "script context" during Lua execution. Used by :verbose. +/// @param[out] current void nlua_set_sctx(sctx_T *current) { - if (p_verbose <= 0 || (current->sc_sid > 0 && current->sc_lnum > 0) - || !script_is_lua(current->sc_sid)) { + if (!script_is_lua(current->sc_sid)) { + return; + } + + // This function is called after adding SOURCING_LNUM to sc_lnum. + // SOURCING_LNUM can sometimes be non-zero (e.g. with ETYPE_UFUNC), + // but it's unrelated to the line number in Lua scripts. + current->sc_lnum = 0; + + if (p_verbose <= 0) { return; } lua_State *const lstate = global_lstate; diff --git a/src/nvim/option.c b/src/nvim/option.c index 4506c21668..3d4c2e65f9 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1813,12 +1813,12 @@ sctx_T *get_option_sctx(OptIndex opt_idx) void set_option_sctx(OptIndex opt_idx, int opt_flags, sctx_T script_ctx) { bool both = (opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0; - nlua_set_sctx(&script_ctx); // Modeline already has the line number set. if (!(opt_flags & OPT_MODELINE)) { script_ctx.sc_lnum += SOURCING_LNUM; } + nlua_set_sctx(&script_ctx); // Remember where the option was set. For local options need to do that // in the buffer or window structure. -- cgit