diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-05 20:16:41 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-05 20:16:41 +0200 |
| commit | 0d94ad69586972e7522ec6ca1441a517af2ade7a (patch) | |
| tree | 774e4b9a400cc58f0bcf16610974edd5b112091e | |
| parent | b3c019cbc32e2e9250ac668bf77d61ebd89c13f2 (diff) | |
patch 8.2.1141: Vim9: return type of filter() is anyv8.2.1141
Problem: Vim9: return type of filter() is any.
Solution: Use type of the argument.
| -rw-r--r-- | src/evalfunc.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_vim9_func.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 439333184b..b015f6dad1 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -581,7 +581,7 @@ static funcentry_T global_functions[] = {"file_readable", 1, 1, FEARG_1, ret_number, f_filereadable}, // obsolete {"filereadable", 1, 1, FEARG_1, ret_number, f_filereadable}, {"filewritable", 1, 1, FEARG_1, ret_number, f_filewritable}, - {"filter", 2, 2, FEARG_1, ret_any, f_filter}, + {"filter", 2, 2, FEARG_1, ret_first_arg, f_filter}, {"finddir", 1, 3, FEARG_1, ret_string, f_finddir}, {"findfile", 1, 3, FEARG_1, ret_string, f_findfile}, {"flatten", 1, 2, FEARG_1, ret_list_any, f_flatten}, diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index 525d46d4cd..8b83d77095 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -918,6 +918,15 @@ def Test_extend_return_type() assert_equal(6, res) enddef +def Test_filter_return_type() + let l = filter([1, 2, 3], {-> 1}) + let res = 0 + for n in l + res += n + endfor + assert_equal(6, res) +enddef + def Line_continuation_in_def(dir: string = ''): string let path: string = empty(dir) \ ? 'empty' diff --git a/src/version.c b/src/version.c index 116cb065fe..47d4bccd51 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1141, +/**/ 1140, /**/ 1139, |