diff options
| author | Jasper Van der Jeugt <m@jaspervdj.be> | 2012-11-05 11:05:28 +0100 |
|---|---|---|
| committer | Jasper Van der Jeugt <m@jaspervdj.be> | 2012-11-05 11:05:28 +0100 |
| commit | 1354152db499f942f20c6a433a9c26bf3ddb927e (patch) | |
| tree | 8e18879e66d9e69c4a9eb7fe67c3efdb29e7ffe0 /src | |
| parent | f9c412f27e5c839d2ddfddfee4d381e7ea75e057 (diff) | |
| download | stylish-haskell-1354152db499f942f20c6a433a9c26bf3ddb927e.tar.gz | |
Micro cleanup
Diffstat (limited to 'src')
| -rw-r--r-- | src/Language/Haskell/Stylish/Step/Imports.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Language/Haskell/Stylish/Step/Imports.hs b/src/Language/Haskell/Stylish/Step/Imports.hs index 476e6ec..6ad95fc 100644 --- a/src/Language/Haskell/Stylish/Step/Imports.hs +++ b/src/Language/Haskell/Stylish/Step/Imports.hs @@ -146,8 +146,8 @@ prettyImport columns padQualified padName longest imp = -------------------------------------------------------------------------------- prettyImportGroup :: Int -> Align -> Bool -> Int -> [H.ImportDecl LineBlock] - -> Lines -prettyImportGroup columns align padQual' longest imps = + -> Lines +prettyImportGroup columns align fileAlign longest imps = concatMap (prettyImport columns padQual padName longest') $ sortBy compareImports imps where @@ -159,9 +159,9 @@ prettyImportGroup columns align padQual' longest imps = padQual = case align of Global -> True + File -> fileAlign Group -> any H.importQualified imps None -> False - File -> padQual' -------------------------------------------------------------------------------- @@ -172,8 +172,8 @@ step columns = makeStep "Imports" . step' columns -------------------------------------------------------------------------------- step' :: Int -> Align -> Lines -> Module -> Lines step' columns align ls (module', _) = flip applyChanges ls - [ change block (const $ prettyImportGroup columns align padQual - longest importGroup) + [ change block $ const $ + prettyImportGroup columns align fileAlign longest importGroup | (block, importGroup) <- groups ] where @@ -181,6 +181,6 @@ step' columns align ls (module', _) = flip applyChanges ls longest = longestImport imps groups = groupAdjacent imps - padQual = case align of + fileAlign = case align of File -> any H.importQualified imps _ -> False |