diff options
-rw-r--r-- | lib/Language/Haskell/Stylish/Step/Imports.hs | 7 | ||||
-rw-r--r-- | tests/Language/Haskell/Stylish/Step/Imports/Tests.hs | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lib/Language/Haskell/Stylish/Step/Imports.hs b/lib/Language/Haskell/Stylish/Step/Imports.hs index 08918ae..29b8cc2 100644 --- a/lib/Language/Haskell/Stylish/Step/Imports.hs +++ b/lib/Language/Haskell/Stylish/Step/Imports.hs @@ -261,7 +261,12 @@ prettyImport columns Options{..} padQualified padName longest imp qualified | H.importQualified imp = ["qualified"] - | padQualified = [" "] + | padQualified = + if H.importSrc imp + then [] + else if H.importSafe imp + then [" "] + else [" "] | otherwise = [] safe diff --git a/tests/Language/Haskell/Stylish/Step/Imports/Tests.hs b/tests/Language/Haskell/Stylish/Step/Imports/Tests.hs index 86a4141..c3178ac 100644 --- a/tests/Language/Haskell/Stylish/Step/Imports/Tests.hs +++ b/tests/Language/Haskell/Stylish/Step/Imports/Tests.hs @@ -520,12 +520,14 @@ case20 = expected @=? testStep (step 80 defaultOptions) input' where expected = unlines - [ "import qualified Data.Map as Map" - , "import Data.Set (empty)" - , "import {-# SOURCE #-} qualified Data.Text as T" + [ "import {-# SOURCE #-} Data.ByteString as BS" + , "import qualified Data.Map as Map" + , "import Data.Set (empty)" + , "import {-# SOURCE #-} qualified Data.Text as T" ] input' = unlines - [ "import {-# SOURCE #-} qualified Data.Text as T" + [ "import {-# SOURCE #-} Data.ByteString as BS" + , "import {-# SOURCE #-} qualified Data.Text as T" , "import qualified Data.Map as Map" , "import Data.Set (empty)" ] |