From 330a388e18ad6b64c3574c712db675258b0e9878 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 5 Mar 2022 11:05:57 +0000 Subject: [PATCH] patch 8.2.4508: Vim9: cannot assign to a global variable on the command line Problem: Vim9: cannot assign to a global variable on the command line. Solution: Allow using :vim9cmd for assignment on the command line. --- src/evalvars.c | 4 +++- ...declaration.dump => Test_vim9_reject_declaration_1.dump} | 0 src/testdir/dumps/Test_vim9_reject_declaration_2.dump | 6 ++++++ src/testdir/test_vim9_script.vim | 5 ++++- src/version.c | 2 ++ 5 files changed, 15 insertions(+), 2 deletions(-) rename src/testdir/dumps/{Test_vim9_reject_declaration.dump => Test_vim9_reject_declaration_1.dump} (100%) create mode 100644 src/testdir/dumps/Test_vim9_reject_declaration_2.dump diff --git a/src/evalvars.c b/src/evalvars.c index 260c297b0..40e643b9f 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 similarity index 100% rename from src/testdir/dumps/Test_vim9_reject_declaration.dump rename to 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 000000000..a6d516c61 --- /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 70a3ffbe3..f60fb36bc 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\") - g:VerifyScreenDump(buf, 'Test_vim9_reject_declaration', {}) + g:VerifyScreenDump(buf, 'Test_vim9_reject_declaration_1', {}) + term_sendkeys(buf, ":\") + term_sendkeys(buf, ":vim9cmd g:foo = 123 | echo g:foo\") + g:VerifyScreenDump(buf, 'Test_vim9_reject_declaration_2', {}) # clean up g:StopVimInTerminal(buf) diff --git a/src/version.c b/src/version.c index 2e22a77f8..5bbd307c7 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 4508, /**/ 4507, /**/ -- 2.40.0