Change record update syntax for left indent policy
parent
a6bea7542b
commit
44e95940c0
|
@ -646,7 +646,8 @@ func = do
|
|||
#test record update indentation 2
|
||||
func = do
|
||||
s <- mGet
|
||||
mSet $ s { _lstate_indent = _lstate_indent state
|
||||
mSet $ s
|
||||
{ _lstate_indent = _lstate_indent state
|
||||
, _lstate_indent = _lstate_indent state
|
||||
}
|
||||
|
||||
|
@ -972,8 +973,8 @@ runBrittany tabSize text = do
|
|||
let
|
||||
config' = staticDefaultConfig
|
||||
config = config'
|
||||
{ _conf_layout = (_conf_layout config') { _lconfig_indentAmount = coerce
|
||||
tabSize
|
||||
{ _conf_layout = (_conf_layout config')
|
||||
{ _lconfig_indentAmount = coerce tabSize
|
||||
}
|
||||
, _conf_forward = forwardOptionsSyntaxExtsEnabled
|
||||
}
|
||||
|
|
|
@ -853,9 +853,10 @@ layoutExpr lexpr@(L _ expr) = do
|
|||
return $ case ambName of
|
||||
Unambiguous n _ -> (lfield, lrdrNameToText n, rFExpDoc)
|
||||
Ambiguous n _ -> (lfield, lrdrNameToText n, rFExpDoc)
|
||||
docAlt
|
||||
docAltFilter
|
||||
-- singleline
|
||||
[ docSeq
|
||||
[ ( True
|
||||
, docSeq
|
||||
[ docNodeAnnKW lexpr Nothing $ appSep $ docForceSingleline rExprDoc
|
||||
, appSep $ docLit $ Text.pack "{"
|
||||
, appSep $ docSeq $ List.intersperse docCommaSep
|
||||
|
@ -870,7 +871,9 @@ layoutExpr lexpr@(L _ expr) = do
|
|||
docWrapNode lfield $ docLit fieldStr
|
||||
, docLit $ Text.pack "}"
|
||||
]
|
||||
)
|
||||
-- wild-indentation block
|
||||
, ( indentPolicy /= IndentPolicyLeft
|
||||
, docSeq
|
||||
[ docNodeAnnKW lexpr Nothing $ appSep rExprDoc
|
||||
, docSetBaseY $ docLines $ let
|
||||
|
@ -899,7 +902,9 @@ layoutExpr lexpr@(L _ expr) = do
|
|||
]
|
||||
in [line1] ++ lineR ++ [lineN]
|
||||
]
|
||||
)
|
||||
-- strict indentation block
|
||||
, ( True
|
||||
, docSetParSpacing
|
||||
$ docAddBaseY BrIndentRegular
|
||||
$ docPar
|
||||
|
@ -928,6 +933,7 @@ layoutExpr lexpr@(L _ expr) = do
|
|||
, docLit $ Text.pack "}"
|
||||
]
|
||||
in [line1] ++ lineR ++ [lineN])
|
||||
)
|
||||
]
|
||||
#if MIN_VERSION_ghc(8,2,0) /* ghc-8.2 */
|
||||
ExprWithTySig exp1 (HsWC _ (HsIB _ typ1 _)) -> do
|
||||
|
@ -959,7 +965,7 @@ layoutExpr lexpr@(L _ expr) = do
|
|||
docSeq
|
||||
[ docLit $ Text.pack "["
|
||||
, docForceSingleline e1Doc
|
||||
, docCommaSep
|
||||
, appSep $ docLit $ Text.pack ","
|
||||
, appSep $ docForceSingleline e2Doc
|
||||
, docLit $ Text.pack "..]"
|
||||
]
|
||||
|
@ -980,7 +986,7 @@ layoutExpr lexpr@(L _ expr) = do
|
|||
docSeq
|
||||
[ docLit $ Text.pack "["
|
||||
, docForceSingleline e1Doc
|
||||
, docCommaSep
|
||||
, appSep $ docLit $ Text.pack ","
|
||||
, appSep $ docForceSingleline e2Doc
|
||||
, appSep $ docLit $ Text.pack ".."
|
||||
, docForceSingleline eNDoc
|
||||
|
|
Loading…
Reference in New Issue