Properly close lists before opening a footnote

Closes GitHub issue #413
pulldown-cmark · Nov 18, 2019 · ac3b283 · ac3b283
1 parent 7777d0e
commit ac3b283
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 10 deletions.
diff --git a/specs/regression.txt b/specs/regression.txt
@@ -708,3 +708,25 @@ ISSUE 399
 the size of <code>usize</code> and have the same alignment.</p>
 </blockquote>
 ````````````````````````````````
+
+ISSUE 413
+
+```````````````````````````````` example
+Lorem ipsum.[^a]
+
+An unordered list before the footnotes:
+* Ipsum
+* Lorem
+
+[^a]: Cool.
+.
+<p>Lorem ipsum.<sup class="footnote-reference"><a href="#a">1</a></sup></p>
+<p>An unordered list before the footnotes:</p>
+<ul>
+    <li>Ipsum</li>
+    <li>Lorem</li>
+</ul>
+<div class="footnote-definition" id="a"><sup class="footnote-definition-label">1</sup>
+    <p>Cool.</p>
+</div>
+````````````````````````````````
diff --git a/src/parse.rs b/src/parse.rs
@@ -1226,6 +1226,7 @@ impl<'a> FirstPass<'a> {
             return None;
         }
         i += 1;
+        self.finish_list(start);
         self.tree.append(Item {
             start,
             end: 0, // will get set later

diff --git a/tests/suite/regression.rs b/tests/suite/regression.rs
@@ -405,8 +405,7 @@ fn regression_test_30() {
  
 some text
 "##;
-    let expected =
-        r##"<table><thead><tr><th>Markdown </th><th> Less </th><th> Pretty</th></tr></thead><tbody>
+    let expected = r##"<table><thead><tr><th>Markdown </th><th> Less </th><th> Pretty</th></tr></thead><tbody>
 </tbody></table>
 <p>some text</p>
 "##;
@@ -805,3 +804,27 @@ fn regression_test_59() {
 
     test_markdown_html(original, expected);
 }
+
+#[test]
+fn regression_test_60() {
+    let original = r##"Lorem ipsum.[^a]
+
+An unordered list before the footnotes:
+* Ipsum
+* Lorem
+
+[^a]: Cool.
+"##;
+    let expected = r##"<p>Lorem ipsum.<sup class="footnote-reference"><a href="#a">1</a></sup></p>
+<p>An unordered list before the footnotes:</p>
+<ul>
+    <li>Ipsum</li>
+    <li>Lorem</li>
+</ul>
+<div class="footnote-definition" id="a"><sup class="footnote-definition-label">1</sup>
+    <p>Cool.</p>
+</div>
+"##;
+
+    test_markdown_html(original, expected);
+}
diff --git a/tests/suite/spec.rs b/tests/suite/spec.rs
@@ -6889,8 +6889,7 @@ fn spec_test_511() {
 fn spec_test_512() {
     let original = r##"[link *foo **bar** `#`*](/uri)
 "##;
-    let expected =
-        r##"<p><a href="/uri">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>
+    let expected = r##"<p><a href="/uri">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>
 "##;
 
     test_markdown_html(original, expected);
@@ -7038,8 +7037,7 @@ fn spec_test_526() {
 
 [ref]: /uri
 "##;
-    let expected =
-        r##"<p><a href="/uri">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>
+    let expected = r##"<p><a href="/uri">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>
 "##;
 
     test_markdown_html(original, expected);
@@ -7923,8 +7921,7 @@ fn spec_test_600() {
 fn spec_test_601() {
     let original = r##"<foo+special@Bar.baz-bar0.com>
 "##;
-    let expected =
-        r##"<p><a href="mailto:foo+special@Bar.baz-bar0.com">foo+special@Bar.baz-bar0.com</a></p>
+    let expected = r##"<p><a href="mailto:foo+special@Bar.baz-bar0.com">foo+special@Bar.baz-bar0.com</a></p>
 "##;
 
     test_markdown_html(original, expected);

diff --git a/tests/suite/table.rs b/tests/suite/table.rs
@@ -140,8 +140,7 @@ fn table_test_8() {
 
 #[test]
 fn table_test_9() {
-    let original =
-        r##"|  Target                       | std |rustc|cargo| notes                      |
+    let original = r##"|  Target                       | std |rustc|cargo| notes                      |
 |-------------------------------|-----|-----|-----|----------------------------|
 | `x86_64-unknown-linux-musl`   |  ✓  |     |     | 64-bit Linux with MUSL     |
 | `arm-linux-androideabi`       |  ✓  |     |     | ARM Android                |