Add another test case for match

tree-sitter · Dec 14, 2021 · 41267b4 · 41267b4
1 parent 0881390
commit 41267b4
Show file tree

Hide file tree

Showing 5 changed files with 24,244 additions and 23,041 deletions.
diff --git a/grammar.js b/grammar.js
@@ -258,16 +258,15 @@ module.exports = grammar({
 
     match_statement: $ => seq(
       'match',
-      field('subject', $.expression),
+      commaSep1(field('subject', $.expression)),
       optional(','),
       ':',
       repeat(field('alternative', $.case_clause))),
 
     case_clause: $ => seq(
       'case',
-      commaSep1(field('pattern', choice($.expression, $.list_splat_pattern))),
+      commaSep1(field('pattern', seq(choice($.expression, $.list_splat_pattern), optional($.if_clause)))),
       optional(','),
-      optional($.if_clause),
       ':',
       field('consequence', $._suite)
     ),

diff --git a/src/grammar.json b/src/grammar.json
@@ -893,12 +893,49 @@
           "value": "match"
         },
         {
-          "type": "FIELD",
-          "name": "subject",
-          "content": {
-            "type": "SYMBOL",
-            "name": "expression"
-          }
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "subject",
+              "content": {
+                "type": "SYMBOL",
+                "name": "expression"
+              }
+            },
+            {
+              "type": "REPEAT",
+              "content": {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": ","
+                  },
+                  {
+                    "type": "FIELD",
+                    "name": "subject",
+                    "content": {
+                      "type": "SYMBOL",
+                      "name": "expression"
+                    }
+                  }
+                ]
+              }
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": ","
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         },
         {
           "type": "STRING",

diff --git a/src/node-types.json b/src/node-types.json
@@ -1880,7 +1880,7 @@
         ]
       },
       "subject": {
-        "multiple": false,
+        "multiple": true,
         "required": true,
         "types": [
           {