Merge pull request #119 from amaanq/param-fix

Param fix
tree-sitter · Jun 6, 2023 · 8867111 · 8867111
2 parents 7cccc30 + f3a8104
commit 8867111
Show file tree

Hide file tree

Showing 5 changed files with 12,128 additions and 12,111 deletions.
diff --git a/corpus/declarations.txt b/corpus/declarations.txt
@@ -248,6 +248,7 @@ 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]()
+func f2(a File, b, c, d Thing) int {}
 
 --------------------------------------------------------------------------------
 
@@ -265,10 +266,8 @@ func f[A int|string, B ~int, C ~int|~string]()
         (identifier)
         (type_identifier))
       (parameter_declaration
-        (type_identifier))
-      (parameter_declaration
-        (type_identifier))
-      (parameter_declaration
+        (identifier)
+        (identifier)
         (identifier)
         (type_identifier)))
     (type_identifier)
@@ -305,9 +304,8 @@ func f[A int|string, B ~int, C ~int|~string]()
   (function_declaration
     (identifier)
     (type_parameter_list
-      (parameter_declaration
-        (type_identifier))
       (parameter_declaration
+        (identifier)
         (identifier)
         (type_identifier))
       (parameter_declaration
@@ -334,8 +332,7 @@ func f[A int|string, B ~int, C ~int|~string]()
     (identifier)
     (type_parameter_list
       (parameter_declaration
-        (type_identifier))
-      (parameter_declaration
+        (identifier)
         (identifier)
         (type_identifier))
       (parameter_declaration
@@ -389,7 +386,20 @@ func f[A int|string, B ~int, C ~int|~string]()
             (type_identifier))
           (negated_type
             (type_identifier)))))
-    (parameter_list)))
+    (parameter_list))
+  (function_declaration
+    (identifier)
+    (parameter_list
+      (parameter_declaration
+        (identifier)
+        (type_identifier))
+      (parameter_declaration
+        (identifier)
+        (identifier)
+        (identifier)
+        (type_identifier)))
+    (type_identifier)
+    (block)))
 
 ================================================================================
 Single-line function declarations

diff --git a/corpus/types.txt b/corpus/types.txt
@@ -153,8 +153,7 @@ type g2[T, U any, V interface{}, W Foo[Bar[T]]] struct {}
       (type_identifier)
       (type_parameter_list
         (parameter_declaration
-          (type_identifier))
-        (parameter_declaration
+          (identifier)
           (identifier)
           (type_identifier))
         (parameter_declaration

diff --git a/grammar.js b/grammar.js
@@ -233,7 +233,7 @@ module.exports = grammar({
       ')'
     ),
 
-    parameter_declaration: $ => prec.left(-1, seq(
+    parameter_declaration: $ => prec.left(seq(
       commaSep(field('name', $.identifier)),
       field('type', $._type),
     )),

diff --git a/src/grammar.json b/src/grammar.json
@@ -813,7 +813,7 @@
     },
     "parameter_declaration": {
       "type": "PREC_LEFT",
-      "value": -1,
+      "value": 0,
       "content": {
         "type": "SEQ",
         "members": [