aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -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

2
src/eval.c
View File

@@ -1913,7 +1913,7 @@ eval_next_non_blank(char_u *arg, evalarg_T *evalarg, int *getnext)
&& evalarg != NULL && evalarg != NULL
&& (evalarg->eval_cookie != NULL || evalarg->eval_cctx != NULL) && (evalarg->eval_cookie != NULL || evalarg->eval_cctx != NULL)
&& (*arg == NUL || (VIM_ISWHITE(arg[-1]) && (*arg == NUL || (VIM_ISWHITE(arg[-1])
&& *arg == '#' && arg[1] != '{'))) && vim9_comment_start(arg))))
{ {
char_u *p; char_u *p;

1
src/proto/vim9compile.pro
View File

@@ -11,6 +11,7 @@ char *vartype_name(vartype_T type);
char *type_name(type_T *type, char **tofree); char *type_name(type_T *type, char **tofree);
int get_script_item_idx(int sid, char_u *name, int check_writable); 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); 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 *peek_next_line_from_context(cctx_T *cctx);
char_u *next_line_from_context(cctx_T *cctx, int skip_comment); char_u *next_line_from_context(cctx_T *cctx, int skip_comment);
char_u *to_name_const_end(char_u *arg); char_u *to_name_const_end(char_u *arg);

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 // backslash. We always need to read the next line, keep it in
// sp->nextline. // sp->nextline.
/* Also check for a comment in between continuation lines: "\ */ /* Also check for a comment in between continuation lines: "\ */
// Also check for a Vim9 comment and empty line.
sp->nextline = get_one_sourceline(sp); sp->nextline = get_one_sourceline(sp);
if (sp->nextline != NULL if (sp->nextline != NULL
&& (*(p = skipwhite(sp->nextline)) == '\\' && (*(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; garray_T ga;
@@ -1794,8 +1797,11 @@ getsourceline(int c UNUSED, void *cookie, int indent UNUSED, int do_concat)
} }
ga_concat(&ga, p + 1); 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; break;
/* drop a # comment or "\ comment line */
} }
ga_append(&ga, NUL); ga_append(&ga, NUL);
vim_free(line); vim_free(line);

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1243,
/**/ /**/
1242, 1242,
/**/ /**/

2
src/vim9compile.c
View File

@@ -2463,7 +2463,7 @@ free_imported(cctx_T *cctx)
/* /*
* Return TRUE if "p" points at a "#" but not at "#{". * Return TRUE if "p" points at a "#" but not at "#{".
*/ */
static int int
vim9_comment_start(char_u *p) vim9_comment_start(char_u *p)
{ {
return p[0] == '#' && p[1] != '{'; return p[0] == '#' && p[1] != '{';