From 6aa537089d6e93c8080ef0c009801cfa2b303e8c Mon Sep 17 00:00:00 2001 From: Matt Noonan Date: Mon, 4 Feb 2019 15:10:55 -0500 Subject: [PATCH 1/2] Disable single-line HsApp with argument comments. --- src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs b/src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs index caf51a7..dd0639d 100644 --- a/src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs +++ b/src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs @@ -172,9 +172,10 @@ layoutExpr lexpr@(L _ expr) = do _ -> docSeq headDoc <- docSharedWrapper layoutExpr headE paramDocs <- docSharedWrapper layoutExpr `mapM` paramEs + hasComments <- hasAnyCommentsConnected exp2 runFilteredAlternative $ do -- foo x y - addAlternative + addAlternativeCond (not hasComments) $ colsOrSequence $ appSep (docForceSingleline headDoc) : spacifyDocs (docForceSingleline <$> paramDocs) -- 2.30.2 From 09a227fcce36afd3029697e43471b1b9f0390da4 Mon Sep 17 00:00:00 2001 From: Lennart Spitzner Date: Wed, 5 Jun 2019 20:11:01 +0200 Subject: [PATCH 2/2] Add quick regression-test for fixed issue --- src-literatetests/15-regressions.blt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src-literatetests/15-regressions.blt b/src-literatetests/15-regressions.blt index 080c15e..d402ca7 100644 --- a/src-literatetests/15-regressions.blt +++ b/src-literatetests/15-regressions.blt @@ -650,3 +650,13 @@ jaicyhHumzo btrKpeyiFej mava = do ) Xcde{} -> (s, Pioemav) pure imomue + +#test issue 214 +-- brittany { lconfig_indentPolicy: IndentPolicyMultiple } +foo = bar + arg1 -- this is the first argument + arg2 -- this is the second argument + arg3 -- this is the third argument, now I'll skip one comment + arg4 + arg5 -- this is the fifth argument + arg6 -- this is the sixth argument -- 2.30.2