aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.1112: Vim9: no line continuation allowed in method call

Browse Source 
Problem:    Vim9: no line continuation allowed in method call.
Solution:   Handle line continuation in expression before method call.
This commit is contained in:
Bram Moolenaar
2020-07-01 20:07:14 +02:00
parent 9a78e6df17
commit 5f195938d4
5 changed files with 50 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ex_docmd.c
View File

@@ -3219,7 +3219,7 @@ find_ex_command(
* "lvar = value", "lvar(arg)", "[1, 2 3]->Func()"
*/
p = eap->cmd;
if (lookup != NULL && (*p == '('
if (lookup != NULL && (*p == '(' || *p == '[' || *p == '{'
|| ((p = to_name_const_end(eap->cmd)) > eap->cmd && *p != NUL)))
{
int oplen;
@@ -3230,8 +3230,9 @@ find_ex_command(
// "g:varname" is an expression.
// "varname->expr" is an expression.
// "(..." is an expression.
// "{..." is an dict expression.
if (*p == '('
|| *p == '['
|| *p == '{'
|| p[1] == ':'
|| (*p == '-' && p[1] == '>'))
{
@@ -3239,12 +3240,12 @@ find_ex_command(
return eap->cmd;
}
// Recognize an assignment if we recognize the variable name:
// "g:var = expr"
// "var = expr" where "var" is a local var name.
oplen = assignment_len(skipwhite(p), &heredoc);
if (oplen > 0)
{
// Recognize an assignment if we recognize the variable name:
// "g:var = expr"
// "var = expr" where "var" is a local var name.
if (((p - eap->cmd) > 2 && eap->cmd[1] == ':')
|| lookup(eap->cmd, p - eap->cmd, cctx) != NULL)
{
@@ -3252,6 +3253,15 @@ find_ex_command(
return eap->cmd;
}
}
// "[...]->Method()" is a list expression. But "[a, b] = Func()" is
// an assignment.
if (*p == '[' && (eval_list(&p, NULL, NULL, FALSE) == FAIL
|| *skipwhite(p) != '='))
{
eap->cmdidx = CMD_eval;
return eap->cmd;
}
}
#endif