0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

patch 8.2.3371: Vim9: :$ENV cannot be followed by ->func() in next line

Problem:    Vim9: :$ENV cannot be followed by ->func() in next line.
Solution:   Use "$ENV" as the start of an expression. (closes #8790)
This commit is contained in:
Bram Moolenaar
2021-08-24 21:56:03 +02:00
parent 60faf8656e
commit 5ca5cc6412
4 changed files with 28 additions and 4 deletions

View File

@@ -3425,14 +3425,16 @@ find_ex_command(
{ {
char_u *pskip = skip_option_env_lead(eap->cmd); char_u *pskip = skip_option_env_lead(eap->cmd);
if (vim_strchr((char_u *)"{('[\"@&", *p) != NULL if (vim_strchr((char_u *)"{('[\"@&$", *p) != NULL
|| ((p = to_name_const_end(pskip)) > eap->cmd && *p != NUL)) || ((p = to_name_const_end(pskip)) > eap->cmd && *p != NUL))
{ {
int oplen; int oplen;
int heredoc; int heredoc;
char_u *swp; char_u *swp;
if (*eap->cmd == '&' || (eap->cmd[0] == '@' if (*eap->cmd == '&'
|| *eap->cmd == '$'
|| (eap->cmd[0] == '@'
&& (valid_yank_reg(eap->cmd[1], FALSE) && (valid_yank_reg(eap->cmd[1], FALSE)
|| eap->cmd[1] == '@'))) || eap->cmd[1] == '@')))
{ {
@@ -3443,12 +3445,14 @@ find_ex_command(
p += 2; p += 2;
p = to_name_end(p, FALSE); p = to_name_end(p, FALSE);
} }
else if (*eap->cmd == '$')
p = to_name_end(eap->cmd + 1, FALSE);
else else
p = eap->cmd + 2; p = eap->cmd + 2;
if (ends_excmd(*skipwhite(p))) if (ends_excmd(*skipwhite(p)))
{ {
// "&option <NL>" and "@r <NL>" is the start of an // "&option <NL>", "$ENV <NL>" and "@r <NL>" are the start
// expression. // of an expression.
eap->cmdidx = CMD_eval; eap->cmdidx = CMD_eval;
return eap->cmd; return eap->cmd;
} }

View File

@@ -553,6 +553,22 @@ def Test_register_use_linebreak()
CheckDefAndScriptSuccess(lines) CheckDefAndScriptSuccess(lines)
enddef enddef
def Test_environment_use_linebreak()
var lines =<< trim END
new
$TESTENV = 'one'
$TESTENV->setline(1)
$TESTENV = 'two'
$TESTENV ->setline(2)
$TESTENV = 'three'
$TESTENV
->setline(3)
assert_equal(['one', 'two', 'three'], getline(1, '$'))
bwipe!
END
CheckDefAndScriptSuccess(lines)
enddef
def Test_skipped_expr_linebreak() def Test_skipped_expr_linebreak()
if 0 if 0
var x = [] var x = []

View File

@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3371,
/**/ /**/
3370, 3370,
/**/ /**/

View File

@@ -9745,9 +9745,11 @@ compile_def_function(
* COMMAND after range * COMMAND after range
* 'text'->func() should not be confused with 'a mark * 'text'->func() should not be confused with 'a mark
* "++nr" and "--nr" are eval commands * "++nr" and "--nr" are eval commands
* in "$ENV->func()" the "$" is not a range
*/ */
cmd = ea.cmd; cmd = ea.cmd;
if (!(local_cmdmod.cmod_flags & CMOD_LEGACY) if (!(local_cmdmod.cmod_flags & CMOD_LEGACY)
&& (*cmd != '$' || starts_with_colon)
&& (starts_with_colon || !(*cmd == '\'' && (starts_with_colon || !(*cmd == '\''
|| (cmd[0] == cmd[1] && (*cmd == '+' || *cmd == '-'))))) || (cmd[0] == cmd[1] && (*cmd == '+' || *cmd == '-')))))
{ {