Skip to content

Commit 986cea9

Browse files
committed
Imports: Respect separate_lists for (..) imports
Fixes #320
1 parent f6c3800 commit 986cea9

File tree

2 files changed

+11
-3
lines changed
  • lib/Language/Haskell/Stylish/Step
  • tests/Language/Haskell/Stylish/Step/Imports

2 files changed

+11
-3
lines changed

lib/Language/Haskell/Stylish/Step/Imports.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,13 +309,13 @@ printQualified Options{..} padNames stats (L _ decl) = do
309309

310310
--------------------------------------------------------------------------------
311311
printImport :: Options -> IE GhcPs -> P ()
312-
printImport Options{..} (IEVar _ name) = do
312+
printImport _ (IEVar _ name) = do
313313
printIeWrappedName name
314314
printImport _ (IEThingAbs _ name) = do
315315
printIeWrappedName name
316-
printImport _ (IEThingAll _ name) = do
316+
printImport Options{..} (IEThingAll _ name) = do
317317
printIeWrappedName name
318-
space
318+
when separateLists space
319319
putText "(..)"
320320
printImport _ (IEModuleContents _ (L _ m)) = do
321321
putText (moduleNameString m)

tests/Language/Haskell/Stylish/Step/Imports/Tests.hs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ tests = testGroup "Language.Haskell.Stylish.Step.Imports.Tests"
6161
, testCase "case 27" case27
6262
, testCase "case 28" case28
6363
, testCase "case 29" case29
64+
, testCase "case 30" case30
6465
]
6566

6667

@@ -834,3 +835,10 @@ case29 = assertSnippet (step Nothing $ fromImportAlign Group)
834835
, ""
835836
, "import A (A)"
836837
]
838+
839+
840+
--------------------------------------------------------------------------------
841+
case30 :: Assertion
842+
case30 = assertSnippet (step Nothing defaultOptions {separateLists = False})
843+
["import Data.Monoid (Monoid (..))"]
844+
["import Data.Monoid (Monoid(..))"]

0 commit comments

Comments
 (0)