diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-09-22 22:03:14 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-09-22 22:03:14 +0100 |
| commit | f5f4e85f0189790ab81c0005b703604721db13d4 (patch) | |
| tree | 941a13046f1c770cc610519320f131c0b675e657 | |
| parent | 69082916c8b5d321545d60b9f5facad0a2dd5a4e (diff) | |
patch 9.0.0553: no error for "|" after "{" in lamdav9.0.0553
Problem: No error for "|" after "{" in lamda.
Solution: Check for invalid "|". (closes #11199)
| -rw-r--r-- | src/testdir/test_vim9_func.vim | 23 | ||||
| -rw-r--r-- | src/userfunc.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 29 insertions, 2 deletions
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index 4a5546b8eb..4d5ff14b14 100644 --- 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 index 83221a8555..cc90b95b73 100644 --- 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))) + *arg = skipwhite(*arg + 1); + if (**arg == '|' || !ends_excmd2(start, *arg)) { - semsg(_(e_trailing_characters_str), *arg + 1); + semsg(_(e_trailing_characters_str), *arg); return FAIL; } diff --git a/src/version.c b/src/version.c index 505185da50..57d8259603 100644 --- 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, |