Merge pull request #313 from expipiplus1/joe-exportlist

nondecreasing export list formatting

src-literatetests/10-tests.blt

@@ -1001,8 +1001,7 @@ module Main
   , test7
   , test8
   , test9
-  )
+  ) where
-where
 
 #test exports-with-comments
 module Main
@@ -1016,8 +1015,7 @@ module Main
   -- Test 5
   , test5
   -- Test 6
-  )
+  ) where
-where
 
 #test simple-export-with-things
 module Main (Test(..)) where
@@ -1035,7 +1033,7 @@ module Main
   ( Test(Test, a, b)
   , foo -- comment2
   ) -- comment3
-where
+    where
 
 #test export-with-empty-thing
 module Main (Test()) where
@@ -1286,8 +1284,7 @@ module Test
   , test9
   , test10
   -- Test 10
-  )
+  ) where
-where
 
 -- Test
 import           Data.List                                ( nub ) -- Test

src-literatetests/15-regressions.blt

@@ -831,8 +831,7 @@ module Main
   , DataTypeII(DataConstructor)
     -- * Haddock heading
   , name
-  )
+  ) where
-where
 
 #test type level list
 

src-literatetests/30-tests-context-free.blt

@@ -675,8 +675,7 @@ module Main
   , test7
   , test8
   , test9
-  )
+  ) where
-where
 
 #test exports-with-comments
 module Main
@@ -690,8 +689,7 @@ module Main
   -- Test 5
   , test5
   -- Test 6
-  )
+  ) where
-where
 
 #test simple-export-with-things
 module Main (Test(..)) where
@@ -913,8 +911,7 @@ module Test
   , test8
   , test9
   , test10
-  )
+  ) where
-where
 
 -- Test
 import Data.List (nub) -- Test

src/Language/Haskell/Brittany/Internal/Layouters/Module.hs

@@ -49,6 +49,7 @@ layoutModule lmod@(L _ mod') = case mod' of
                 , docWrapNode lmod $ appSep $ case les of
                   Nothing -> docEmpty
                   Just x  -> layoutLLIEs True x
+                , docSeparator
                 , docLit $ Text.pack "where"
                 ]
             addAlternative
@@ -56,11 +57,13 @@ layoutModule lmod@(L _ mod') = case mod' of
               [ docAddBaseY BrIndentRegular $ docPar
                 (docSeq [appSep $ docLit $ Text.pack "module", docLit tn]
                 )
-                (docWrapNode lmod $ case les of
+                (docSeq [ docWrapNode lmod $ case les of
-                  Nothing -> docEmpty
+                            Nothing -> docEmpty
-                  Just x  -> layoutLLIEs False x
+                            Just x  -> layoutLLIEs False x
+                        , docSeparator
+                        , docLit $ Text.pack "where"
+                        ]
                 )
-              , docLit $ Text.pack "where"
               ]
           ]
       : map layoutImport imports