Merge pull request #16 from vrischmann/element-comment

Fix HTML comment parsing
vrischmann · Dec 23, 2023 · eab4f31 · eab4f31
2 parents 60fe178 + 674c66f
commit eab4f31
Show file tree

Hide file tree

Showing 6 changed files with 26,937 additions and 27,150 deletions.
diff --git a/corpus/components.txt b/corpus/components.txt
@@ -741,3 +741,53 @@ templ (d Data) Method() {
             field: (field_identifier)))
         (tag_end
           name: (element_identifier))))))
+
+====
+HTML comment
+====
+
+package main
+
+templ Component() {
+  <html>
+    <head>
+      <!--
+        <link rel="stylesheet" href="/assets/css/bulma.min.css"/> What is bulma??
+        <link rel="apple-touch-icon" sizes="180x180" href="/assets/favicon/apple-touch-icon.png"/>
+      -->
+      <link href="/style.css" rel="stylesheet"/>
+    </head>
+  </html>
+}
+
+---
+
+(source_file
+  (package_clause
+    (package_identifier))
+  (component_declaration
+    (component_identifier)
+    (parameter_list)
+    (component_block
+      (element
+        (tag_start
+          (element_identifier))
+        (element
+          (tag_start
+            (element_identifier))
+          (element_comment)
+          (element
+            (self_closing_tag
+              (element_identifier)
+              (attribute
+                (attribute_name)
+                (quoted_attribute_value
+                  (attribute_value)))
+              (attribute
+                (attribute_name)
+                (quoted_attribute_value
+                  (attribute_value)))))
+          (tag_end
+            (element_identifier)))
+        (tag_end
+          (element_identifier))))))
diff --git a/grammar.js b/grammar.js
@@ -12,6 +12,7 @@ module.exports = grammar(GO, {
     externals: $ => [
         $.css_property_value,
         $.element_text,
+        $.element_comment,
         $.style_element_text,
         $.script_block_text,
         $.script_element_text,
@@ -88,13 +89,6 @@ module.exports = grammar(GO, {
             prec.right(1, $.comment),
         ),
 
-        // This matches HTML comment.
-        element_comment: $ => seq(
-            '<!--',
-            /[^-]*(?:-+[^->]+)*/,
-            '-->'
-        ),
-
         // This matches an if statement in a component block.
         //
         // Based on the $.if_statement rule of the Go grammar

diff --git a/src/grammar.json b/src/grammar.json
@@ -7006,23 +7006,6 @@
         }
       ]
     },
-    "element_comment": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "<!--"
-        },
-        {
-          "type": "PATTERN",
-          "value": "[^-]*(?:-+[^->]+)*"
-        },
-        {
-          "type": "STRING",
-          "value": "-->"
-        }
-      ]
-    },
     "component_if_statement": {
       "type": "SEQ",
       "members": [
@@ -8164,6 +8147,10 @@
       "type": "SYMBOL",
       "name": "element_text"
     },
+    {
+      "type": "SYMBOL",
+      "name": "element_comment"
+    },
     {
       "type": "SYMBOL",
       "name": "style_element_text"

diff --git a/src/node-types.json b/src/node-types.json
@@ -1494,11 +1494,6 @@
       ]
     }
   },
-  {
-    "type": "element_comment",
-    "named": true,
-    "fields": {}
-  },
   {
     "type": "empty_statement",
     "named": true,
@@ -3529,10 +3524,6 @@
     "type": "--",
     "named": false
   },
-  {
-    "type": "-->",
-    "named": false
-  },
   {
     "type": "-=",
     "named": false
@@ -3577,10 +3568,6 @@
     "type": "<!",
     "named": false
   },
-  {
-    "type": "<!--",
-    "named": false
-  },
   {
     "type": "<-",
     "named": false
@@ -3713,6 +3700,10 @@
     "type": "defer",
     "named": false
   },
+  {
+    "type": "element_comment",
+    "named": true
+  },
   {
     "type": "element_identifier",
     "named": true