# HG changeset patch # User Bram Moolenaar # Date 1663881303 -7200 # Node ID c2ef8f0f8ba1a3242753085b661fa3f76e0b03b0 # Parent 9ea0bec4253ee867ba61c6c9ae82ee7b95af591b patch 9.0.0553: no error for "|" after "{" in lamda Commit: https://github.com/vim/vim/commit/f5f4e85f0189790ab81c0005b703604721db13d4 Author: Bram Moolenaar Date: Thu Sep 22 22:03:14 2022 +0100 patch 9.0.0553: no error for "|" after "{" in lamda Problem: No error for "|" after "{" in lamda. Solution: Check for invalid "|". (closes https://github.com/vim/vim/issues/11199) diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -1492,6 +1492,29 @@ def Test_lambda_uses_assigned_var() 'x = filter(["bbb"], (_, v) => v =~ x)']) enddef +def Test_lambda_invalid_block() + var lines =<< trim END + timer_start(0, (_) => { # echo + echo 'yes' + }) + END + v9.CheckDefAndScriptSuccess(lines) + + lines =<< trim END + timer_start(0, (_) => { " echo + echo 'yes' + }) + END + v9.CheckDefAndScriptFailure(lines, 'E488: Trailing characters: " echo') + + lines =<< trim END + timer_start(0, (_) => { | echo + echo 'yes' + }) + END + v9.CheckDefAndScriptFailure(lines, 'E488: Trailing characters: | echo') +enddef + def Test_pass_legacy_lambda_to_def_func() var lines =<< trim END vim9script diff --git a/src/userfunc.c b/src/userfunc.c --- a/src/userfunc.c +++ b/src/userfunc.c @@ -1166,6 +1166,7 @@ lambda_function_body( garray_T *default_args, char_u *ret_type) { + char_u *start = *arg; int evaluate = (evalarg->eval_flags & EVAL_EVALUATE); garray_T *gap = &evalarg->eval_ga; garray_T *freegap = &evalarg->eval_freega; @@ -1179,9 +1180,10 @@ lambda_function_body( int lnum_save = -1; linenr_T sourcing_lnum_top = SOURCING_LNUM; - if (!ends_excmd2(*arg, skipwhite(*arg + 1))) - { - semsg(_(e_trailing_characters_str), *arg + 1); + *arg = skipwhite(*arg + 1); + if (**arg == '|' || !ends_excmd2(start, *arg)) + { + semsg(_(e_trailing_characters_str), *arg); return FAIL; } diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 553, +/**/ 552, /**/ 551,