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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ex_docmd.c
View File

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