Polymorphic function type and lambda expression

grammar.js

@@ -1,4 +1,4 @@
 const PREC = {
   comment: 1,
   using_directive: 2,
   control: 1,
@@ -92,6 +92,8 @@
     [$.class_parameters],
     // 'for'  operator_identifier  ':'  _annotated_type  •  ':'  …
     [$._type, $.compound_type],
+    // 'given'  '('  '['  _type_parameter  •  ','  …
+    [$._variant_type_parameter, $.type_lambda],
     // 'given'  '('  operator_identifier  ':'  _type  •  ','  …
     [$.name_and_type, $.parameter],
     [$._simple_expression, $.binding, $.tuple_pattern],
@@ -954,7 +956,7 @@
         ),
       ),
 
     tuple_type: $ => seq("(", trailingCommaSep1($._type), ")"),
 
     named_tuple_type: $ => seq(
       "(",
@@ -1008,7 +1010,10 @@
 
     function_type: $ =>
       prec.left(
-        seq(field("parameter_types", $.parameter_types), $._arrow_then_type),
+        choice(
+          seq(field("type_parameters", $.type_parameters), $._arrow_then_type),
+          seq(field("parameter_types", $.parameter_types), $._arrow_then_type),
+        )
       ),
 
     _arrow_then_type: $ =>
@@ -1190,6 +1195,15 @@
     lambda_expression: $ =>
       prec.right(
         seq(
+          optional(
+            seq(
+              field(
+                "type_parameters",
+                $.type_parameters,
+              ),
+              "=>",
+            ),
+          ),
           field(
             "parameters",
             choice(

test/corpus/expressions.txt

@@ -1116,7 +1116,6 @@ object O {
   { b =>
    if (c) d.e }
   { a => implicit b => b }
-  { (a: Int) ?=> (b: Int) => b }
   { (_, a) => a }
 }
 
@@ -1198,6 +1197,31 @@ object O {
             (identifier)
             (identifier))))
       (block
+        (lambda_expression
+          (bindings
+            (binding
+              (wildcard))
+            (binding
+              (identifier)))
+          (identifier))))))
+
+================================================================================
+Lambda Expression (Scala 3 syntax)
+================================================================================
+
+object O:
+  val f = (a: Int) ?=> (b: Int) => b
+
+  val less: Comparer = [X: Ord] => (x: X, y: X) => ???
+
+--------------------------------------------------------------------------------
+
+(compilation_unit
+  (object_definition
+    (identifier)
+    (template_body
+      (val_definition
+        (identifier)
         (lambda_expression
           (bindings
             (binding
@@ -1209,14 +1233,22 @@ object O {
                 (identifier)
                 (type_identifier)))
             (identifier))))
-      (block
+      (val_definition
+        (identifier)
+        (type_identifier)
         (lambda_expression
+          (type_parameters
+            (identifier)
+            (context_bound
+              (type_identifier)))
           (bindings
             (binding
-              (wildcard))
+              (identifier)
+              (type_identifier))
             (binding
-              (identifier)))
-          (identifier))))))
+              (identifier)
+              (type_identifier)))
+          (operator_identifier))))))
 
 ================================================================================
 Unit expressions

test/corpus/types.txt

@@ -163,6 +163,32 @@ object Main {
             (type_identifier)
             (type_identifier)))))))
 
+================================================================================
+Polymorphic function types (Scala 3 syntax)
+================================================================================
+
+class A:
+  type Comparer = [X: Ord] => (X, X) => Boolean
+
+--------------------------------------------------------------------------------
+
+(compilation_unit
+  (class_definition
+    (identifier)
+    (template_body
+      (type_definition
+        (type_identifier)
+        (function_type
+          (type_parameters
+            (identifier)
+            (context_bound
+              (type_identifier)))
+          (function_type
+            (parameter_types
+              (type_identifier)
+              (type_identifier))
+            (type_identifier)))))))
+
 ================================================================================
 Context function types (Scala 3 syntax)
 ================================================================================