1
0
forked from aniani/vim

patch 8.2.1433: Vim9: cannot mingle comments in multi-line lambda

Problem:    Vim9: cannot mingle comments in multi-line lambda.
Solution:   Skip over NULL lines. (closes #6694)
This commit is contained in:
Bram Moolenaar
2020-08-12 19:15:33 +02:00
parent 6d91bcb4d2
commit ba60cc45e7
3 changed files with 24 additions and 5 deletions

View File

@@ -1433,6 +1433,16 @@ def Test_expr7_list_vim9script()
CheckScriptFailure(lines, 'E1068:')
enddef
def LambdaWithComments(): func
return {x ->
# some comment
x == 1
# some comment
||
x == 2
}
enddef
def Test_expr7_lambda()
let La = { -> 'result'}
assert_equal('result', La())
@@ -1466,6 +1476,11 @@ def Test_expr7_lambda()
assert_equal([{'key': 12}], filter(dl,
{_, v -> has_key(v, 'key') ? v['key'] == 12 : 0}))
assert_equal(false, LambdaWithComments()(0))
assert_equal(true, LambdaWithComments()(1))
assert_equal(true, LambdaWithComments()(2))
assert_equal(false, LambdaWithComments()(3))
call CheckDefFailure(["filter([1, 2], {k,v -> 1})"], 'E1069:')
enddef

View File

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

View File

@@ -1729,12 +1729,14 @@ peek_next_line_from_context(cctx_T *cctx)
char_u *line = ((char_u **)cctx->ctx_ufunc->uf_lines.ga_data)[lnum];
char_u *p;
if (line == NULL)
break;
// ignore NULLs inserted for continuation lines
if (line != NULL)
{
p = skipwhite(line);
if (*p != NUL && !vim9_comment_start(p))
return p;
}
}
return NULL;
}