From 178cd8794a65fcd7ffdd136a242e459e461119c0 Mon Sep 17 00:00:00 2001
From: Jasper Van der Jeugt <m@jaspervdj.be>
Date: Mon, 19 Jun 2017 14:19:04 +0200
Subject: Rename list_same_align to pad_module_names

---
 data/stylish-haskell.yaml                    |  4 ++--
 lib/Language/Haskell/Stylish/Config.hs       |  2 +-
 lib/Language/Haskell/Stylish/Step/Imports.hs | 28 ++++++++++++++--------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/data/stylish-haskell.yaml b/data/stylish-haskell.yaml
index a5789d1..10301be 100644
--- a/data/stylish-haskell.yaml
+++ b/data/stylish-haskell.yaml
@@ -64,7 +64,7 @@ steps:
       # Default: after_alias
       list_align: after_alias
 
-      # Keep the same alignment between imports in a group:
+      # Right-pad the module names to align imports in a group:
       #
       # - true: a little more readable
       #
@@ -81,7 +81,7 @@ steps:
       #   >                                           init, last, length)
       #
       # Default: true
-      list_same_align: true
+      pad_module_names: true
 
       # Long list align style takes effect when import is too long. This is
       # determined by 'columns' setting.
diff --git a/lib/Language/Haskell/Stylish/Config.hs b/lib/Language/Haskell/Stylish/Config.hs
index 3f9efc5..9fddbb5 100644
--- a/lib/Language/Haskell/Stylish/Config.hs
+++ b/lib/Language/Haskell/Stylish/Config.hs
@@ -184,7 +184,7 @@ parseImports config o = Imports.step
     <*> (Imports.Options
         <$> (o A..:? "align" >>= parseEnum aligns (def Imports.importAlign))
         <*> (o A..:? "list_align" >>= parseEnum listAligns (def Imports.listAlign))
-        <*> (o A..:? "list_same_align" A..!= def Imports.listSameAlign)
+        <*> (o A..:? "pad_module_names" A..!= def Imports.padModuleNames)
         <*> (o A..:? "long_list_align"
             >>= parseEnum longListAligns (def Imports.longListAlign))
         -- Note that padding has to be at least 1. Default is 4.
diff --git a/lib/Language/Haskell/Stylish/Step/Imports.hs b/lib/Language/Haskell/Stylish/Step/Imports.hs
index 2580502..2284f3d 100644
--- a/lib/Language/Haskell/Stylish/Step/Imports.hs
+++ b/lib/Language/Haskell/Stylish/Step/Imports.hs
@@ -1,5 +1,5 @@
-{-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards   #-}
 --------------------------------------------------------------------------------
 module Language.Haskell.Stylish.Step.Imports
     ( Options (..)
@@ -16,16 +16,16 @@ module Language.Haskell.Stylish.Step.Imports
 --------------------------------------------------------------------------------
 import           Control.Arrow                   ((&&&))
 import           Control.Monad                   (void)
-import           Data.Monoid                     ((<>))
+import qualified Data.Aeson                      as A
+import qualified Data.Aeson.Types                as A
 import           Data.Char                       (toLower)
 import           Data.List                       (intercalate, sortBy)
+import qualified Data.Map                        as M
 import           Data.Maybe                      (isJust, maybeToList)
+import           Data.Monoid                     ((<>))
 import           Data.Ord                        (comparing)
-import qualified Data.Map                        as M
 import qualified Data.Set                        as S
 import qualified Language.Haskell.Exts           as H
-import qualified Data.Aeson                      as A
-import qualified Data.Aeson.Types                as A
 
 
 --------------------------------------------------------------------------------
@@ -38,7 +38,7 @@ import           Language.Haskell.Stylish.Util
 data Options = Options
     { importAlign    :: ImportAlign
     , listAlign      :: ListAlign
-    , listSameAlign  :: Bool
+    , padModuleNames :: Bool
     , longListAlign  :: LongListAlign
     , emptyListAlign :: EmptyListAlign
     , listPadding    :: ListPadding
@@ -50,7 +50,7 @@ defaultOptions :: Options
 defaultOptions = Options
     { importAlign    = Global
     , listAlign      = AfterAlias
-    , listSameAlign  = True
+    , padModuleNames = True
     , longListAlign  = Inline
     , emptyListAlign = Inherit
     , listPadding    = LPConstant 4
@@ -191,9 +191,9 @@ decomposeImportSpec x = case x of
 recomposeImportSpec :: (ImportEntity l, ImportPortion l) -> H.ImportSpec l
 recomposeImportSpec (e, p) = case e of
   ImportClassOrData l n -> case p of
-    ImportSome []       -> H.IAbs l (H.NoNamespace l) n
-    ImportSome names    -> H.IThingWith l n names
-    ImportAll           -> H.IThingAll l n
+    ImportSome []    -> H.IAbs l (H.NoNamespace l) n
+    ImportSome names -> H.IThingWith l n names
+    ImportAll        -> H.IThingAll l n
   ImportVar l n         -> H.IVar l n
   ImportOther l space n -> H.IAbs l space n
 
@@ -278,7 +278,7 @@ prettyImport columns Options{..} padQualified padName longest imp
         | otherwise = shortWrap
 
     emptyWrap = case emptyListAlign of
-        Inherit -> inlineWrap
+        Inherit    -> inlineWrap
         RightAfter -> [paddedNoSpecBase ++ " ()"]
 
     inlineWrap = inlineWrapper
@@ -375,7 +375,7 @@ prettyImport columns Options{..} padQualified padName longest imp
         Just is -> f $ map (prettyImportSpec separateLists) is
 
     maybeSpace = case spaceSurround of
-        True -> " "
+        True  -> " "
         False -> ""
 
 
@@ -388,13 +388,13 @@ prettyImportGroup columns align fileAlign longest imps =
     sortBy compareImports imps
   where
     align' = importAlign align
-    sameAlign = listSameAlign align
+    padModuleNames' = padModuleNames align
 
     longest' = case align' of
         Group -> longestImport imps
         _     -> longest
 
-    padName = align' /= None && sameAlign
+    padName = align' /= None && padModuleNames'
 
     padQual = case align' of
         Global -> True
-- 
cgit v1.2.3