Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add newline between multiline infix expression in if expression. #1586

Merged
merged 1 commit into from
Apr 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions src/Fantomas.Tests/IfThenElseTests.fs
Original file line number Diff line number Diff line change
Expand Up @@ -2085,3 +2085,40 @@ then
else
()
"""

[<Test>]
let ``multiline infix expression in if expression, 1584`` () =
formatSourceString
false
"""
if sourceCode.EndsWith("\n")
&& not
<| formattedSourceCode.EndsWith(Environment.NewLine) then
return formattedSourceCode + Environment.NewLine
elif
not <| sourceCode.EndsWith("\n")
&& formattedSourceCode.EndsWith(Environment.NewLine)
then
return formattedSourceCode.TrimEnd('\r', '\n')
else
return formattedSourceCode
"""
config
|> prepend newline
|> should
equal
"""
if
sourceCode.EndsWith("\n")
&& not
<| formattedSourceCode.EndsWith(Environment.NewLine)
then
return formattedSourceCode + Environment.NewLine
elif
not <| sourceCode.EndsWith("\n")
&& formattedSourceCode.EndsWith(Environment.NewLine)
then
return formattedSourceCode.TrimEnd('\r', '\n')
else
return formattedSourceCode
"""
2 changes: 1 addition & 1 deletion src/Fantomas/CodePrinter.fs
Original file line number Diff line number Diff line change
Expand Up @@ -2269,7 +2269,7 @@ and genExpr astContext synExpr ctx =
indent
+> sepNln
+> genAlternativeAppWithParenthesis app astContext
+> sepSpace
+> ifElse (noBreakInfixOps.Contains(s)) sepSpace sepNln
+> genInfixOperator s e
+> sepSpace
+> genExpr astContext e2
Expand Down