Add parenthesis around multi line if/then/else that is piped. Fixes f…

…sprojects#1324. (fsprojects#1325)
nojaf · Dec 23, 2020 · cce39ed · cce39ed
1 parent 1719253
commit cce39ed
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 2 deletions.
diff --git a/src/Fantomas.Tests/IfThenElseTests.fs b/src/Fantomas.Tests/IfThenElseTests.fs
@@ -1620,3 +1620,41 @@ elif cccccccccccccccccccccccc then
 else
     f
 """
+
+[<Test>]
+let ``multiline if/then/else piped to function, 1324`` () =
+    formatSourceString
+        false
+        """
+        let tryDecompile (ty: FSharpEntity) = async {
+            match ty.TryFullName with
+            | Some fullName ->
+                return decompile ty.Assembly.SimpleName externalSym
+            | None ->
+                // might be abbreviated type (like string)
+                return!
+                  if ty.IsFSharpAbbreviation then Some ty.AbbreviatedType else None
+                  |> tryGetTypeDef
+                  |> tryGetSource
+          }
+"""
+        { config with IndentSize = 2 }
+    |> prepend newline
+    |> should
+        equal
+        """
+let tryDecompile (ty: FSharpEntity) =
+  async {
+    match ty.TryFullName with
+    | Some fullName -> return decompile ty.Assembly.SimpleName externalSym
+    | None ->
+        // might be abbreviated type (like string)
+        return!
+          (if ty.IsFSharpAbbreviation then
+             Some ty.AbbreviatedType
+           else
+             None)
+          |> tryGetTypeDef
+          |> tryGetSource
+  }
+"""
diff --git a/src/Fantomas/CodePrinter.fs b/src/Fantomas/CodePrinter.fs
@@ -1876,7 +1876,10 @@ and genExpr astContext synExpr ctx =
                         +> genExpr astContext e)
 
             let multilineExpr =
-                genExpr astContext e
+                (match e with
+                 | SynExpr.IfThenElse _ ->
+                     expressionFitsOnRestOfLine (genExpr astContext e) (sepOpenT +> genExpr astContext e +> sepCloseT)
+                 | _ -> genExpr astContext e)
                 +> sepNln
                 +> col
                     sepNln
@@ -2527,7 +2530,7 @@ and genExpr astContext synExpr ctx =
 
                         isShortExpression ctx.Config.MaxIfThenElseShortWidth shortExpression longExpression
 
-                atCurrentColumn expr ctx
+                atCurrentColumnIndent expr ctx
 
         // At this stage, all symbolic operators have been handled.
         | OptVar (s, isOpt, ranges) ->