patch 9.1.0287: Vim9: comment may be treated as heredoc start
Problem: Vim9: comment may be treated as heredoc start.
(Ernie Rael)
Solution: Use skip_var_list() instead of find_name_end().
(zeertzjq)
fixes: #14444
closes: #14446
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/userfunc.c b/src/userfunc.c
index 1bd1a28..015733c 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -1227,12 +1227,20 @@
|| checkforcmd(&arg, "const", 5)
|| vim9_function)
{
- while (vim_strchr((char_u *)"$@&", *arg) != NULL)
- ++arg;
- arg = skipwhite(find_name_end(arg, NULL, NULL,
- FNE_INCL_BR | FNE_ALLOW_CURLY));
- if (vim9_function && *arg == ':')
- arg = skipwhite(skip_type(skipwhite(arg + 1), FALSE));
+ int save_sc_version = current_sctx.sc_version;
+ int var_count = 0;
+ int semicolon = 0;
+ char_u *argend;
+
+ current_sctx.sc_version
+ = vim9_function ? SCRIPT_VERSION_VIM9 : 1;
+ argend = skip_var_list(arg, TRUE, &var_count, &semicolon,
+ TRUE);
+ if (argend == NULL)
+ // Invalid list assignment: skip to closing bracket.
+ argend = find_name_end(arg, NULL, NULL, FNE_INCL_BR);
+ arg = skipwhite(argend);
+ current_sctx.sc_version = save_sc_version;
if (arg[0] == '=' && arg[1] == '<' && arg[2] =='<')
{
p = skipwhite(arg + 3);