Fix coments in switch body

Beaglefoot · Nov 5, 2023 · 6fdea72 · 6fdea72
1 parent 90c8d9b
commit 6fdea72
Show file tree

Hide file tree

Showing 5 changed files with 46,577 additions and 46,296 deletions.
diff --git a/grammar.js b/grammar.js
@@ -161,15 +161,17 @@ module.exports = grammar({
 
     switch_statement: $ => seq('switch', '(', $._exp, ')', repeat($.comment), $.switch_body),
 
-    switch_body: $ => seq('{', repeat(choice($.switch_case, $.switch_default)), '}'),
+    switch_body: $ => seq('{', repeat(choice($.switch_case, $.switch_default, $.comment)), '}'),
 
     switch_case: $ =>
-      seq(
-        'case',
-        field('value', choice($._primitive, $.regex)),
-        ':',
-        repeat($.comment),
-        optional($._statement)
+      prec.right(
+        seq(
+          'case',
+          field('value', choice($._primitive, $.regex)),
+          ':',
+          repeat($.comment),
+          optional($._statement)
+        )
       ),
 
     switch_default: $ => seq('default', ':', repeat($.comment), $._statement),

diff --git a/src/grammar.json b/src/grammar.json
@@ -827,6 +827,10 @@
               {
                 "type": "SYMBOL",
                 "name": "switch_default"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "comment"
               }
             ]
           }
@@ -838,53 +842,57 @@
       ]
     },
     "switch_case": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "case"
-        },
-        {
-          "type": "FIELD",
-          "name": "value",
-          "content": {
+      "type": "PREC_RIGHT",
+      "value": 0,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "STRING",
+            "value": "case"
+          },
+          {
+            "type": "FIELD",
+            "name": "value",
+            "content": {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "_primitive"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "regex"
+                }
+              ]
+            }
+          },
+          {
+            "type": "STRING",
+            "value": ":"
+          },
+          {
+            "type": "REPEAT",
+            "content": {
+              "type": "SYMBOL",
+              "name": "comment"
+            }
+          },
+          {
             "type": "CHOICE",
             "members": [
               {
                 "type": "SYMBOL",
-                "name": "_primitive"
+                "name": "_statement"
               },
               {
-                "type": "SYMBOL",
-                "name": "regex"
+                "type": "BLANK"
               }
             ]
           }
-        },
-        {
-          "type": "STRING",
-          "value": ":"
-        },
-        {
-          "type": "REPEAT",
-          "content": {
-            "type": "SYMBOL",
-            "name": "comment"
-          }
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "_statement"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
-        }
-      ]
+        ]
+      }
     },
     "switch_default": {
       "type": "SEQ",

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