Clean up IndentPolicyMultiple

src-literatetests/40-indent-policy-multiple.blt

@@ -8,14 +8,12 @@
 
 #test long
 -- brittany { lconfig_indentAmount: 4, lconfig_indentPolicy: IndentPolicyMultiple }
--- brittany { lconfig_columnAlignMode: { tag: ColumnAlignModeDisabled }}
 func =
     mweroiuxlskdfjlksjdflkjsdfljksldkjflkjsdflkj
         + mweroiuxlskdfjlksjdflkjsdfljksldkjflkjsdflkj
 
 #test let
 -- brittany { lconfig_indentAmount: 4, lconfig_indentPolicy: IndentPolicyMultiple }
--- brittany { lconfig_columnAlignMode: { tag: ColumnAlignModeDisabled }}
 foo = do
     let
         aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa =
@@ -24,7 +22,6 @@ foo = do
 
 #test nested do-block
 -- brittany { lconfig_indentAmount: 4, lconfig_indentPolicy: IndentPolicyMultiple }
--- brittany { lconfig_columnAlignMode: { tag: ColumnAlignModeDisabled }}
 foo = asdyf8asdf
     "ajsdfas"
     [ asjdf asyhf $ do

src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs

@@ -540,12 +540,12 @@ layoutExpr lexpr@(L _ expr) = do
       mBindDocs <- mapM (fmap (fmap return) . docWrapNodeRest lexpr . return)
                =<< layoutLocalBinds binds
       let
-        ifIndentLeftElse :: a -> a -> a
-        ifIndentLeftElse x y =
+        ifIndentFreeElse :: a -> a -> a
+        ifIndentFreeElse x y =
           case indentPolicy of
-            IndentPolicyLeft -> x
-            IndentPolicyMultiple -> x
-            IndentPolicyFree -> y
+            IndentPolicyLeft -> y
+            IndentPolicyMultiple -> y
+            IndentPolicyFree -> x
       -- this `docSetBaseAndIndent` might seem out of place (especially the
       -- Indent part; setBase is necessary due to the use of docLines below),
       -- but is here due to ghc-exactprint's DP handling of "let" in
@@ -566,7 +566,7 @@ layoutExpr lexpr@(L _ expr) = do
               [ docAlt
                   [ docSeq
                       [ appSep $ docLit $ Text.pack "let"
-                      , ifIndentLeftElse docForceSingleline docSetBaseAndIndent
+                      , ifIndentFreeElse docSetBaseAndIndent docForceSingleline
                       $ bindDoc
                       ]
                   , docAddBaseY BrIndentRegular
@@ -576,8 +576,8 @@ layoutExpr lexpr@(L _ expr) = do
                   ]
               , docAlt
                   [ docSeq
-                      [ appSep $ docLit $ Text.pack $ ifIndentLeftElse "in" "in "
-                      , ifIndentLeftElse docForceSingleline docSetBaseAndIndent expDoc1
+                      [ appSep $ docLit $ Text.pack $ ifIndentFreeElse "in " "in"
+                      , ifIndentFreeElse docSetBaseAndIndent docForceSingleline expDoc1
                       ]
                   , docAddBaseY BrIndentRegular
                   $ docPar
@@ -610,12 +610,10 @@ layoutExpr lexpr@(L _ expr) = do
                   , docAddBaseY BrIndentRegular expDoc1
                   ]
                 ]
-          addAlternativeCond (indentPolicy == IndentPolicyLeft)
-            $ docLines noHangingBinds
-          addAlternativeCond (indentPolicy == IndentPolicyMultiple)
-            $ docLines noHangingBinds
-          addAlternativeCond (indentPolicy == IndentPolicyFree)
-            $ docLines
+          addAlternative $ case indentPolicy of
+            IndentPolicyLeft     -> docLines noHangingBinds
+            IndentPolicyMultiple -> docLines noHangingBinds
+            IndentPolicyFree     -> docLines
               [ docSeq
                 [ appSep $ docLit $ Text.pack "let"
                 , docSetBaseAndIndent $ docLines bindDocs