Function type can have a for-lifetime #51

Co-Authored-By: calixteman <[email protected]>

Author: calixteman

corpus/types.txt

@@ -129,6 +129,8 @@ fn high_order3(value: i32, f: &FnOnce(i32) -> i32) -> i32 {
     f(value)
 }
 
+type F = for<'a, 'b> fn(x: &'a A, y: &'a mut B<'i, 't>,) -> C;
+
 ---
 
 (source_file
@@ -151,7 +153,13 @@ fn high_order3(value: i32, f: &FnOnce(i32) -> i32) -> i32 {
     (parameters
       (parameter (identifier) (primitive_type))
       (parameter (identifier) (reference_type (function_type (type_identifier) (parameters (primitive_type)) (primitive_type)))))
-    (primitive_type) (block (call_expression (identifier) (arguments (identifier))))))
+    (primitive_type) (block (call_expression (identifier) (arguments (identifier)))))
+  (type_item
+    (type_identifier)
+    (function_type
+      (for_lifetimes (lifetime (identifier)) (lifetime (identifier)))
+      (parameters (parameter (identifier) (reference_type (lifetime (identifier)) (type_identifier))) (parameter (identifier) (reference_type (lifetime (identifier)) (mutable_specifier) (generic_type (type_identifier) (type_arguments (lifetime (identifier)) (lifetime (identifier)))))))
+      (type_identifier))))
 
 =================================
 Unsafe and extern function types

grammar.js

@@ -75,6 +75,7 @@ module.exports = grammar({
     [$.scoped_identifier, $.scoped_type_identifier],
     [$.parameters, $._pattern],
     [$.parameters, $.tuple_struct_pattern],
+    [$.type_parameters, $.for_lifetimes],
   ],
 
   word: $ => $.identifier,
@@ -686,7 +687,16 @@ module.exports = grammar({
       ']'
     ),
 
+    for_lifetimes: $ => seq(
+      'for',
+      '<',
+      sepBy1(',', $.lifetime,),
+      optional(','),
+      '>'
+    ),
+
     function_type: $ => seq(
+      optional($.for_lifetimes),
       optional($.function_modifiers),
       prec(PREC.call, seq(
         field('trait', choice(

src/grammar.json

@@ -3809,9 +3809,75 @@
         }
       ]
     },
+    "for_lifetimes": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "for"
+        },
+        {
+          "type": "STRING",
+          "value": "<"
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "lifetime"
+            },
+            {
+              "type": "REPEAT",
+              "content": {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": ","
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "lifetime"
+                  }
+                ]
+              }
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": ","
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": ">"
+        }
+      ]
+    },
     "function_type": {
       "type": "SEQ",
       "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "for_lifetimes"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "CHOICE",
           "members": [
@@ -8016,6 +8082,10 @@
     [
       "parameters",
       "tuple_struct_pattern"
+    ],
+    [
+      "type_parameters",
+      "for_lifetimes"
     ]
   ],
   "externals": [

src/node-types.json

@@ -1584,6 +1584,21 @@
       ]
     }
   },
+  {
+    "type": "for_lifetimes",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "lifetime",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "foreign_mod_item",
     "named": true,
@@ -1824,9 +1839,13 @@
       }
     },
     "children": {
-      "multiple": false,
+      "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "for_lifetimes",
+          "named": true
+        },
         {
           "type": "function_modifiers",
           "named": true