Mercurial > vim
changeset 24398:bed5ec739304 v8.2.2739
patch 8.2.2739: Vim9: a lambda accepts too many arguments at the script level
Commit: https://github.com/vim/vim/commit/767034c5b82ba8999d9fed2f997436e6e3e99419
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Apr 9 17:24:52 2021 +0200
patch 8.2.2739: Vim9: a lambda accepts too many arguments at the script level
Problem: Vim9: a lambda accepts too many arguments at the script level.
Solution: Do not set uf_varargs in Vim9 script.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 09 Apr 2021 17:30:04 +0200 |
| parents | 9d63465bc507 |
| children | b16510e5b8e7 |
| files | src/testdir/test_vim9_func.vim src/testdir/test_vim9_script.vim src/userfunc.c src/version.c |
| diffstat | 4 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -836,6 +836,11 @@ def Test_call_lambda_args() enddef END CheckDefFailure(lines, 'E1167:') + + lines =<< trim END + echo ((a) => a)('aa', 'bb') + END + CheckDefAndScriptFailure(lines, 'E118:', 1) enddef def FilterWithCond(x: string, Cond: func(string): bool): bool @@ -2114,7 +2119,7 @@ def Test_list_lambda() ->substitute("('", ' ', '') ->substitute("')", '', '') ->substitute('function\zs', ' ', '')) - assert_match('def <lambda>\d\+(_: any, ...): number\n1 return 0\n enddef', body) + assert_match('def <lambda>\d\+(_: any): number\n1 return 0\n enddef', body) enddef def DoFilterThis(a: string): list<string> @@ -2363,7 +2368,7 @@ def Test_did_emsg_reset() vim9script au BufWinLeave * # def Func() - popup_menu('', {callback: () => popup_create('', {})->popup_close()}) + popup_menu('', {callback: (a, b) => popup_create('', {})->popup_close()}) eval [][0] enddef nno <F3> <cmd>call <sid>Func()<cr>
--- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -3518,7 +3518,7 @@ func Test_no_redraw_when_restoring_cpo() vim9script set cpo+=M exe 'set rtp^=' .. getcwd() .. '/Xdir' - au CmdlineEnter : ++once timer_start(0, () => script#func()) + au CmdlineEnter : ++once timer_start(0, (_) => script#func()) setline(1, 'some text') END call writefile(lines, 'XTest_redraw_cpo')
--- a/src/userfunc.c +++ b/src/userfunc.c @@ -1263,8 +1263,9 @@ get_lambda_tv( #endif if (sandbox) flags |= FC_SANDBOX; - // can be called with more args than uf_args.ga_len - fp->uf_varargs = TRUE; + // In legacy script a lambda can be called with more args than + // uf_args.ga_len. + fp->uf_varargs = !in_vim9script(); fp->uf_flags = flags; fp->uf_calls = 0; fp->uf_script_ctx = current_sctx;