Mercurial > vim
changeset 27966:80f398bfc19f v8.2.4508
patch 8.2.4508: Vim9: cannot assign to a global variable on the command line
Commit: https://github.com/vim/vim/commit/330a388e18ad6b64c3574c712db675258b0e9878
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Mar 5 11:05:57 2022 +0000
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.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 05 Mar 2022 12:15:04 +0100 |
parents | 735bd3823bb5 |
children | c91fca0baf52 |
files | src/evalvars.c src/testdir/dumps/Test_vim9_reject_declaration.dump src/testdir/dumps/Test_vim9_reject_declaration_1.dump src/testdir/dumps/Test_vim9_reject_declaration_2.dump src/testdir/test_vim9_script.vim src/version.c |
diffstat | 6 files changed, 21 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalvars.c +++ b/src/evalvars.c @@ -754,12 +754,14 @@ heredoc_get(exarg_T *eap, char_u *cmd, i 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;
rename from src/testdir/dumps/Test_vim9_reject_declaration.dump rename to src/testdir/dumps/Test_vim9_reject_declaration_1.dump
new file mode 100644 --- /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|
--- 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)