fix: inline anonymous nodes (#13)

Problem: The "trick" of wrapping an anonymous node into a single `choice` or `seq` no longer works as of tree-sitter/tree-sitter#2577 Solution: Inline anonymous nodes.
charmbracelet · Aug 17, 2024 · 780a8a2 · 780a8a2
1 parent 90028bb
commit 780a8a2
Show file tree

Hide file tree

Showing 7 changed files with 1,249 additions and 1,114 deletions.
diff --git a/grammar.js b/grammar.js
@@ -6,8 +6,8 @@ module.exports = grammar({
       $.control,
       $.shift,
       $.alt,
-      $.hide,
-      $.show,
+      'Hide',
+      'Show',
       $.output,
       $.sleep,
       $.type,
@@ -19,8 +19,8 @@ module.exports = grammar({
       $.right,
       $.set,
       $.env,
-      $.copy,
-      $.paste,
+      'Copy',
+      'Paste',
       $.space,
       $.tab,
       $.up,
@@ -31,10 +31,6 @@ module.exports = grammar({
     control: $ =>   /Ctrl\+(Alt\+)?(Shift\+)?([A-Z]|Enter)/,
     alt: $ =>       /Alt\+(Shift\+)?([A-Z]|Enter|Tab)/,
     shift: $ =>     /Shift\+([A-Z]|Enter|Tab)/,
-    hide: $ =>      seq('Hide'),
-    show: $ =>      seq('Show'),
-    copy: $ =>      seq('Copy'),
-    paste: $ =>     seq('Paste'),
     output: $ =>    seq('Output',    $.path),
     set: $ =>       seq('Set',       $.setting),
     env: $ =>       seq('Env',       $.string, $.string),

diff --git a/src/grammar.json b/src/grammar.json
@@ -33,12 +33,12 @@
           "name": "alt"
         },
         {
-          "type": "SYMBOL",
-          "name": "hide"
+          "type": "STRING",
+          "value": "Hide"
         },
         {
-          "type": "SYMBOL",
-          "name": "show"
+          "type": "STRING",
+          "value": "Show"
         },
         {
           "type": "SYMBOL",
@@ -85,12 +85,12 @@
           "name": "env"
         },
         {
-          "type": "SYMBOL",
-          "name": "copy"
+          "type": "STRING",
+          "value": "Copy"
         },
         {
-          "type": "SYMBOL",
-          "name": "paste"
+          "type": "STRING",
+          "value": "Paste"
         },
         {
           "type": "SYMBOL",
@@ -126,42 +126,6 @@
       "type": "PATTERN",
       "value": "Shift\\+([A-Z]|Enter|Tab)"
     },
-    "hide": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "Hide"
-        }
-      ]
-    },
-    "show": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "Show"
-        }
-      ]
-    },
-    "copy": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "Copy"
-        }
-      ]
-    },
-    "paste": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "Paste"
-        }
-      ]
-    },
     "output": {
       "type": "SEQ",
       "members": [
@@ -962,4 +926,3 @@
   "inline": [],
   "supertypes": []
 }
-
diff --git a/src/node-types.json b/src/node-types.json
@@ -24,7 +24,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": true,
+      "required": false,
       "types": [
         {
           "type": "alt",
@@ -38,10 +38,6 @@
           "type": "control",
           "named": true
         },
-        {
-          "type": "copy",
-          "named": true
-        },
         {
           "type": "down",
           "named": true
@@ -58,10 +54,6 @@
           "type": "escape",
           "named": true
         },
-        {
-          "type": "hide",
-          "named": true
-        },
         {
           "type": "left",
           "named": true
@@ -78,10 +70,6 @@
           "type": "pageup",
           "named": true
         },
-        {
-          "type": "paste",
-          "named": true
-        },
         {
           "type": "right",
           "named": true
@@ -94,10 +82,6 @@
           "type": "shift",
           "named": true
         },
-        {
-          "type": "show",
-          "named": true
-        },
         {
           "type": "sleep",
           "named": true
@@ -121,11 +105,6 @@
       ]
     }
   },
-  {
-    "type": "copy",
-    "named": true,
-    "fields": {}
-  },
   {
     "type": "down",
     "named": true,
@@ -198,11 +177,6 @@
       ]
     }
   },
-  {
-    "type": "hide",
-    "named": true,
-    "fields": {}
-  },
   {
     "type": "left",
     "named": true,
@@ -275,11 +249,6 @@
       ]
     }
   },
-  {
-    "type": "paste",
-    "named": true,
-    "fields": {}
-  },
   {
     "type": "program",
     "named": true,
@@ -368,11 +337,6 @@
       ]
     }
   },
-  {
-    "type": "show",
-    "named": true,
-    "fields": {}
-  },
   {
     "type": "sleep",
     "named": true,