Wrap boolean condition in parenthesis if try/catch/finally. Fixes fsp…

…rojects#863.
nojaf · Aug 21, 2020 · f19c3b9 · f19c3b9
1 parent 8665356
commit f19c3b9
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 4 deletions.
diff --git a/src/Fantomas.Tests/ControlStructureTests.fs b/src/Fantomas.Tests/ControlStructureTests.fs
@@ -216,9 +216,32 @@ let x =
     |> prepend newline
     |> should equal """
 let x =
-    if try
-        true
-       with Failure _ -> false then
+    if (try
+            true
+        with Failure _ -> false) then
+        ()
+    else
+        ()
+"""
+
+[<Test>]
+let ``try finally in if expression`` () =
+    formatSourceString false """
+let y =
+    if  try true
+        finally false
+    then
+        ()
+    else
+        ()
+"""  config
+    |> prepend newline
+    |> should equal """
+let y =
+    if (try
+            true
+        finally
+            false) then
         ()
     else
         ()

diff --git a/src/Fantomas/CodePrinter.fs b/src/Fantomas/CodePrinter.fs
@@ -1865,7 +1865,10 @@ and genExpr astContext synExpr =
                     //           x
                     // bool expr x should be indented
                     +> ifElse hasCommentAfterIfKeyword (indent +> sepNln) sepNone
-                    +> genExpr astContext e1
+                    +> (match e1 with
+                        | SynExpr.TryWith _
+                        | SynExpr.TryFinally _ -> sepOpenT +> genExpr astContext e1 +> sepCloseT
+                        | _ -> genExpr astContext e1)
                     +> ifElse hasCommentAfterBoolExpr sepNln sepSpace
                     +> genThen synExpr.Range
                     // f.ex if x then // meh