Merge pull request #92 from kawaemon/fix/generic-type-accepts-qualifi…

…ed-type Allow GenericType to accept QualifiedType
tree-sitter · Oct 20, 2022 · 05900fa · 05900fa
2 parents 1341814 + dea1c78
commit 05900fa
Show file tree

Hide file tree

Showing 6 changed files with 20,522 additions and 18,627 deletions.
diff --git a/corpus/declarations.txt b/corpus/declarations.txt
@@ -246,6 +246,7 @@ func f2() (result int, err error) {}
 func f(x ... int, y ... int)
 func g1[T, U any, V interface{}, W Foo[Bar[T]]](a Foo[T]) {}
 func g1[T, U any, V interface{}, W Foo[Bar[T]]](a Foo[T]) {}
+func g2(a foo.bar[int]) {}
 func f[A int|string, B ~int, C ~int|~string]()
 
 --------------------------------------------------------------------------------
@@ -353,6 +354,18 @@ func f[A int|string, B ~int, C ~int|~string]()
           (type_arguments
             (type_identifier)))))
     (block))
+  (function_declaration
+    (identifier)
+    (parameter_list
+      (parameter_declaration
+        (identifier)
+        (generic_type
+          (qualified_type
+            (package_identifier)
+            (type_identifier))
+          (type_arguments
+            (type_identifier)))))
+    (block))
   (function_declaration
     (identifier)
     (type_parameter_list

diff --git a/grammar.js b/grammar.js
@@ -295,7 +295,7 @@ module.exports = grammar({
     ),
 
     generic_type: $ => seq(
-      field('type', $._type_identifier),
+      field('type', choice($._type_identifier, $.qualified_type)),
       field('type_arguments', $.type_arguments),
     ),
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -1169,8 +1169,17 @@
           "type": "FIELD",
           "name": "type",
           "content": {
-            "type": "SYMBOL",
-            "name": "_type_identifier"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_type_identifier"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "qualified_type"
+              }
+            ]
           }
         },
         {

diff --git a/src/node-types.json b/src/node-types.json
@@ -1184,6 +1184,10 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "qualified_type",
+            "named": true
+          },
           {
             "type": "type_identifier",
             "named": true