Add supertypes

kolen · Feb 25, 2024 · 4b8b4cf · 4b8b4cf
1 parent 582b934
commit 4b8b4cf
Show file tree

Hide file tree

Showing 4 changed files with 2,545 additions and 2,448 deletions.
diff --git a/grammar.js b/grammar.js
@@ -338,5 +338,12 @@ module.exports = grammar({
     [$._attrs_plain],
   ],
 
-  extras: $ => []
+  extras: $ => [],
+
+  supertypes: $ => [
+    $._line,
+    $._ruby_block,
+    $._attr_shortcut,
+    $._output_modifier
+  ]
 });
diff --git a/src/grammar.json b/src/grammar.json
@@ -1872,5 +1872,10 @@
     }
   ],
   "inline": [],
-  "supertypes": []
+  "supertypes": [
+    "_line",
+    "_ruby_block",
+    "_attr_shortcut",
+    "_output_modifier"
+  ]
 }
diff --git a/src/node-types.json b/src/node-types.json
@@ -1,4 +1,96 @@
 [
+  {
+    "type": "_attr_shortcut",
+    "named": true,
+    "subtypes": [
+      {
+        "type": "attr_shortcut_class",
+        "named": true
+      },
+      {
+        "type": "attr_shortcut_custom",
+        "named": true
+      },
+      {
+        "type": "attr_shortcut_id",
+        "named": true
+      }
+    ]
+  },
+  {
+    "type": "_line",
+    "named": true,
+    "subtypes": [
+      {
+        "type": "_ruby_block",
+        "named": true
+      },
+      {
+        "type": "code_comment",
+        "named": true
+      },
+      {
+        "type": "doctype",
+        "named": true
+      },
+      {
+        "type": "element",
+        "named": true
+      },
+      {
+        "type": "embedded_engine",
+        "named": true
+      },
+      {
+        "type": "html_comment",
+        "named": true
+      },
+      {
+        "type": "html_comment_conditional",
+        "named": true
+      },
+      {
+        "type": "verbatim_text",
+        "named": true
+      }
+    ]
+  },
+  {
+    "type": "_output_modifier",
+    "named": true,
+    "subtypes": [
+      {
+        "type": "output_modifier_leading_whitespace",
+        "named": true
+      },
+      {
+        "type": "output_modifier_legacy_trailing_whitespace",
+        "named": true
+      },
+      {
+        "type": "output_modifier_trailing_whitespace",
+        "named": true
+      }
+    ]
+  },
+  {
+    "type": "_ruby_block",
+    "named": true,
+    "subtypes": [
+      {
+        "type": "ruby_block_control",
+        "named": true
+      },
+      {
+        "type": "ruby_block_output",
+        "named": true
+      },
+      {
+        "type": "ruby_block_output_noescape",
+        "named": true
+      }
+    ]
+  },
   {
     "type": "attr",
     "named": true,
@@ -112,15 +204,7 @@
       "required": true,
       "types": [
         {
-          "type": "attr_shortcut_class",
-          "named": true
-        },
-        {
-          "type": "attr_shortcut_custom",
-          "named": true
-        },
-        {
-          "type": "attr_shortcut_id",
+          "type": "_attr_shortcut",
           "named": true
         }
       ]
@@ -249,27 +333,19 @@
       "required": false,
       "types": [
         {
-          "type": "element_text",
-          "named": true
-        },
-        {
-          "type": "nested",
-          "named": true
-        },
-        {
-          "type": "nested_inline",
+          "type": "_output_modifier",
           "named": true
         },
         {
-          "type": "output_modifier_leading_whitespace",
+          "type": "element_text",
           "named": true
         },
         {
-          "type": "output_modifier_legacy_trailing_whitespace",
+          "type": "nested",
           "named": true
         },
         {
-          "type": "output_modifier_trailing_whitespace",
+          "type": "nested_inline",
           "named": true
         }
       ]
@@ -346,46 +422,10 @@
     "fields": {},
     "children": {
       "multiple": true,
-      "required": false,
+      "required": true,
       "types": [
         {
-          "type": "code_comment",
-          "named": true
-        },
-        {
-          "type": "doctype",
-          "named": true
-        },
-        {
-          "type": "element",
-          "named": true
-        },
-        {
-          "type": "embedded_engine",
-          "named": true
-        },
-        {
-          "type": "html_comment",
-          "named": true
-        },
-        {
-          "type": "html_comment_conditional",
-          "named": true
-        },
-        {
-          "type": "ruby_block_control",
-          "named": true
-        },
-        {
-          "type": "ruby_block_output",
-          "named": true
-        },
-        {
-          "type": "ruby_block_output_noescape",
-          "named": true
-        },
-        {
-          "type": "verbatim_text",
+          "type": "_line",
           "named": true
         }
       ]
@@ -464,15 +504,7 @@
       "required": true,
       "types": [
         {
-          "type": "output_modifier_leading_whitespace",
-          "named": true
-        },
-        {
-          "type": "output_modifier_legacy_trailing_whitespace",
-          "named": true
-        },
-        {
-          "type": "output_modifier_trailing_whitespace",
+          "type": "_output_modifier",
           "named": true
         },
         {
@@ -502,15 +534,7 @@
       "required": true,
       "types": [
         {
-          "type": "output_modifier_leading_whitespace",
-          "named": true
-        },
-        {
-          "type": "output_modifier_legacy_trailing_whitespace",
-          "named": true
-        },
-        {
-          "type": "output_modifier_trailing_whitespace",
+          "type": "_output_modifier",
           "named": true
         },
         {
@@ -529,43 +553,7 @@
       "required": false,
       "types": [
         {
-          "type": "code_comment",
-          "named": true
-        },
-        {
-          "type": "doctype",
-          "named": true
-        },
-        {
-          "type": "element",
-          "named": true
-        },
-        {
-          "type": "embedded_engine",
-          "named": true
-        },
-        {
-          "type": "html_comment",
-          "named": true
-        },
-        {
-          "type": "html_comment_conditional",
-          "named": true
-        },
-        {
-          "type": "ruby_block_control",
-          "named": true
-        },
-        {
-          "type": "ruby_block_output",
-          "named": true
-        },
-        {
-          "type": "ruby_block_output_noescape",
-          "named": true
-        },
-        {
-          "type": "verbatim_text",
+          "type": "_line",
           "named": true
         }
       ]
@@ -716,11 +704,11 @@
   },
   {
     "type": "ruby",
-    "named": false
+    "named": true
   },
   {
     "type": "ruby",
-    "named": true
+    "named": false
   },
   {
     "type": "ruby_expr",