list_padding: module_name

1 files changed, 63 insertions, 14 deletions

diff --git a/tests/Language/Haskell/Stylish/Step/Imports/Tests.hs b/tests/Language/Haskell/Stylish/Step/Imports/Tests.hs
index 4ebc050..3a839cb 100644
--- a/tests/Language/Haskell/Stylish/Step/Imports/Tests.hs
+++ b/tests/Language/Haskell/Stylish/Step/Imports/Tests.hs
@@ -17,7 +17,7 @@ import           Language.Haskell.Stylish.Tests.Util
 
 --------------------------------------------------------------------------------
 defaultAlign :: Align
-defaultAlign = Align Global AfterAlias Inline Inherit 4 True
+defaultAlign = Align Global AfterAlias Inline Inherit (LPConstant 4) True
 
 
 --------------------------------------------------------------------------------
@@ -46,6 +46,9 @@ tests = testGroup "Language.Haskell.Stylish.Step.Imports.Tests"
     , testCase "case 17" case17
     , testCase "case 18" case18
     , testCase "case 19" case19
+    , testCase "case 19b" case19b
+    , testCase "case 19d" case19c
+    , testCase "case 19d" case19d
     ]
 
 
@@ -185,7 +188,7 @@ case07 = expected @=? testStep (step 80 $ fromImportAlign File) input'
 --------------------------------------------------------------------------------
 case08 :: Assertion
 case08 = expected
-    @=? testStep (step 80 $ Align Global WithAlias Inline Inherit 4 True) input
+    @=? testStep (step 80 $ Align Global WithAlias Inline Inherit (LPConstant 4) True) input
   where
     expected = unlines
         [ "module Herp where"
@@ -208,7 +211,7 @@ case08 = expected
 --------------------------------------------------------------------------------
 case09 :: Assertion
 case09 = expected
-    @=? testStep (step 80 $ Align Global WithAlias Multiline Inherit 4 True) input
+    @=? testStep (step 80 $ Align Global WithAlias Multiline Inherit (LPConstant 4) True) input
   where
     expected = unlines
         [ "module Herp where"
@@ -242,7 +245,7 @@ case09 = expected
 --------------------------------------------------------------------------------
 case10 :: Assertion
 case10 = expected
-    @=? testStep (step 40 $ Align Group WithAlias Multiline Inherit 4 True) input
+    @=? testStep (step 40 $ Align Group WithAlias Multiline Inherit (LPConstant 4) True) input
   where
     expected = unlines
         [ "module Herp where"
@@ -281,7 +284,7 @@ case10 = expected
 --------------------------------------------------------------------------------
 case11 :: Assertion
 case11 = expected
-    @=? testStep (step 80 $ Align Group NewLine Inline Inherit 4 True) input
+    @=? testStep (step 80 $ Align Group NewLine Inline Inherit (LPConstant 4) True) input
   where
     expected = unlines
         [ "module Herp where"
@@ -309,7 +312,7 @@ case11 = expected
 --------------------------------------------------------------------------------
 case12 :: Assertion
 case12 = expected
-    @=? testStep (step 80 $ Align Group NewLine Inline Inherit 2 True) input'
+    @=? testStep (step 80 $ Align Group NewLine Inline Inherit (LPConstant 2) True) input'
   where
     input' = unlines
         [ "import Data.List (map)"
@@ -324,7 +327,7 @@ case12 = expected
 --------------------------------------------------------------------------------
 case13 :: Assertion
 case13 = expected
-    @=? testStep (step 80 $ Align None WithAlias InlineWithBreak Inherit 4 True) input'
+    @=? testStep (step 80 $ Align None WithAlias InlineWithBreak Inherit (LPConstant 4) True) input'
   where
     input' = unlines
         [ "import qualified Data.List as List (concat, foldl, foldr, head, init,"
@@ -342,7 +345,7 @@ case13 = expected
 case14 :: Assertion
 case14 = expected
     @=? testStep
-      (step 80 $ Align None WithAlias InlineWithBreak Inherit 10 True) expected
+      (step 80 $ Align None WithAlias InlineWithBreak Inherit (LPConstant 10) True) expected
   where
     expected = unlines
         [ "import qualified Data.List as List (concat, map, null, reverse, tail, (++))"
@@ -352,7 +355,7 @@ case14 = expected
 --------------------------------------------------------------------------------
 case15 :: Assertion
 case15 = expected
-    @=? testStep (step 80 $ Align None AfterAlias Multiline Inherit 4 True) input'
+    @=? testStep (step 80 $ Align None AfterAlias Multiline Inherit (LPConstant 4) True) input'
   where
     expected = unlines
         [ "import Data.Acid (AcidState)"
@@ -378,7 +381,7 @@ case15 = expected
 --------------------------------------------------------------------------------
 case16 :: Assertion
 case16 = expected
-    @=? testStep (step 80 $ Align None AfterAlias Multiline Inherit 4 False) input'
+    @=? testStep (step 80 $ Align None AfterAlias Multiline Inherit (LPConstant 4) False) input'
   where
     expected = unlines
         [ "import Data.Acid (AcidState)"
@@ -402,7 +405,7 @@ case16 = expected
 --------------------------------------------------------------------------------
 case17 :: Assertion
 case17 = expected
-    @=? testStep (step 80 $ Align None AfterAlias Multiline Inherit 4 True) input'
+    @=? testStep (step 80 $ Align None AfterAlias Multiline Inherit (LPConstant 4) True) input'
   where
     expected = unlines
         [ "import Control.Applicative (Applicative (pure, (<*>)))"
@@ -420,7 +423,7 @@ case17 = expected
 --------------------------------------------------------------------------------
 case18 :: Assertion
 case18 = expected @=? testStep
-    (step 40 $ Align None AfterAlias InlineToMultiline Inherit 4 True) input'
+    (step 40 $ Align None AfterAlias InlineToMultiline Inherit (LPConstant 4) True) input'
   where
     expected = unlines
            ----------------------------------------
@@ -447,7 +450,7 @@ case18 = expected @=? testStep
 --------------------------------------------------------------------------------
 case19 :: Assertion
 case19 = expected @=? testStep
-    (step 40 $ Align Global NewLine InlineWithBreak RightAfter 17 True) input'
+    (step 40 $ Align Global NewLine InlineWithBreak RightAfter (LPConstant 17) True) case19input
   where
     expected = unlines
            ----------------------------------------
@@ -460,7 +463,53 @@ case19 = expected @=? testStep
         , "                 intersperse)"
         ]
 
-    input' = unlines
+case19b :: Assertion
+case19b = expected @=? testStep
+    (step 40 $ Align File NewLine InlineWithBreak RightAfter (LPConstant 17) True) case19input
+  where
+    expected = unlines
+           ----------------------------------------
+        [ "import Prelude ()"
+        , "import Prelude.Compat hiding"
+        , "                 (foldMap)"
+        , ""
+        , "import Data.List"
+        , "                 (foldl', intercalate,"
+        , "                 intersperse)"
+        ]
+
+case19c :: Assertion
+case19c = expected @=? testStep
+    (step 40 $ Align File NewLine InlineWithBreak RightAfter LPModuleName True) case19input
+  where
+    expected = unlines
+           ----------------------------------------
+        [ "import Prelude ()"
+        , "import Prelude.Compat hiding"
+        , "       (foldMap)"
+        , ""
+        , "import Data.List"
+        , "       (foldl', intercalate,"
+        , "       intersperse)"
+        ]
+
+case19d :: Assertion
+case19d = expected @=? testStep
+    (step 40 $ Align Global NewLine InlineWithBreak RightAfter LPModuleName True) case19input
+  where
+    expected = unlines
+           ----------------------------------------
+        [ "import           Prelude ()"
+        , "import           Prelude.Compat hiding"
+        , "                 (foldMap)"
+        , ""
+        , "import           Data.List"
+        , "                 (foldl', intercalate,"
+        , "                 intersperse)"
+        ]
+
+case19input :: String
+case19input = unlines
         [ "import Prelude.Compat hiding (foldMap)"
         , "import Prelude ()"
         , ""