BareGit

Fix consecutive lists with different markers nesting incorrectly

Author: MetroWind <chris.corsair@gmail.com>
Date: Sun Nov 1 15:56:04 2026 -0800
Commit: 69cc7134a287fd8722104b25179657a6d88aed06

Changes

diff --git a/src/block_parser.cpp b/src/block_parser.cpp
index d9a5855..37ee063 100644
--- a/src/block_parser.cpp
+++ b/src/block_parser.cpp
@@ -482,9 +482,16 @@ void BlockParser::openContainers(const std::string& line, size_t& offset)
             tip = open_blocks.back();
         }
 
-        if(tip->type != BlockType::List ||
-           tip->list_char != marker->delimiter ||
-           tip->is_ordered != marker->is_ordered)
+        if(tip->type == BlockType::List &&
+           (tip->list_char != marker->delimiter ||
+            tip->is_ordered != marker->is_ordered))
+        {
+            // A different marker closes the list at this indentation.
+            closeBlocks(open_blocks.size() - 2);
+            tip = open_blocks.back();
+        }
+
+        if(tip->type != BlockType::List)
         {
             tip = appendBlock(tip, BlockType::List);
             tip->list_char = marker->delimiter;
diff --git a/tests/test_macrodown.cpp b/tests/test_macrodown.cpp
index d8ad11d..1fd0bf6 100644
--- a/tests/test_macrodown.cpp
+++ b/tests/test_macrodown.cpp
@@ -93,6 +93,24 @@ TEST(MacroDownTest, CommonMarkLists)
               "<ol>\n<li>\n<p>One</p>\n</li>\n</ol>\n");
 }
 
+// Different list types at the same indentation form sibling lists.
+TEST(MacroDownTest, ConsecutiveUnorderedAndOrderedLists)
+{
+    MacroDown md;
+    const std::string input = "aaa\n\n* bbb\n* ccc\n\n1. ddd\n2. eee\n";
+    const std::string expected =
+        "<p>aaa</p>\n"
+        "<ul>\n"
+        "<li>\n<p>bbb</p>\n</li>\n"
+        "<li>\n<p>ccc</p>\n</li>\n"
+        "</ul>\n"
+        "<ol>\n"
+        "<li>\n<p>ddd</p>\n</li>\n"
+        "<li>\n<p>eee</p>\n</li>\n"
+        "</ol>\n";
+    EXPECT_EQ(md.render(*md.parse(input)), expected);
+}
+
 TEST(MacroDownTest, CommonMarkHorizontalRule)
 {
     MacroDown md;