From 6268b8075a62bb8885b804d0a6416f95f2c4dd19 Mon Sep 17 00:00:00 2001 From: Lennart Spitzner Date: Tue, 4 Jul 2017 23:54:02 +0200 Subject: [PATCH] Fix layouting bug for RecordUpd --- src-literatetests/tests.blt | 13 +++++++++++++ .../Haskell/Brittany/Internal/Layouters/Expr.hs | 5 ++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src-literatetests/tests.blt b/src-literatetests/tests.blt index c57dc7f..24cfba1 100644 --- a/src-literatetests/tests.blt +++ b/src-literatetests/tests.blt @@ -920,6 +920,19 @@ parserPrim = samples = (SV.unpackaaaaadat) <&> \f -> aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +#test recordupd-singleline-bug + +runBrittany tabSize text = do + let + config' = staticDefaultConfig + config = config' + { _conf_layout = (_conf_layout config') { _lconfig_indentAmount = coerce + tabSize + } + , _conf_forward = forwardOptionsSyntaxExtsEnabled + } + parsePrintModule config text + ############################################################################### ############################################################################### diff --git a/src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs b/src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs index fa688ef..dc84302 100644 --- a/src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs +++ b/src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs @@ -706,9 +706,8 @@ layoutExpr lexpr@(L _ expr) = docWrapNode lexpr $ case expr of Ambiguous n _ -> (lfield, lrdrNameToText n, rFExpDoc) docAlt -- singleline - [ docSetParSpacing - $ docSeq - [ docNodeAnnKW lexpr Nothing $ appSep rExprDoc + [ docSeq + [ docNodeAnnKW lexpr Nothing $ appSep $ docForceSingleline rExprDoc , appSep $ docLit $ Text.pack "{" , appSep $ docSeq $ List.intersperse docCommaSep $ rFs <&> \case