patch 8.2.1141: Vim9: return type of filter() is any

Problem:    Vim9: return type of filter() is any.
Solution:   Use type of the argument.

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 439333184b7762d9c9d9785f205c639557990d39..b015f6dad14e2b8f6cfa07ae15cbcba1430a4b31 100644 (file)
--- 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 525d46d4cd1c4d6d205c337b4af9b55c462c56b6..8b83d770955c821621616418bfa25acb076a7ad5 100644 (file)
--- 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 116cb065fe87cb7c6554665023106dd31cb92fc3..47d4bccd5180e00381604d648a40757a7bd7eacf 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1141,
 /**/
     1140,
 /**/