mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
patch 8.2.2931: Vim9: line continuation comment uses legacy syntax
Problem: Vim9: line continuation comment still uses legacy syntax in one place. Solution: Check for #\ instead of "\ earlier. (closes #8316)
This commit is contained in:
@@ -1788,6 +1788,8 @@ getsourceline(
|
|||||||
if (line != NULL && options != GETLINE_NONE
|
if (line != NULL && options != GETLINE_NONE
|
||||||
&& vim_strchr(p_cpo, CPO_CONCAT) == NULL)
|
&& vim_strchr(p_cpo, CPO_CONCAT) == NULL)
|
||||||
{
|
{
|
||||||
|
int comment_char = in_vim9script() ? '#' : '"';
|
||||||
|
|
||||||
// compensate for the one line read-ahead
|
// compensate for the one line read-ahead
|
||||||
--sp->sourcing_lnum;
|
--sp->sourcing_lnum;
|
||||||
|
|
||||||
@@ -1800,7 +1802,8 @@ getsourceline(
|
|||||||
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] == comment_char
|
||||||
|
&& p[1] == '\\' && p[2] == ' ')
|
||||||
|| (do_vim9_all && (*p == NUL
|
|| (do_vim9_all && (*p == NUL
|
||||||
|| vim9_comment_start(p)))
|
|| vim9_comment_start(p)))
|
||||||
|| (do_bar_cont && p[0] == '|' && p[1] != '|')))
|
|| (do_bar_cont && p[0] == '|' && p[1] != '|')))
|
||||||
@@ -1842,7 +1845,7 @@ getsourceline(
|
|||||||
ga_concat(&ga, p);
|
ga_concat(&ga, p);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (!(p[0] == (in_vim9script() ? '#' : '"')
|
else if (!(p[0] == (comment_char)
|
||||||
&& p[1] == '\\' && p[2] == ' ')
|
&& p[1] == '\\' && p[2] == ' ')
|
||||||
&& !(do_vim9_all && (*p == NUL || vim9_comment_start(p))))
|
&& !(do_vim9_all && (*p == NUL || vim9_comment_start(p))))
|
||||||
break;
|
break;
|
||||||
|
@@ -3081,6 +3081,9 @@ def Test_vim9_comment()
|
|||||||
\ start='foo'
|
\ start='foo'
|
||||||
#\ comment
|
#\ comment
|
||||||
\ end='bar'
|
\ end='bar'
|
||||||
|
syn region Text start='foo'
|
||||||
|
#\ comment
|
||||||
|
\ end='bar'
|
||||||
END
|
END
|
||||||
CheckScriptSuccess(lines)
|
CheckScriptSuccess(lines)
|
||||||
|
|
||||||
|
@@ -750,6 +750,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 */
|
||||||
|
/**/
|
||||||
|
2931,
|
||||||
/**/
|
/**/
|
||||||
2930,
|
2930,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user