Make 'indent' global

Author: lukasz-golebiewski

data/stylish-haskell.yaml

@@ -16,8 +16,7 @@ steps:
   #     add_language_pragma: true
 
   # Format record definitions
-  - records:
-      indent: 4
+  - records: {}
 
   # Align the right hand side of some elements.  This is quite conservative
   # and only applies to statements where each element occupies a single
@@ -226,6 +225,9 @@ steps:
   # simple_align but is a bit less conservative.
   # - squash: {}
 
+# A common indentation setting. Different steps take this into account.
+indent: 4
+
 # A common setting is the number of columns (parts of) code will be wrapped
 # to. Different steps take this into account.
 #

lib/Language/Haskell/Stylish/Config.hs

@@ -52,12 +52,13 @@ type Extensions = [String]
 
 --------------------------------------------------------------------------------
 data Config = Config
-    { configSteps              :: [Step]
-    , configColumns            :: Maybe Int
-    , configLanguageExtensions :: [String]
-    , configNewline            :: IO.Newline
-    , configCabal              :: Bool
-    }
+  { configSteps              :: [Step]
+  , configIndent             :: Int
+  , configColumns            :: Maybe Int
+  , configLanguageExtensions :: [String]
+  , configNewline            :: IO.Newline
+  , configCabal              :: Bool
+  }
 
 
 --------------------------------------------------------------------------------
@@ -120,6 +121,7 @@ parseConfig (A.Object o) = do
     -- First load the config without the actual steps
     config <- Config
         <$> pure []
+        <*> (o A..:? "indent"              A..!= 4)
         <*> (o A..:! "columns"             A..!= Just 80)
         <*> (o A..:? "language_extensions" A..!= [])
         <*> (o A..:? "newline"             >>= parseEnum newlines IO.nativeNewline)
@@ -184,8 +186,8 @@ parseSimpleAlign c o = SimpleAlign.step
 
 --------------------------------------------------------------------------------
 parseRecords :: Config -> A.Object -> A.Parser Step
-parseRecords _ o = Data.step
-    <$> (o A..:? "indent" A..!= 4)
+parseRecords c _ = Data.step
+    <$> pure (configIndent c)
 
 
 --------------------------------------------------------------------------------

tests/Language/Haskell/Stylish/Config/Tests.hs

@@ -166,6 +166,7 @@ dotStylish = unlines $
   , "      remove_redundant: true"
   , "  - trailing_whitespace: {}"
   , "  - records: {}"
+  , "indent: 2"
   , "columns: 110"
   , "language_extensions:"
   , "  - TemplateHaskell"