Merge pull request #158 from brandonspark/switch-pattern-matching

feat(java 21): complete pattern matching for switch statements
tree-sitter · Aug 22, 2023 · 2a15634 · 2a15634
2 parents 0b3f9cf + 65cf2e0
commit 2a15634
Show file tree

Hide file tree

Showing 5 changed files with 28,214 additions and 27,547 deletions.
diff --git a/grammar.js b/grammar.js
@@ -482,7 +482,13 @@ module.exports = grammar({
     ),
 
     switch_label: $ => choice(
-      seq('case', choice($.pattern, commaSep1($.expression))),
+      seq('case',
+        choice(
+          $.pattern,
+          commaSep1($.expression)
+        ),
+        optional($.guard)
+      ),
       'default'
     ),
 
@@ -498,6 +504,8 @@ module.exports = grammar({
       choice($.identifier, $._reserved_identifier)
     ),
 
+    guard: $ => seq('when', $.expression),
+
     // Statements
 
     statement: $ => choice(

diff --git a/src/grammar.json b/src/grammar.json
@@ -3684,6 +3684,18 @@
                   ]
                 }
               ]
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "guard"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
             }
           ]
         },
@@ -3840,6 +3852,19 @@
         }
       ]
     },
+    "guard": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "when"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "expression"
+        }
+      ]
+    },
     "statement": {
       "type": "CHOICE",
       "members": [

diff --git a/src/node-types.json b/src/node-types.json
@@ -2143,6 +2143,21 @@
       ]
     }
   },
+  {
+    "type": "guard",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "expression",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "if_statement",
     "named": true,
@@ -3503,6 +3518,10 @@
           "type": "expression",
           "named": true
         },
+        {
+          "type": "guard",
+          "named": true
+        },
         {
           "type": "pattern",
           "named": true
@@ -4512,6 +4531,10 @@
     "type": "volatile",
     "named": false
   },
+  {
+    "type": "when",
+    "named": false
+  },
   {
     "type": "while",
     "named": false