Add brace before indentation. Fixes fsprojects#835

nojaf · May 15, 2020 · 96c166b · 96c166b
1 parent 622e2b0
commit 96c166b
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 5 deletions.
diff --git a/src/Fantomas.Tests/ComputationExpressionTests.fs b/src/Fantomas.Tests/ComputationExpressionTests.fs
@@ -277,3 +277,51 @@ let tests =
 let tests =
     testList "tests" [ test "test" { Expect.equal true true "unexpected" } ]
 """
+
+[<Test>]
+let ``multiline computation expression with SynExpr.App identifier, 835`` () =
+    formatSourceString false """let meh =
+    create [] {
+        // foo
+        // bar
+        return 42
+    }"""  config
+    |> prepend newline
+    |> should equal """
+let meh =
+    create [] {
+        // foo
+        // bar
+        return 42
+    }
+"""
+
+[<Test>]
+let ``multiline computation expression with SynExpr.App identifier and multiple expressions`` () =
+    formatSourceString false """
+let private validateLocation =
+    createValidatorFor<LocationAdded> () {
+        validate (fun l -> l.Id) [ isNotEmptyGuid ]
+        validate (fun l -> l.Name)
+            [ isNotEmpty
+              hasMinLengthOf 3 ]
+        validate (fun l -> fst l.Location) [ isValidLatitude ]
+        validate (fun l -> snd l.Location) [ isValidLongitude ]
+        validate (fun l -> l.Price) [ isGreaterThan 0. ]
+        validate (fun l -> l.Date) [ isNotMinDate ]
+        validate (fun l -> l.Creator) [ isNotEmpty ]
+    }
+"""  config
+    |> prepend newline
+    |> should equal """
+let private validateLocation =
+    createValidatorFor<LocationAdded> () {
+        validate (fun l -> l.Id) [ isNotEmptyGuid ]
+        validate (fun l -> l.Name) [ isNotEmpty; hasMinLengthOf 3 ]
+        validate (fun l -> fst l.Location) [ isValidLatitude ]
+        validate (fun l -> snd l.Location) [ isValidLongitude ]
+        validate (fun l -> l.Price) [ isGreaterThan 0. ]
+        validate (fun l -> l.Date) [ isNotMinDate ]
+        validate (fun l -> l.Creator) [ isNotEmpty ]
+    }
+"""
diff --git a/src/Fantomas/CodePrinter.fs b/src/Fantomas/CodePrinter.fs
@@ -1189,11 +1189,9 @@ and genExpr astContext synExpr =
         atCurrentColumn
             (genExpr astContext e
              +> colPre sepSpace sepSpace es (fun e ->
-                    indent
-                    +> appNlnFun e
-                           (indentIfNeeded
-                            +> onlyIf (isCompExpr e) (sepSpace +> sepOpenSFixed +> sepSpace)
-                            +> genExpr astContext e)
+                    onlyIf (isCompExpr e) (sepSpace +> sepOpenSFixed +> sepSpace)
+                    +> indent
+                    +> appNlnFun e (indentIfNeeded +> genExpr astContext e)
                     +> unindent))
 
     | TypeApp(e, ts) -> genExpr astContext e -- "<" +> col sepComma ts (genType astContext false) -- ">"