Fix Wilfred#12

gurjeet · Jan 16, 2022 · 0cced45 · 0cced45
1 parent 526bea8
commit 0cced45
Show file tree

Hide file tree

Showing 5 changed files with 60,116 additions and 60,015 deletions.
diff --git a/corpus/failing.txt b/corpus/failing.txt
@@ -349,26 +349,3 @@ _boolean zoop:33=zoop:33 />
   (paragraph
     (html_tag)))
 
-================================================================================
-Example 645 - https://github.github.com/gfm/#example-645
-================================================================================
-foo <!-- not a comment -- two hyphens -->
-
---------------------------------------------------------------------------------
-
-(document
-  (paragraph))
-
-================================================================================
-Example 646 - https://github.github.com/gfm/#example-646
-================================================================================
-foo <!--> foo -->
-
-foo <!-- foo--->
-
---------------------------------------------------------------------------------
-
-(document
-  (paragraph)
-  (paragraph))
-
diff --git a/corpus/spec.txt b/corpus/spec.txt
@@ -9291,6 +9291,29 @@ comment - with hyphen -->
   (paragraph
     (html_tag)))
 
+================================================================================
+Example 645 - https://github.github.com/gfm/#example-645
+================================================================================
+foo <!-- not a comment -- two hyphens -->
+
+--------------------------------------------------------------------------------
+
+(document
+  (paragraph))
+
+================================================================================
+Example 646 - https://github.github.com/gfm/#example-646
+================================================================================
+foo <!--> foo -->
+
+foo <!-- foo--->
+
+--------------------------------------------------------------------------------
+
+(document
+  (paragraph)
+  (paragraph))
+
 ================================================================================
 Example 647 - https://github.github.com/gfm/#example-647
 ================================================================================

diff --git a/grammar.js b/grammar.js
@@ -705,22 +705,33 @@ module.exports = grammar(add_inline_rules({
         ),
         _html_comment: $ => prec.dynamic(PRECEDENCE_LEVEL_HTML, seq(
             '<!--',
-            optional(choice(
-                $._word,
-                $._whitespace,
-                $._newline,
-                punctuation_without($, ['-', '>']),
-                seq(
-                    '-',
-                    punctuation_without($, ['>']),
-                )
+            optional(seq(
+                choice(
+                    $._word,
+                    $._whitespace,
+                    $._newline,
+                    punctuation_without($, ['-', '>']),
+                    seq(
+                        '-',
+                        punctuation_without($, ['>']),
+                    )
+                ),
+                repeat(prec.right(choice(
+                    $._word,
+                    $._whitespace,
+                    $._newline,
+                    punctuation_without($, ['-']),
+                    seq(
+                        '-',
+                        choice(
+                            $._word,
+                            $._whitespace,
+                            $._newline,
+                            punctuation_without($, ['-']),
+                        )
+                    )
+                ))),
             )),
-            repeat(prec.right(choice(
-                $._word,
-                $._whitespace,
-                $._newline,
-                punctuation_without($, []),
-            ))),
             '-->'
         )),
         _processing_instruction: $ => prec.dynamic(PRECEDENCE_LEVEL_HTML, seq(