Fix comments in ternary exp

Beaglefoot · Jan 27, 2024 · 61b0da1 · 61b0da1
1 parent 0396748
commit 61b0da1
Show file tree

Hide file tree

Showing 5 changed files with 59,897 additions and 52,345 deletions.
diff --git a/grammar.js b/grammar.js
@@ -263,8 +263,10 @@ module.exports = grammar({
         seq(
           field('condition', $._exp),
           '?',
+          optional($.comment),
           field('consequence', $._exp),
           ':',
+          optional($.comment),
           field('alternative', $._exp)
         )
       ),

diff --git a/src/grammar.json b/src/grammar.json
@@ -1391,6 +1391,18 @@
             "type": "STRING",
             "value": "?"
           },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "comment"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          },
           {
             "type": "FIELD",
             "name": "consequence",
@@ -1403,6 +1415,18 @@
             "type": "STRING",
             "value": ":"
           },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "comment"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          },
           {
             "type": "FIELD",
             "name": "alternative",

diff --git a/src/node-types.json b/src/node-types.json
@@ -4561,6 +4561,16 @@
           }
         ]
       }
+    },
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "comment",
+          "named": true
+        }
+      ]
     }
   },
   {