patch 8.2.4083: Vim9: no test for "vim9script autoload' using script variable
Problem: Vim9: no test for "vim9script autoload' and using script variable
in the same script.
Solution: Add a simple test. Fix uncovered problem.
diff --git a/src/evalvars.c b/src/evalvars.c
index 9bd1cc1..92dcd76 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -2874,6 +2874,32 @@
}
}
+ // 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 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.
diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim
index e9d9473..24aa28d 100644
--- a/src/testdir/test_vim9_import.vim
+++ b/src/testdir/test_vim9_import.vim
@@ -1091,7 +1091,7 @@
enddef
" test using an auto-loaded function and variable
-def Test_vim9_autoload()
+def Test_vim9_autoload_full_name()
var lines =<< trim END
vim9script
def some#gettest(): string
@@ -1146,11 +1146,16 @@
return 'test'
enddef
- export func GetMore()
- return Gettest() .. 'more'
+ export var name = 'name'
+
+ export func GetFunc()
+ return Gettest() .. 'more' .. s:name
endfunc
- export var name = 'name'
+ export def GetDef(): string
+ return Gettest() .. 'more' .. name
+ enddef
+
export final fname = 'final'
export const cname = 'const'
END
@@ -1165,7 +1170,8 @@
assert_equal('test', prefixed.Gettest())
assert_equal(1, g:prefixed_loaded)
- assert_equal('testmore', prefixed.GetMore())
+ assert_equal('testmorename', prefixed.GetFunc())
+ assert_equal('testmorename', prefixed.GetDef())
assert_equal('name', prefixed.name)
assert_equal('final', prefixed.fname)
assert_equal('const', prefixed.cname)
@@ -1178,7 +1184,7 @@
# can also get the items by autoload name
lines =<< trim END
call assert_equal('test', prefixed#Gettest())
- call assert_equal('testmore', prefixed#GetMore())
+ call assert_equal('testmorename', prefixed#GetFunc())
call assert_equal('name', prefixed#name)
call assert_equal('final', prefixed#fname)
call assert_equal('const', prefixed#cname)
diff --git a/src/version.c b/src/version.c
index 2a2c3de..ecfa17d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4083,
+/**/
4082,
/**/
4081,