aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.4083: Vim9: no test for "vim9script autoload' using script variable

Browse Source 
Problem:    Vim9: no test for "vim9script autoload' and using script variable
            in the same script.
Solution:   Add a simple test.  Fix uncovered problem.
This commit is contained in:
Bram Moolenaar
2022-01-13 20:18:56 +00:00
parent 3049fcf0a1
commit 0e3e7ba05f
3 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/evalvars.c
View File

@@ -2874,6 +2874,32 @@ find_var(char_u *name, hashtab_T **htp, int no_autoload)
}
}
// When using "vim9script autoload" script-local items are prefixed but can
// be used with s:name.
if (SCRIPT_ID_VALID(current_sctx.sc_sid)
&& name[0] == 's' && name[1] == ':')
{
scriptitem_T *si = SCRIPT_ITEM(current_sctx.sc_sid);
if (si->sn_autoload_prefix != NULL)
{
char_u *auto_name = concat_str(si->sn_autoload_prefix, name + 2);
if (auto_name != NULL)
{
ht = &globvarht;
ret = find_var_in_ht(ht, *name, auto_name, TRUE);
if (ret != NULL)
{
if (htp != NULL)
*htp = ht;
return ret;
}
}
vim_free(auto_name);
}
}
return NULL;
}
@@ -3318,7 +3344,7 @@ set_var(
}
/*
* Set variable "name" to value in "tv".
* Set variable "name" to value in "tv_arg".
* When "sid" is non-zero "name" is in the script with this ID.
* If the variable already exists and "is_const" is FALSE the value is updated.
* Otherwise the variable is created.