patch 8.2.2162: Vim9: Cannot load or store autoload variables
Problem: Vim9: Cannot load or store autoload variables.
Solution: Add ISN_LOADAUTO and ISN_STOREAUTO. (closes #7485)
diff --git a/src/testdir/test_vim9_disassemble.vim b/src/testdir/test_vim9_disassemble.vim
index 7ea1491..d936bc2 100644
--- a/src/testdir/test_vim9_disassemble.vim
+++ b/src/testdir/test_vim9_disassemble.vim
@@ -23,6 +23,7 @@
echo s:scriptvar
echo g:globalvar
echo get(g:, "global")
+ echo g:auto#var
echo b:buffervar
echo get(b:, "buffer")
echo w:windowvar
@@ -68,8 +69,14 @@
'echo get(g:, "global")\_s*' ..
'\d\+ LOAD g:\_s*' ..
'\d\+ PUSHS "global"\_s*' ..
- '\d\+ BCALL get(argc 2).*' ..
- ' LOADB b:buffervar.*' ..
+ '\d\+ BCALL get(argc 2)\_s*' ..
+ '\d\+ ECHO 1\_s*' ..
+ 'echo g:auto#var\_s*' ..
+ '\d\+ LOADAUTO g:auto#var\_s*' ..
+ '\d\+ ECHO 1\_s*' ..
+ 'echo b:buffervar\_s*' ..
+ '\d\+ LOADB b:buffervar\_s*' ..
+ '\d\+ ECHO 1\_s*' ..
'echo get(b:, "buffer")\_s*' ..
'\d\+ LOAD b:\_s*' ..
'\d\+ PUSHS "buffer"\_s*' ..
@@ -197,6 +204,7 @@
v:char = 'abc'
s:scriptvar = 'sv'
g:globalvar = 'gv'
+ g:auto#var = 'av'
b:buffervar = 'bv'
w:windowvar = 'wv'
t:tabpagevar = 'tv'
@@ -220,6 +228,8 @@
' STORES s:scriptvar in .*test_vim9_disassemble.vim.*' ..
'g:globalvar = ''gv''.*' ..
' STOREG g:globalvar.*' ..
+ 'g:auto#var = ''av''.*' ..
+ ' STOREAUTO g:auto#var.*' ..
'b:buffervar = ''bv''.*' ..
' STOREB b:buffervar.*' ..
'w:windowvar = ''wv''.*' ..
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 2f651cd..5949acb 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -2779,10 +2779,34 @@
quit
enddef
-" test using a vim9script that is auto-loaded from an autocmd
+" test using an auto-loaded function and variable
def Test_vim9_autoload()
var lines =<< trim END
vim9script
+ def some#gettest(): string
+ return 'test'
+ enddef
+ g:some#name = 'name'
+ END
+
+ mkdir('Xdir/autoload', 'p')
+ writefile(lines, 'Xdir/autoload/some.vim')
+ var save_rtp = &rtp
+ exe 'set rtp^=' .. getcwd() .. '/Xdir'
+
+ assert_equal('test', g:some#gettest())
+ assert_equal('name', g:some#name)
+ g:some#other = 'other'
+ assert_equal('other', g:some#other)
+
+ delete('Xdir', 'rf')
+ &rtp = save_rtp
+enddef
+
+" test using a vim9script that is auto-loaded from an autocmd
+def Test_vim9_aucmd_autoload()
+ var lines =<< trim END
+ vim9script
def foo#test()
echomsg getreg('"')
enddef
@@ -2842,6 +2866,12 @@
delete('Xdidit')
delete('Xscript')
delete('Xruntime', 'rf')
+
+ lines =<< trim END
+ vim9script
+ var foo#bar = 'asdf'
+ END
+ CheckScriptFailure(lines, 'E461: Illegal variable name: foo#bar', 2)
enddef
def Test_script_var_in_autocmd()