Mercurial > vim
changeset 23823:262ab14b27db v8.2.2453
patch 8.2.2453: Vim9: a variable name with "->" in the next line doesn't work
Commit: https://github.com/vim/vim/commit/148be9bc1cca16ce47ad21563f5835682001f9a2
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Feb 2 21:33:52 2021 +0100
patch 8.2.2453: Vim9: a variable name with "->" in the next line doesn't work
Problem: Vim9: a variable name with "->" in the next line doesn't work.
Solution: Recognize a variable name by itself. (closes https://github.com/vim/vim/issues/7770)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 02 Feb 2021 21:45:04 +0100 |
| parents | b4e8bcf41ad8 |
| children | 8b7e3139961a |
| files | src/ex_docmd.c src/testdir/test_vim9_cmd.vim src/version.c |
| diffstat | 3 files changed, 35 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -3424,6 +3424,16 @@ find_ex_command( return eap->cmd; } } + + // If it is an ID it might be a variable with an operator on the next + // line, if the variable exists it can't be an Ex command. + if (p > eap->cmd && ends_excmd(*skipwhite(p)) + && (lookup(eap->cmd, p - eap->cmd, NULL, cctx) == OK + || (ASCII_ISALPHA(eap->cmd[0]) && eap->cmd[1] == ':'))) + { + eap->cmdidx = CMD_eval; + return eap->cmd; + } } #endif
--- a/src/testdir/test_vim9_cmd.vim +++ b/src/testdir/test_vim9_cmd.vim @@ -328,6 +328,29 @@ def Test_method_call_linebreak() assert_equal([1, 2, 3], res) END CheckScriptSuccess(lines) + + lines =<< trim END + new + var name = [1, 2] + name + ->copy() + ->setline(1) + assert_equal(['1', '2'], getline(1, 2)) + bwipe! + END + CheckDefAndScriptSuccess(lines) + + lines =<< trim END + new + g:shortlist + ->copy() + ->setline(1) + assert_equal(['1', '2'], getline(1, 2)) + bwipe! + END + g:shortlist = [1, 2] + CheckDefAndScriptSuccess(lines) + unlet g:shortlist enddef def Test_method_call_whitespace()