Fix HTML comment parsing with - before closing --> (#286)

Fixes #285.
commonmark · Mar 6, 2024 · 6f94a99 · 6f94a99
1 parent a4d859c
commit 6f94a99
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/lib/common.js b/lib/common.js
@@ -24,7 +24,7 @@ var ATTRIBUTEVALUESPEC = "(?:" + "\\s*=" + "\\s*" + ATTRIBUTEVALUE + ")";
 var ATTRIBUTE = "(?:" + "\\s+" + ATTRIBUTENAME + ATTRIBUTEVALUESPEC + "?)";
 var OPENTAG = "<" + TAGNAME + ATTRIBUTE + "*" + "\\s*/?>";
 var CLOSETAG = "</" + TAGNAME + "\\s*[>]";
-var HTMLCOMMENT = "<!-->|<!--->|<!--(?:[^-]|-[^-]|--[^>])*-->"
+var HTMLCOMMENT = "<!-->|<!--->|<!--[\\s\\S]*?-->"
 var PROCESSINGINSTRUCTION = "[<][?][\\s\\S]*?[?][>]";
 var DECLARATION = "<![A-Za-z]+" + "[^>]*>";
 var CDATA = "<!\\[CDATA\\[[\\s\\S]*?\\]\\]>";

diff --git a/test/regression.txt b/test/regression.txt
@@ -502,3 +502,19 @@ x<!>
 <p>x<!x></p>
 <p>x&lt;!&gt;</p>
 ````````````````````````````````
+
+#285
+```````````````````````````````` example
+foo <!-- test --->
+
+foo <!-- test ---->
+
+foo <!----->
+
+foo <!-- test --> more -->
+.
+<p>foo <!-- test ---></p>
+<p>foo <!-- test ----></p>
+<p>foo <!-----></p>
+<p>foo <!-- test --> more --&gt;</p>
+````````````````````````````````