Use external raw_text token to resolve inline JS and CSS

grammar.js

@@ -1,7 +1,15 @@
 module.exports = grammar({
   name: "pug",
 
-  externals: ($) => [$._newline, $._indent, $._dedent],
+  externals: ($) => [
+    $._newline,
+    $._indent,
+    $._dedent,
+    $._tag_name,
+    $._script_tag_name,
+    $._style_tag_name,
+    $.raw_text,
+  ],
 
   rules: {
     source_file: ($) =>
@@ -25,12 +33,21 @@ module.exports = grammar({
     script_tag: ($) =>
       seq("script", optional($._attributes), optional(seq(".", $._newline))),
 
+    // No ERROR nodes, without external token raw_text
+    // style_tag: ($) => seq("style", optional($._attributes)),
+
+    // Produces many ERROR nodes
     style_tag: ($) =>
-      seq("style", optional($._attributes), optional(seq(".", $._newline))),
+      seq(
+        "style",
+        optional($._attributes),
+        optional(seq(".", $._newline, $.raw_text))
+      ),
 
     path: ($) => seq(repeat1(choice(/\w/, "/")), ".", repeat1(/\w/)),
 
-    raw_text: ($) => choice(seq($._indent, /\w/, $._dedent)),
+    // Alternative to external token raw_text
+    // raw_text: ($) => choice(seq($._indent, /\w/, $._dedent)),
 
     _attributes: ($) =>
       seq("(", repeat(seq($.attribute, optional(choice(",", " ")))), ")"),

package.json

@@ -11,6 +11,7 @@
     "tree-sitter-cli": "^0.20.8"
   },
   "scripts": {
+    "example": "tree-sitter parse example-file.pug",
     "generate": "tree-sitter generate",
     "gt": "tree-sitter generate && tree-sitter test",
     "parse": "tree-sitter parse",

src/grammar.json

@@ -162,6 +162,10 @@
                 {
                   "type": "SYMBOL",
                   "name": "_newline"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "raw_text"
                 }
               ]
             },
@@ -204,28 +208,6 @@
         }
       ]
     },
-    "raw_text": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "_indent"
-            },
-            {
-              "type": "PATTERN",
-              "value": "\\w"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "_dedent"
-            }
-          ]
-        }
-      ]
-    },
     "_attributes": {
       "type": "SEQ",
       "members": [
@@ -416,6 +398,22 @@
     {
       "type": "SYMBOL",
       "name": "_dedent"
+    },
+    {
+      "type": "SYMBOL",
+      "name": "_tag_name"
+    },
+    {
+      "type": "SYMBOL",
+      "name": "_script_tag_name"
+    },
+    {
+      "type": "SYMBOL",
+      "name": "_style_tag_name"
+    },
+    {
+      "type": "SYMBOL",
+      "name": "raw_text"
     }
   ],
   "inline": [],

src/node-types.json

@@ -148,6 +148,10 @@
         {
           "type": "attribute",
           "named": true
+        },
+        {
+          "type": "raw_text",
+          "named": true
         }
       ]
     }
@@ -213,6 +217,10 @@
     "type": "link",
     "named": false
   },
+  {
+    "type": "raw_text",
+    "named": true
+  },
   {
     "type": "script",
     "named": false