Merge pull request #13 from mogstad/push-npwupmwyrwkk

Expose template content as `raw_text`

Author: NullVoxPopuli

grammar.js

@@ -47,6 +47,9 @@ noJSX(JavaScript);
  */
 module.exports = grammar(JavaScript, {
   name: "glimmer_javascript",
+
+  externals: ($, previous) => previous.concat([$.raw_text]),
+
   rules: {
     /**
      * TODO: add support for attributes
@@ -59,23 +62,13 @@ module.exports = grammar(JavaScript, {
      *         https://github.com/emberjs/rfcs/
      */
     glimmer_template: ($) =>
-      choice(
         seq(
           field("open_tag", $.glimmer_opening_tag),
-          // field("content", $.glimmer_template_content),
-          field("content", repeat($._glimmer_template_content)),
+          optional(alias(repeat($._glimmer_template_content), $.raw_text)),
           field("close_tag", $.glimmer_closing_tag),
         ),
-        // empty template has no content
-        // <template></template>
-        seq(
-          field("open_tag", $.glimmer_opening_tag),
-          field("close_tag", $.glimmer_closing_tag),
-        ),
-      ),
 
     _glimmer_template_content: (_) => /.{1,}/,
-    // glimmer_template_content: ($) => repeat1($._glimmer_template_content),
     glimmer_opening_tag: (_) => "<template>",
     glimmer_closing_tag: (_) => "</template>",
 

src/grammar.json

@@ -2395,60 +2395,43 @@
       ]
     },
     "glimmer_template": {
-      "type": "CHOICE",
+      "type": "SEQ",
       "members": [
         {
-          "type": "SEQ",
+          "type": "FIELD",
+          "name": "open_tag",
+          "content": {
+            "type": "SYMBOL",
+            "name": "glimmer_opening_tag"
+          }
+        },
+        {
+          "type": "CHOICE",
           "members": [
             {
-              "type": "FIELD",
-              "name": "open_tag",
-              "content": {
-                "type": "SYMBOL",
-                "name": "glimmer_opening_tag"
-              }
-            },
-            {
-              "type": "FIELD",
-              "name": "content",
+              "type": "ALIAS",
               "content": {
                 "type": "REPEAT",
                 "content": {
                   "type": "SYMBOL",
                   "name": "_glimmer_template_content"
                 }
-              }
+              },
+              "named": true,
+              "value": "raw_text"
             },
             {
-              "type": "FIELD",
-              "name": "close_tag",
-              "content": {
-                "type": "SYMBOL",
-                "name": "glimmer_closing_tag"
-              }
+              "type": "BLANK"
             }
           ]
         },
         {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "FIELD",
-              "name": "open_tag",
-              "content": {
-                "type": "SYMBOL",
-                "name": "glimmer_opening_tag"
-              }
-            },
-            {
-              "type": "FIELD",
-              "name": "close_tag",
-              "content": {
-                "type": "SYMBOL",
-                "name": "glimmer_closing_tag"
-              }
-            }
-          ]
+          "type": "FIELD",
+          "name": "close_tag",
+          "content": {
+            "type": "SYMBOL",
+            "name": "glimmer_closing_tag"
+          }
         }
       ]
     },
@@ -6533,6 +6516,10 @@
     {
       "type": "SYMBOL",
       "name": "jsx_text"
+    },
+    {
+      "type": "SYMBOL",
+      "name": "raw_text"
     }
   ],
   "inline": [

src/node-types.json

@@ -1640,6 +1640,16 @@
           }
         ]
       }
+    },
+    "children": {
+      "multiple": false,
+      "required": false,
+      "types": [
+        {
+          "type": "raw_text",
+          "named": true
+        }
+      ]
     }
   },
   {
@@ -2242,6 +2252,11 @@
       ]
     }
   },
+  {
+    "type": "raw_text",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "regex",
     "named": true,