patch 8.2.1243: Vim9: cannot have a comment line halfway a list
Problem: Vim9: cannot have a comment or empty line halfway a list at script
level.
Solution: Skip more than one line if needed.
diff --git a/src/scriptfile.c b/src/scriptfile.c
index 4e7df4d..5514573 100644
--- a/src/scriptfile.c
+++ b/src/scriptfile.c
@@ -1763,10 +1763,13 @@
// backslash. We always need to read the next line, keep it in
// sp->nextline.
/* Also check for a comment in between continuation lines: "\ */
+ // Also check for a Vim9 comment and empty line.
sp->nextline = get_one_sourceline(sp);
if (sp->nextline != NULL
&& (*(p = skipwhite(sp->nextline)) == '\\'
- || (p[0] == '"' && p[1] == '\\' && p[2] == ' ')))
+ || (p[0] == '"' && p[1] == '\\' && p[2] == ' ')
+ || (in_vim9script()
+ && (*p == NUL || vim9_comment_start(p)))))
{
garray_T ga;
@@ -1794,8 +1797,11 @@
}
ga_concat(&ga, p + 1);
}
- else if (p[0] != '"' || p[1] != '\\' || p[2] != ' ')
+ else if (!(p[0] == '"' && p[1] == '\\' && p[2] == ' ')
+ && !(in_vim9script()
+ && (*p == NUL || vim9_comment_start(p))))
break;
+ /* drop a # comment or "\ comment line */
}
ga_append(&ga, NUL);
vim_free(line);