patch 8.2.4059: Vim9: an expression of a map cannot access script-local items
Problem: Vim9: an expression of a map cannot access script-local items.
(Maxim Kim)
Solution: Use the script ID of where the map was defined.
diff --git a/src/map.c b/src/map.c
index 336425a..181aa65 100644
--- a/src/map.c
+++ b/src/map.c
@@ -260,6 +260,7 @@
{
mp->m_script_ctx.sc_sid = sid;
mp->m_script_ctx.sc_lnum = lnum;
+ mp->m_script_ctx.sc_version = in_vim9script() ? SCRIPT_VERSION_VIM9 : 0;
}
else
{
@@ -1565,7 +1566,7 @@
}
#ifdef FEAT_EVAL
if (mp->m_expr)
- s = eval_map_expr(mp->m_str, c);
+ s = eval_map_expr(mp, c);
else
#endif
s = mp->m_str;
@@ -1600,7 +1601,7 @@
*/
char_u *
eval_map_expr(
- char_u *str,
+ mapblock_T *mp,
int c) // NUL or typed character for abbreviation
{
char_u *res;
@@ -1609,10 +1610,12 @@
pos_T save_cursor;
int save_msg_col;
int save_msg_row;
+ scid_T save_sctx_sid = current_sctx.sc_sid;
+ int save_sctx_version = current_sctx.sc_version;
// Remove escaping of CSI, because "str" is in a format to be used as
// typeahead.
- expr = vim_strsave(str);
+ expr = vim_strsave(mp->m_str);
if (expr == NULL)
return NULL;
vim_unescape_csi(expr);
@@ -1625,12 +1628,22 @@
save_cursor = curwin->w_cursor;
save_msg_col = msg_col;
save_msg_row = msg_row;
+ if (mp->m_script_ctx.sc_version == SCRIPT_VERSION_VIM9)
+ {
+ current_sctx.sc_sid = mp->m_script_ctx.sc_sid;
+ current_sctx.sc_version = SCRIPT_VERSION_VIM9;
+ }
+
+ // Note: the evaluation may make "mp" invalid.
p = eval_to_string(expr, FALSE);
+
--textwinlock;
--ex_normal_lock;
curwin->w_cursor = save_cursor;
msg_col = save_msg_col;
msg_row = save_msg_row;
+ current_sctx.sc_sid = save_sctx_sid;
+ current_sctx.sc_version = save_sctx_version;
vim_free(expr);