Correctly merge list blanks with non-list blanks

Fixes #133
jgm · Dec 2, 2023 · daa72ec · daa72ec
1 parent 1ecf001
commit daa72ec
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/commonmark/src/Commonmark/Blocks.hs b/commonmark/src/Commonmark/Blocks.hs
@@ -70,6 +70,7 @@ import qualified Data.Text                 as T
 import qualified Data.Text.Read            as TR
 import           Data.Tree
 import           Text.Parsec
+import Data.List (sort)
 
 mkBlockParser
   :: (Monad m, IsBlock il bl)
@@ -865,7 +866,7 @@ listItemSpec parseListMarker = BlockSpec
           let lidata = fromDyn (blockData cdata)
                                  (ListItemData (BulletList '*')
                                    0 False False)
-          let allblanks = concat $ blockBlanks cdata :
+          let allblanks = reverse . sort . concat $ blockBlanks cdata :
                                   map (blockBlanks . rootLabel)
                                   (filter ((== "List") . blockType .
                                    blockSpec . rootLabel) children)

diff --git a/commonmark/test/regression.md b/commonmark/test/regression.md
@@ -270,3 +270,40 @@ Issue #130
 <p><a href="https://example.com" title="\
 ">my-link</a></p>
 ````````````````````````````````
+
+
+Issue #133
+```````````````````````````````` example
+  * * xx
+
+      * yy
+
+    zz
+.
+<ul>
+<li><ul>
+<li><p>xx</p>
+<ul>
+<li>yy</li>
+</ul></li>
+</ul>
+<p>zz</p></li>
+</ul>
+````````````````````````````````
+
+```````````````````````````````` example
+  * * xx
+      * yy
+
+    zz
+.
+<ul>
+<li><ul>
+<li>xx
+<ul>
+<li>yy</li>
+</ul></li>
+</ul>
+<p>zz</p></li>
+</ul>
+````````````````````````````````