BareGit

Close lists before opening unindented blocks

Author: MetroWind <chris.corsair@gmail.com>
Date: Sun Nov 1 16:06:17 2026 -0800
Commit: f37064a33b233f0c7d777420e6a174f803c75482

Changes

diff --git a/src/block_parser.cpp b/src/block_parser.cpp
index 37ee063..4542b00 100644
--- a/src/block_parser.cpp
+++ b/src/block_parser.cpp
@@ -461,6 +461,14 @@ void BlockParser::openContainers(const std::string& line, size_t& offset)
         }
 
         LineCursor cursor(line, offset);
+        if(tip->type == BlockType::List && !cursor.blank() &&
+           !parseListMarker(cursor))
+        {
+            // Only list items can be direct children of a list.
+            closeBlocks(open_blocks.size() - 2);
+            continue;
+        }
+
         if(const auto quote = parseBlockQuoteMarker(cursor))
         {
             offset = quote->content_offset;
diff --git a/tests/test_macrodown.cpp b/tests/test_macrodown.cpp
index 1fd0bf6..321bd9c 100644
--- a/tests/test_macrodown.cpp
+++ b/tests/test_macrodown.cpp
@@ -111,6 +111,36 @@ TEST(MacroDownTest, ConsecutiveUnorderedAndOrderedLists)
     EXPECT_EQ(md.render(*md.parse(input)), expected);
 }
 
+// Blocks without list-item indentation must follow the list as siblings.
+TEST(MacroDownTest, ListFollowedByBlocks)
+{
+    MacroDown md;
+    const std::string list = "<ol>\n<li>\n<p>ccc</p>\n</li>\n</ol>\n";
+    EXPECT_EQ(md.render(*md.parse("1. ccc\n\n> quote\n\n```\ncode\n```")),
+              list + "<blockquote>\n<p>quote</p>\n</blockquote>\n"
+                     "<pre><code>code\n</code></pre>\n");
+    EXPECT_EQ(md.render(*md.parse("1. ccc\n\n```\ncode\n```")),
+              list + "<pre><code>code\n</code></pre>\n");
+    EXPECT_EQ(md.render(*md.parse("1. ccc\n\n# heading")),
+              list + "<h1>heading</h1>\n");
+    EXPECT_EQ(md.render(*md.parse("1. ccc\n\n---")),
+              list + "<hr />\n");
+}
+
+// Indented blocks remain children of their containing list item.
+TEST(MacroDownTest, ListItemContainsBlocks)
+{
+    MacroDown md;
+    const std::string input =
+        "1. ccc\n\n   > quote\n\n   ```\n   code\n   ```";
+    const std::string expected =
+        "<ol>\n<li>\n<p>ccc</p>\n"
+        "<blockquote>\n<p>quote</p>\n</blockquote>\n"
+        "<pre><code>code\n</code></pre>\n"
+        "</li>\n</ol>\n";
+    EXPECT_EQ(md.render(*md.parse(input)), expected);
+}
+
 TEST(MacroDownTest, CommonMarkHorizontalRule)
 {
     MacroDown md;