Merge pull request #49 from croservices/handle-comments

Present the simplest way to handle comments
croservices · Jul 21, 2021 · 9c03234 · 9c03234
2 parents 89b545d + 4237fe7
commit 9c03234
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/lib/Cro/WebApp/Template/Parser.pm6 b/lib/Cro/WebApp/Template/Parser.pm6
@@ -55,7 +55,8 @@ grammar Cro::WebApp::Template::Parser {
     }
 
     token tag-element:sym<literal> {
-        <-[<>]>+
+        | '!--' .*? '--' <?before '>'>
+        | <-[<>]>+
     }
 
     proto token sigil-tag { * }

diff --git a/t/template-basic.t b/t/template-basic.t
@@ -221,11 +221,16 @@ is norm-ws(render-template($base.add('comments.crotmp'), {})),
     <!-- HTML comment -->
     <div>Something else</div>
     <!--
-        multi-line HTML comment
+        multi-line HTML--comment
         -->
     <p>And that's it<!--really--></p>
     EXPECTED
 
+is norm-ws(render-template($base.add('comments-integration.crotmp'), {})),
+        norm-ws(q:to/EXPECTED/), 'Is not confused by HTML bits commented out';
+<html><!--<articleclass="messageis-small"><divclass="message--body">--><!--</div></article>--></html>
+EXPECTED
+
 sub norm-ws($str) {
     $str.subst(:g, /\s+/, '')
 }

diff --git a/t/test-data/comments-integration.crotmp b/t/test-data/comments-integration.crotmp
@@ -0,0 +1,6 @@
+<html>
+                      <!--<article class="message is-small">
+                        <div class="message--body">-->
+                        <!--</div>
+                      </article>-->
+</html>
diff --git a/t/test-data/comments.crotmp b/t/test-data/comments.crotmp
@@ -2,6 +2,6 @@
 <!-- HTML comment -->
 <div>Something else</div>
 <!--
-    multi-line HTML comment
+    multi-line HTML -- comment
     -->
 <p>And that's it<!--really--></p>