diff options
| author | Moritz Drexl <mdrexl@fastmail.fm> | 2016-12-28 18:12:08 +0100 |
|---|---|---|
| committer | Moritz Drexl <mdrexl@fastmail.fm> | 2016-12-28 18:12:08 +0100 |
| commit | 8c27fc3298bcb7f11e0dd5df498efd3ba83e6d87 (patch) | |
| tree | 41bba5630ba565d4acaefd72bf7d2b3078c41acc | |
| parent | 3d3865a4e605ca9a1ceacdcdab6c19df17de0079 (diff) | |
| download | stylish-haskell-8c27fc3298bcb7f11e0dd5df498efd3ba83e6d87.tar.gz | |
reduce unnecessary spaces
| -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)" ] |