diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-03-05 11:05:57 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-03-05 11:05:57 +0000 |
| commit | 330a388e18ad6b64c3574c712db675258b0e9878 (patch) | |
| tree | 99c61b05a3986cb741ff507dddf3ca7e94bd7171 | |
| parent | f78ee2b49f0b060c642764a620b4c55ab13af82e (diff) | |
patch 8.2.4508: Vim9: cannot assign to a global variable on the command linev8.2.4508
Problem: Vim9: cannot assign to a global variable on the command line.
Solution: Allow using :vim9cmd for assignment on the command line.
| -rw-r--r-- | src/evalvars.c | 4 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_vim9_reject_declaration_1.dump (renamed from src/testdir/dumps/Test_vim9_reject_declaration.dump) | 0 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_vim9_reject_declaration_2.dump | 6 | ||||
| -rw-r--r-- | src/testdir/test_vim9_script.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 15 insertions, 2 deletions
diff --git a/src/evalvars.c b/src/evalvars.c index 260c297b0e..40e643b9f3 100644 --- a/src/evalvars.c +++ b/src/evalvars.c @@ -754,12 +754,14 @@ heredoc_get(exarg_T *eap, char_u *cmd, int script_get) void ex_var(exarg_T *eap) { + char_u *p = eap->cmd; + if (!in_vim9script()) { semsg(_(e_str_cannot_be_used_in_legacy_vim_script), ":var"); return; } - if (current_sctx.sc_sid == 0) + if (current_sctx.sc_sid == 0 && checkforcmd_noparen(&p, "var", 3)) { emsg(_(e_cannot_declare_variable_on_command_line)); return; diff --git a/src/testdir/dumps/Test_vim9_reject_declaration.dump b/src/testdir/dumps/Test_vim9_reject_declaration_1.dump index e4f56239a8..e4f56239a8 100644 --- a/src/testdir/dumps/Test_vim9_reject_declaration.dump +++ b/src/testdir/dumps/Test_vim9_reject_declaration_1.dump diff --git a/src/testdir/dumps/Test_vim9_reject_declaration_2.dump b/src/testdir/dumps/Test_vim9_reject_declaration_2.dump new file mode 100644 index 0000000000..a6d516c61a --- /dev/null +++ b/src/testdir/dumps/Test_vim9_reject_declaration_2.dump @@ -0,0 +1,6 @@ +> +0&#ffffff0@74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|1+0#0000000&|2|3| @53|0|,|0|-|1| @8|A|l@1| diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index 70a3ffbe3c..f60fb36bc3 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -3365,7 +3365,10 @@ 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', {}) + g:VerifyScreenDump(buf, 'Test_vim9_reject_declaration_1', {}) + term_sendkeys(buf, ":\<CR>") + term_sendkeys(buf, ":vim9cmd g:foo = 123 | echo g:foo\<CR>") + g:VerifyScreenDump(buf, 'Test_vim9_reject_declaration_2', {}) # clean up g:StopVimInTerminal(buf) diff --git a/src/version.c b/src/version.c index 2e22a77f87..5bbd307c75 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4508, +/**/ 4507, /**/ 4506, |