Merge pull request #21 from danderson/empty-style

Allow empty style elements in components
vrischmann · Jan 4, 2024 · 64f3ded · 64f3ded
2 parents f5c56b4 + 020a906
commit 64f3ded
Show file tree

Hide file tree

Showing 6 changed files with 26,332 additions and 26,144 deletions.
diff --git a/corpus/css.txt b/corpus/css.txt
@@ -204,3 +204,40 @@ font-size: 20px;
         (style_element_text))
       (style_element
         (style_element_text)))))
+
+===
+Empty style element
+===
+
+package main
+
+templ Foobar() {
+  <style type="text/css">
+  </style>
+  <h1 id="foo">Foobar</h1>
+}
+
+---
+
+(source_file
+  (package_clause
+    (package_identifier))
+  (component_declaration
+    name: (component_identifier)
+    (parameter_list)
+    (component_block
+      (style_element
+        (attribute
+          name: (attribute_name)
+          value: (quoted_attribute_value
+            (attribute_value))))
+      (element
+        (tag_start
+          name: (element_identifier)
+          (attribute
+            name: (attribute_name)
+            value: (quoted_attribute_value
+              (attribute_value))))
+        (element_text)
+        (tag_end
+          name: (element_identifier))))))
diff --git a/corpus/script.txt b/corpus/script.txt
@@ -73,3 +73,29 @@ script noScript() {}
     (script_identifier)
     (parameter_list)
     (script_block)))
+
+===
+Empty script in a templ element
+===
+
+package main
+
+templ Foobar() {
+  <script type="text/javascript">
+  </script>
+}
+
+---
+
+(source_file
+  (package_clause
+    (package_identifier))
+  (component_declaration
+    name: (component_identifier)
+    (parameter_list)
+    (component_block
+      (script_element
+        (attribute
+          name: (attribute_name)
+          value: (quoted_attribute_value
+            (attribute_value)))))))
diff --git a/grammar.js b/grammar.js
@@ -235,7 +235,7 @@ module.exports = grammar(GO, {
             field('name', 'style'),
             repeat($.attribute),
             '>',
-            $.style_element_text,
+            optional($.style_element_text),
             '</',
             'style',
             '>'

diff --git a/src/grammar.json b/src/grammar.json
@@ -7551,8 +7551,16 @@
           "value": ">"
         },
         {
-          "type": "SYMBOL",
-          "name": "style_element_text"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "style_element_text"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         },
         {
           "type": "STRING",

diff --git a/src/node-types.json b/src/node-types.json
@@ -2979,7 +2979,7 @@
     },
     "children": {
       "multiple": true,
-      "required": true,
+      "required": false,
       "types": [
         {
           "type": "attribute",