Mercurial > vim
changeset 21263:71bd2f9adb61 v8.2.1182
patch 8.2.1182: Vim9: no check for whitespace after comma in lambda
Commit: https://github.com/vim/vim/commit/914e7eaa67f8d816e15fb4a1180e6bece88d9742
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jul 11 15:20:48 2020 +0200
patch 8.2.1182: Vim9: no check for whitespace after comma in lambda
Problem: Vim9: no check for whitespace after comma in lambda.
Solution: Give error if white space is missing.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 11 Jul 2020 15:30:04 +0200 |
| parents | f90a8e001d61 |
| children | f3bdfe1d9359 |
| files | src/testdir/test_vim9_expr.vim src/testdir/test_vim9_func.vim src/userfunc.c src/version.c |
| diffstat | 4 files changed, 16 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -1067,10 +1067,11 @@ def Test_expr7_list_vim9script() enddef def Test_expr7_lambda() - " lambda let La = { -> 'result'} assert_equal('result', La()) assert_equal([1, 3, 5], [1, 2, 3]->map({key, val -> key + val})) + + call CheckDefFailure(["filter([1, 2], {k,v -> 1})"], 'E1069:') enddef def Test_expr7_lambda_vim9script()
--- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -967,7 +967,7 @@ enddef def Line_continuation_in_lambda(): list<number> let x = range(97, 100) - ->map({_,v -> nr2char(v) + ->map({_, v -> nr2char(v) ->toupper()}) ->reverse() return x
--- a/src/userfunc.c +++ b/src/userfunc.c @@ -266,10 +266,20 @@ get_function_args( else if (any_default) { emsg(_("E989: Non-default argument follows default argument")); - mustend = TRUE; + goto err_ret; } if (*p == ',') + { ++p; + // Don't give this error when skipping, it makes the "->" not + // found in "{k,v -> x}" and give a confusing error. + if (!skip && in_vim9script() + && !IS_WHITE_OR_NUL(*p) && *p != endchar) + { + semsg(_(e_white_after), ","); + goto err_ret; + } + } else mustend = TRUE; }