feat!: correctly round-trip code blocks with no trailing newline

Byron · Oct 4, 2024 · db76794 · db76794
1 parent 8a9573d
commit db76794
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -610,6 +610,7 @@ where
                 }
                 if last_was_text_without_trailing_newline {
                     formatter.write_char('\n')?;
+                    padding(formatter, &state.padding)?;
                 }
                 match state.code_block {
                     Some(CodeBlockKind::Fenced) => {

diff --git a/tests/display.rs b/tests/display.rs
@@ -219,6 +219,36 @@ mod end {
         assert_eq!(es([Start(Tag::CodeBlock(CodeBlockKind::Fenced("".into()))), End(TagEnd::CodeBlock)]), "\n````\n````");
     }
     #[test]
+    fn codeblock_in_list_item() {
+        assert_eq!(es([
+            Start(Tag::List(None)),
+            Start(Tag::Item),
+            Start(Tag::CodeBlock(CodeBlockKind::Fenced("".into()))),
+            Text("foo".into()),
+            End(TagEnd::CodeBlock),
+            End(TagEnd::Item),
+            End(TagEnd::List(false)),
+            Start(Tag::Paragraph),
+            Text("bar".into()),
+            End(TagEnd::Paragraph),
+        ]), "* \n  ````\n  foo\n  ````\n\nbar");
+    }
+    #[test]
+    fn codeblock_indented_in_list_item() {
+        assert_eq!(es([
+            Start(Tag::List(None)),
+            Start(Tag::Item),
+            Start(Tag::CodeBlock(CodeBlockKind::Indented)),
+            Text("foo".into()),
+            End(TagEnd::CodeBlock),
+            End(TagEnd::Item),
+            End(TagEnd::List(false)),
+            Start(Tag::Paragraph),
+            Text("bar".into()),
+            End(TagEnd::Paragraph),
+        ]), "* \n      foo\n      \n\nbar");
+    }
+    #[test]
     fn footnote_definition() {
         assert_eq!(s(End(TagEnd::FootnoteDefinition)), "");
     }

diff --git a/tests/fixtures/snapshots/stupicat-indented-code-block b/tests/fixtures/snapshots/stupicat-indented-code-block
@@ -2,4 +2,5 @@ codeblock:
 
     fn main() {
       println!("Hello, world!");
-    }
+    }
+
diff --git a/tests/fmt.rs b/tests/fmt.rs
@@ -885,7 +885,7 @@ mod codeblock {
         assert_eq!(
             fmts_both("  <!-- foo -->\n\n    <!-- foo -->"),
             (
-                "  <!-- foo -->\n\n    <!-- foo -->\n".into(),
+                "  <!-- foo -->\n\n    <!-- foo -->\n    ".into(),
                 State {
                     newlines_before_start: 2,
                     ..Default::default()
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,5 @@ codeblock: @@
         fn main() {
           println!("Hello, world!");
-        }
+        }