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.1243: Vim9: cannot have a comment line halfway a list

Browse Source 
Problem:    Vim9: cannot have a comment or empty line halfway a list at script
            level.
Solution:   Skip more than one line if needed.
This commit is contained in:
Bram Moolenaar
2020-07-19 14:41:58 +02:00
parent 65b9545f44
commit 75783bd84e
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/scriptfile.c
View File

@@ -1763,10 +1763,13 @@ getsourceline(int c UNUSED, void *cookie, int indent UNUSED, int do_concat)
// 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 @@ getsourceline(int c UNUSED, void *cookie, int indent UNUSED, int do_concat)
}
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);