patch 8.2.4500: Vim9: can declare a global variable on the command line
Problem: Vim9: can declare a global variable on the command line.
Solution: Disallow declaring a variable on the command line. (closes #9881)
diff --git a/src/testdir/dumps/Test_vim9_reject_declaration.dump b/src/testdir/dumps/Test_vim9_reject_declaration.dump
new file mode 100644
index 0000000..e4f5623
--- /dev/null
+++ b/src/testdir/dumps/Test_vim9_reject_declaration.dump
@@ -0,0 +1,6 @@
+|~+0#4040ff13#ffffff0| @73
+|~| @73
+|~| @73
+|~| @73
+|E+0#ffffff16#e000002|1|0|7|9|:| |C|a|n@1|o|t| |d|e|c|l|a|r|e| |a| |v|a|r|i|a|b|l|e| |o|n| |t|h|e| |c|o|m@1|a|n|d| |l|i|n|e| +0#0000000#ffffff0@22
+|P+0#00e0003&|r|e|s@1| |E|N|T|E|R| |o|r| |t|y|p|e| |c|o|m@1|a|n|d| |t|o| |c|o|n|t|i|n|u|e> +0#0000000&@35
diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index 565d897..ccf2a01 100644
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -2480,23 +2480,6 @@
delete('Xtestscript')
enddef
-func Test_declare_command_line()
- CheckRunVimInTerminal
- call Run_Test_declare_command_line()
-endfunc
-
-def Run_Test_declare_command_line()
- # On the command line the type is parsed but not used.
- # To get rid of the script context have to run this in another Vim instance.
- var buf = g:RunVimInTerminal('', {'rows': 6})
- term_sendkeys(buf, ":vim9 var abc: list<list<number>> = [ [1, 2, 3], [4, 5, 6] ]\<CR>")
- g:TermWait(buf)
- term_sendkeys(buf, ":echo abc\<CR>")
- g:TermWait(buf)
- g:WaitForAssert(() => assert_match('\[\[1, 2, 3\], \[4, 5, 6\]\]', term_getline(buf, 6)))
- g:StopVimInTerminal(buf)
-enddef
-
def Test_using_s_var_in_function()
var lines =<< trim END
vim9script
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 68178cf..87acff6 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -3326,34 +3326,50 @@
func Test_no_redraw_when_restoring_cpo()
CheckScreendump
CheckFeature timers
+ call Run_test_no_redraw_when_restoring_cpo()
+endfunc
- let lines =<< trim END
+def Run_test_no_redraw_when_restoring_cpo()
+ var lines =<< trim END
vim9script
export def Func()
enddef
END
- call mkdir('Xdir/autoload', 'p')
- call writefile(lines, 'Xdir/autoload/script.vim')
+ mkdir('Xdir/autoload', 'p')
+ writefile(lines, 'Xdir/autoload/script.vim')
- let lines =<< trim END
+ lines =<< trim END
vim9script
set cpo+=M
exe 'set rtp^=' .. getcwd() .. '/Xdir'
au CmdlineEnter : ++once timer_start(0, (_) => script#Func())
setline(1, 'some text')
END
- call writefile(lines, 'XTest_redraw_cpo')
- let buf = g:RunVimInTerminal('-S XTest_redraw_cpo', {'rows': 6})
- call term_sendkeys(buf, "V:")
- call VerifyScreenDump(buf, 'Test_vim9_no_redraw', {})
+ writefile(lines, 'XTest_redraw_cpo')
+ var buf = g:RunVimInTerminal('-S XTest_redraw_cpo', {'rows': 6})
+ term_sendkeys(buf, "V:")
+ g:VerifyScreenDump(buf, 'Test_vim9_no_redraw', {})
- " clean up
- call term_sendkeys(buf, "\<Esc>u")
- call g:StopVimInTerminal(buf)
- call delete('XTest_redraw_cpo')
- call delete('Xdir', 'rf')
+ # clean up
+ term_sendkeys(buf, "\<Esc>u")
+ g:StopVimInTerminal(buf)
+ delete('XTest_redraw_cpo')
+ delete('Xdir', 'rf')
+enddef
+
+func Test_reject_declaration()
+ CheckScreendump
+ call Run_test_reject_declaration()
endfunc
+def Run_test_reject_declaration()
+ var buf = g:RunVimInTerminal('', {'rows': 6})
+ term_sendkeys(buf, ":vim9cmd var x: number\<CR>")
+ g:VerifyScreenDump(buf, 'Test_vim9_reject_declaration', {})
+
+ # clean up
+ g:StopVimInTerminal(buf)
+enddef
def Test_unset_any_variable()
var lines =<< trim END