Fix #313 by doing some list munging.

I get rid of the Monoid instance because we weren't satisfying the laws.
Convenience of having <> didn't outweigh the shock-factor of having it
behave badly.

1 files changed, 19 insertions, 1 deletions

diff --git a/haddock-library/test/Documentation/Haddock/ParserSpec.hs b/haddock-library/test/Documentation/Haddock/ParserSpec.hs
index 5181a3f3..7df9dab2 100644
--- a/haddock-library/test/Documentation/Haddock/ParserSpec.hs
+++ b/haddock-library/test/Documentation/Haddock/ParserSpec.hs
@@ -4,13 +4,16 @@
 
 module Documentation.Haddock.ParserSpec (main, spec) where
 
-import           Data.Monoid
 import           Data.String
 import qualified Documentation.Haddock.Parser as Parse
 import           Documentation.Haddock.Types
+import           Documentation.Haddock.Doc (docAppend)
 import           Test.Hspec
 import           Test.QuickCheck
 
+infixr 6 <>
+(<>) = docAppend
+
 type Doc id = DocH () id
 
 instance IsString (Doc String) where
@@ -605,6 +608,21 @@ spec = do
                      ]
           <> DocOrderedList [ DocParagraph "baz" ]
 
+      it "list order is preserved in presence of nesting + extra text" $ do
+        "1. Foo\n\n    > Some code\n\n2. Bar\n\nSome text"
+          `shouldParseTo`
+          DocOrderedList [ DocParagraph "Foo" <> DocCodeBlock "Some code"
+                         , DocParagraph "Bar"
+                         ]
+          <> DocParagraph (DocString "Some text")
+
+        "1. Foo\n\n2. Bar\n\nSome text"
+          `shouldParseTo`
+          DocOrderedList [ DocParagraph "Foo"
+                         , DocParagraph "Bar"
+                         ]
+          <> DocParagraph (DocString "Some text")
+
     context "when parsing properties" $ do
       it "can parse a single property" $ do
         "prop> 23 == 23" `shouldParseTo` DocProperty "23 == 23"