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/eval.c b/src/eval.c
index 9a9110e..307a2ae 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1913,7 +1913,7 @@
&& evalarg != NULL
&& (evalarg->eval_cookie != NULL || evalarg->eval_cctx != NULL)
&& (*arg == NUL || (VIM_ISWHITE(arg[-1])
- && *arg == '#' && arg[1] != '{')))
+ && vim9_comment_start(arg))))
{
char_u *p;
diff --git a/src/proto/vim9compile.pro b/src/proto/vim9compile.pro
index fb37923..30f7bbf 100644
--- a/src/proto/vim9compile.pro
+++ b/src/proto/vim9compile.pro
@@ -11,6 +11,7 @@
char *type_name(type_T *type, char **tofree);
int get_script_item_idx(int sid, char_u *name, int check_writable);
imported_T *find_imported(char_u *name, size_t len, cctx_T *cctx);
+int vim9_comment_start(char_u *p);
char_u *peek_next_line_from_context(cctx_T *cctx);
char_u *next_line_from_context(cctx_T *cctx, int skip_comment);
char_u *to_name_const_end(char_u *arg);
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);
diff --git a/src/version.c b/src/version.c
index 2e8f423..fb8fbe3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1243,
+/**/
1242,
/**/
1241,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 81d5324..ed40076 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -2463,7 +2463,7 @@
/*
* Return TRUE if "p" points at a "#" but not at "#{".
*/
- static int
+ int
vim9_comment_start(char_u *p)
{
return p[0] == '#' && p[1] != '{';