patch 8.2.2053: Vim9: lamba doesn't accept argument types

Problem:    Vim9: lamba doesn't accept argument types.
Solution:   Optionally accept argument types at the script level.

diff --git a/src/eval.c b/src/eval.c
index 6fea436054e173261842b0fd99a97051d0b981b0..f23d721df2618dace7e3cab932437fcc8c6562ec 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -3266,7 +3266,7 @@ eval7(
      * Lambda: {arg, arg -> expr}
      * Dictionary: {'key': val, 'key': val}
      */
-    case '{':  ret = get_lambda_tv(arg, rettv, FALSE, evalarg);
+    case '{':  ret = get_lambda_tv(arg, rettv, in_vim9script(), evalarg);
                if (ret == NOTDONE)
                    ret = eval_dict(arg, rettv, evalarg, FALSE);
                break;

diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index 02f8c0ad050c81f8041f9902ae7c9fa2c83a14c1..57307a27edd70892868cf315baabb5088ccbc8e8 100644 (file)
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1828,6 +1828,9 @@ def Test_expr7_lambda()
 
       assert_equal(false, LambdaUsingArg(0)())
       assert_equal(true, LambdaUsingArg(1)())
+
+      var res = map([1, 2, 3], {i: number, v: number -> i + v})
+      assert_equal([1, 3, 5], res)
   END
   CheckDefAndScriptSuccess(lines)
 

diff --git a/src/version.c b/src/version.c
index c653cdc84f0f4e10bd2f8c5bb959f53a709963d1..bd8abac7a0102bab0a47f6ef3c331fde380b36df 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2053,
 /**/
     2052,
 /**/