patch 8.2.4459: Vim9: compiling sort() call fails with unknown arguments

Problem:    Vim9: compiling sort() call fails with a funcref that has unknown
            arguments.
Solution:   Do not check the arguments if they are unknown at compile time.
            (closes #9835)

diff --git a/src/evalfunc.c b/src/evalfunc.c
index e8ed4bab045ea2504a054dea394ffc3d18704970..1b93200367952fb7c237c2cbb86f19cf1d4e0866 100644 (file)
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -624,6 +624,8 @@ arg_sort_how(type_T *type, type_T *decl_type UNUSED, argcontext_T *context)
            where_T where = WHERE_INIT;
 
            args[1] = args[0];
+           if (type->tt_argcount == -1)
+               t_func_exp.tt_argcount = -1;
            where.wt_index = 2;
            return check_type(&t_func_exp, type, TRUE, where);
        }

diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index dfec991f8d12eb6555e96a6faef19d7f6ae39253..7577aecd2a18fd3448f7becd4053dd89de57a86d 100644 (file)
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -3812,6 +3812,17 @@ def Test_sort_argument()
       sort([1, 2, 3], (a: any, b: any) => 1)
   END
   v9.CheckDefAndScriptSuccess(lines)
+
+  lines =<< trim END
+      vim9script
+      def SortedList(): list<number>
+        var Lambda: func: number = (a, b): number => a - b
+        var l = [3, 2, 1]
+        return l->sort(Lambda)
+      enddef
+      SortedList()->assert_equal([1, 2, 3])
+  END
+  v9.CheckScriptSuccess(lines)
 enddef
 
 def Test_sort_compare_func_fails()

diff --git a/src/version.c b/src/version.c
index 800925df98408ddfa54c1fef72191588847602bb..f8fb3139c9d170874a86ba8ace06851e87aaa065 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 */
+/**/
+    4459,
 /**/
     4458,
 /**/