Add brace before indentation. Fixes #835 (#836)

fsprojects · May 16, 2020 · 5155008 · 5155008
1 parent 53da9cf
commit 5155008
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 7 deletions.
diff --git a/src/Fantomas.Tests/ComputationExpressionTests.fs b/src/Fantomas.Tests/ComputationExpressionTests.fs
@@ -280,6 +280,54 @@ 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 ]
+    }
+"""
+
 [<Test>]
 let ``new line after multiline let bang, 819`` () =
     formatSourceString false """

diff --git a/src/Fantomas.Tests/FormatConfigJsonConfigurationFileTests.fs b/src/Fantomas.Tests/FormatConfigJsonConfigurationFileTests.fs
@@ -1,14 +1,13 @@
 module Fantomas.Tests.FormatConfigJsonConfigurationFileTests
 
-open System
 open Fantomas
 open Fantomas.FormatConfig
 open NUnit.Framework
 open System.IO
 open Fantomas.Tests.TestHelper
 
 [<Literal>]
-let private ConfigFileName ="fantomas-config.json"
+let private ConfigFileName = "fantomas-config.json"
 
 let private mkConfig subFolder config =
     let json = Config.configToJson config

diff --git a/src/Fantomas/CodePrinter.fs b/src/Fantomas/CodePrinter.fs
@@ -1204,11 +1204,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) -- ">"