diff options
| author | Jasper Van der Jeugt <m@jaspervdj.be> | 2016-07-23 10:44:25 +0200 |
|---|---|---|
| committer | Jasper Van der Jeugt <m@jaspervdj.be> | 2016-07-23 10:44:25 +0200 |
| commit | 7d0f24a3e3a01db3e6ff3858518a0fd715380c83 (patch) | |
| tree | 3dda515c23aa02b0141ee3a7a925c443f39a4662 /lib/Language/Haskell/Stylish/Config.hs | |
| parent | 82943538ba7570dfadd8b3deb501bd67537c57b0 (diff) | |
| download | stylish-haskell-7d0f24a3e3a01db3e6ff3858518a0fd715380c83.tar.gz | |
Move records step into simple_align
Diffstat (limited to 'lib/Language/Haskell/Stylish/Config.hs')
| -rw-r--r-- | lib/Language/Haskell/Stylish/Config.hs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/Language/Haskell/Stylish/Config.hs b/lib/Language/Haskell/Stylish/Config.hs index 14f7a04..d14e1be 100644 --- a/lib/Language/Haskell/Stylish/Config.hs +++ b/lib/Language/Haskell/Stylish/Config.hs @@ -33,7 +33,6 @@ import qualified System.IO as IO (Newline import Language.Haskell.Stylish.Step import qualified Language.Haskell.Stylish.Step.Imports as Imports import qualified Language.Haskell.Stylish.Step.LanguagePragmas as LanguagePragmas -import qualified Language.Haskell.Stylish.Step.Records as Records import qualified Language.Haskell.Stylish.Step.SimpleAlign as SimpleAlign import qualified Language.Haskell.Stylish.Step.Tabs as Tabs import qualified Language.Haskell.Stylish.Step.TrailingWhitespace as TrailingWhitespace @@ -140,7 +139,6 @@ catalog :: Map String (Config -> A.Object -> A.Parser Step) catalog = M.fromList [ ("imports", parseImports) , ("language_pragmas", parseLanguagePragmas) - , ("records", parseRecords) , ("simple_align", parseSimpleAlign) , ("tabs", parseTabs) , ("trailing_whitespace", parseTrailingWhitespace) @@ -173,7 +171,8 @@ parseSimpleAlign c o = SimpleAlign.step <$> pure (configColumns c) <*> (SimpleAlign.Config <$> withDef SimpleAlign.cCases "cases" - <*> withDef SimpleAlign.cTopLevelPatterns "top_level_patterns") + <*> withDef SimpleAlign.cTopLevelPatterns "top_level_patterns" + <*> withDef SimpleAlign.cRecords "records") where withDef f k = fromMaybe (f SimpleAlign.defaultConfig) <$> (o A..:? k) @@ -228,11 +227,6 @@ parseLanguagePragmas config o = LanguagePragmas.step -------------------------------------------------------------------------------- -parseRecords :: Config -> A.Object -> A.Parser Step -parseRecords c _ = return (Records.step $ configColumns c) - - --------------------------------------------------------------------------------- parseTabs :: Config -> A.Object -> A.Parser Step parseTabs _ o = Tabs.step <$> o A..:? "spaces" A..!= 8 |