mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
patch 8.2.5053: cannot have a comment halfway an expression in a block
Problem: Cannot have a comment halfway an expression in an autocmd command block. Solution: When skipping over the NL also skip over comments. (closes #10519)
This commit is contained in:
33
src/eval.c
33
src/eval.c
@@ -2135,6 +2135,35 @@ eval_func(
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* After a NL, skip over empty lines and comment-only lines.
|
||||
*/
|
||||
static char_u *
|
||||
newline_skip_comments(char_u *arg)
|
||||
{
|
||||
char_u *p = arg + 1;
|
||||
|
||||
for (;;)
|
||||
{
|
||||
p = skipwhite(p);
|
||||
|
||||
if (*p == NUL)
|
||||
break;
|
||||
if (vim9_comment_start(p))
|
||||
{
|
||||
char_u *nl = vim_strchr(p, NL);
|
||||
|
||||
if (nl == NULL)
|
||||
break;
|
||||
p = nl;
|
||||
}
|
||||
if (*p != NL)
|
||||
break;
|
||||
++p; // skip another NL
|
||||
}
|
||||
return p;
|
||||
}
|
||||
|
||||
/*
|
||||
* Get the next line source line without advancing. But do skip over comment
|
||||
* lines.
|
||||
@@ -2184,7 +2213,7 @@ eval_next_non_blank(char_u *arg, evalarg_T *evalarg, int *getnext)
|
||||
char_u *next;
|
||||
|
||||
if (*p == NL)
|
||||
next = p + 1;
|
||||
next = newline_skip_comments(p);
|
||||
else if (evalarg->eval_cookie != NULL)
|
||||
next = getline_peek_skip_comments(evalarg);
|
||||
else
|
||||
@@ -2212,7 +2241,7 @@ eval_next_line(char_u *arg, evalarg_T *evalarg)
|
||||
if (arg != NULL)
|
||||
{
|
||||
if (*arg == NL)
|
||||
return skipwhite(arg + 1);
|
||||
return newline_skip_comments(arg);
|
||||
// Truncate before a trailing comment, so that concatenating the lines
|
||||
// won't turn the rest into a comment.
|
||||
if (*skipwhite(arg) == '#')
|
||||
|
Reference in New Issue
Block a user