Fix parenthesis placement with Stroustrup alignment when using MultiL…

…ineLambdaClosingNewline=true (#2714) * Fix paren placement with Stroustrup alignment * Ensure expression is stroustrup when dropping the newline. Co-authored-by: Florian Verdonck <[email protected]>
fsprojects · Jan 14, 2023 · 5336c50 · 5336c50
1 parent b5129e4
commit 5336c50
Show file tree

Hide file tree

Showing 3 changed files with 179 additions and 55 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,13 @@
 # Changelog
 
-## [Unreleased]
+## [5.2.0-alpha-012] - 2023-01-14
 
 ### Fixed
 * Trivia before open statement is not preserved. [#2704](https://github.com/fsprojects/fantomas/issues/2704)
 * Type app identifier is considered as an expression. [#2705](https://github.com/fsprojects/fantomas/issues/2705)
 * Subsequent identifier links in chain should be on the same line. [#2712](https://github.com/fsprojects/fantomas/issues/2712)
+* Delegate with many parameters result in a compilation error. [#1514](https://github.com/fsprojects/fantomas/issues/1514)
+* MultiLineLambdaClosingNewline + ExperimentalStroustrupStyle is not displaying very well for some use cases. [#2378](https://github.com/fsprojects/fantomas/issues/2378)
 
 ## [5.2.0-alpha-011] - 2023-01-12
 

diff --git a/src/Fantomas.Core.Tests/Stroustrup/MultiLineLambdaClosingNewlineExpressionTests.fs b/src/Fantomas.Core.Tests/Stroustrup/MultiLineLambdaClosingNewlineExpressionTests.fs
@@ -11,9 +11,6 @@ let config =
         MultilineBracketStyle = ExperimentalStroustrup
         MaxArrayOrListWidth = 40 }
 
-// TODO: figure out what should happen when you mix MultiLineLambdaClosingNewline and Stroustrup
-// From a technical point of view, this is correct behavior but having `})` at the end seems sensible as well.
-
 [<Test>]
 let ``paren lambda with record instance`` () =
     formatSourceString
@@ -33,8 +30,7 @@ let ``paren lambda with record instance`` () =
     A = longTypeName
     B = someOtherVariable
     C = ziggyBarX
-}
-)
+})
 """
 
 [<Test>]
@@ -76,8 +72,7 @@ let ``paren lambda with anonymous record instance`` () =
     A = longTypeName
     B = someOtherVariable
     C = ziggyBarX
-|}
-)
+|})
 """
 
 [<Test>]
@@ -100,8 +95,7 @@ let ``paren lambda with anonymous record instance struct`` () =
     A = longTypeName
     B = someOtherVariable
     C = ziggyBarX
-|}
-)
+|})
 """
 
 [<Test>]
@@ -123,8 +117,7 @@ let ``paren lambda with computation expression`` () =
 (fun x -> task {
     // some computation here
     ()
-}
-)
+})
 """
 
 [<Test>]
@@ -150,8 +143,7 @@ let ``paren lambda with list`` () =
     itemThree
     itemFour
     itemFive
-]
-)
+])
 """
 
 [<Test>]
@@ -177,8 +169,7 @@ let ``paren lambda with array`` () =
     itemThree
     itemFour
     itemFive
-|]
-)
+|])
 """
 
 [<Test>]
@@ -200,8 +191,7 @@ List.map (fun x -> {
     A = longTypeName
     B = someOtherVariable
     C = ziggyBarX
-}
-)
+})
 """
 
 [<Test>]
@@ -243,8 +233,7 @@ List.map (fun x -> {|
     A = longTypeName
     B = someOtherVariable
     C = ziggyBarX
-|}
-)
+|})
 """
 
 [<Test>]
@@ -267,8 +256,7 @@ List.map (fun x -> struct {|
     A = longTypeName
     B = someOtherVariable
     C = ziggyBarX
-|}
-)
+|})
 """
 
 [<Test>]
@@ -290,8 +278,7 @@ List.map (fun x ->
 List.map (fun x -> task {
     // some computation here
     ()
-}
-)
+})
 """
 
 [<Test>]
@@ -317,8 +304,7 @@ List.map (fun x -> [
     itemThree
     itemFour
     itemFive
-]
-)
+])
 """
 
 [<Test>]
@@ -344,8 +330,7 @@ List.map (fun x -> [|
     itemThree
     itemFour
     itemFive
-|]
-)
+|])
 """
 
 [<Test>]
@@ -368,8 +353,7 @@ List.map
         A = longTypeName
         B = someOtherVariable
         C = ziggyBarX
-    }
-    )
+    })
     b
     c
 """
@@ -417,8 +401,7 @@ List.map
         A = longTypeName
         B = someOtherVariable
         C = ziggyBarX
-    |}
-    )
+    |})
     b
     c
 """
@@ -444,8 +427,7 @@ List.map
         A = longTypeName
         B = someOtherVariable
         C = ziggyBarX
-    |}
-    )
+    |})
     b
     c
 """
@@ -470,8 +452,7 @@ List.map
     (fun x -> task {
         // some computation here
         ()
-    }
-    )
+    })
     b
     c
 """
@@ -500,8 +481,7 @@ List.map
         itemThree
         itemFour
         itemFive
-    ]
-    )
+    ])
     b
     c
 """
@@ -530,8 +510,7 @@ List.map
         itemThree
         itemFour
         itemFive
-    |]
-    )
+    |])
     b
     c
 """
@@ -557,8 +536,7 @@ Bar
         B = someOtherVariable
         C = ziggyBarX
         D = evenMoreZigBarry
-    }
-    )
+    })
     .Bar()
 """
 
@@ -610,8 +588,7 @@ Bar
         A = longTypeName
         B = someOtherVariable
         C = ziggyBarX
-    |}
-    )
+    |})
     .Bar()
 """
 
@@ -637,8 +614,7 @@ Bar
         A = longTypeName
         B = someOtherVariable
         C = ziggyBarX
-    |}
-    )
+    |})
     .Bar()
 """
 
@@ -663,8 +639,7 @@ Bar
     .Foo(fun x -> task {
         // some computation here
         ()
-    }
-    )
+    })
     .Bar()
 """
 
@@ -693,8 +668,7 @@ Bar
         itemThree
         itemFour
         itemFive
-    ]
-    )
+    ])
     .Bar()
 """
 
@@ -723,7 +697,133 @@ Bar
         itemThree
         itemFour
         itemFive
-    |]
+    |])
+    .Bar()
+"""
+
+[<Test>]
+let ``non stroustrup expression lambda body expression stills adds newline`` () =
+    formatSourceString
+        false
+        """
+List.map (fun e ->
+    try
+        f e
+    with
+    | ex -> "meh")
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+List.map (fun e ->
+    try
+        f e
+    with ex ->
+        "meh"
+)
+"""
+
+[<Test>]
+let ``non stroustrup expression lambda body expression stills adds newline, multiple arguments in function application``
+    ()
+    =
+    formatSourceString
+        false
+        """
+fn a b c (fun e ->
+    try
+        f e
+    with
+    | ex -> "meh")
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+fn
+    a
+    b
+    c
+    (fun e ->
+        try
+            f e
+        with ex ->
+            "meh"
     )
+"""
+
+[<Test>]
+let ``application with match lambda should not be affected by stroustrup`` () =
+    formatSourceString
+        false
+        """
+List.map (function
+    | X x -> ()
+    | Y y -> ())
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+List.map (
+    function
+    | X x -> ()
+    | Y y -> ()
+)
+"""
+
+[<Test>]
+let ``non stroustrup argument in application in chain`` () =
+    formatSourceString
+        false
+        """
+Foo.Bar().Meh(fun m -> 
+        try
+            f e
+        with ex ->
+            "meh"
+    )
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+Foo
     .Bar()
+    .Meh(fun m ->
+        try
+            f e
+        with ex ->
+            "meh"
+    )
+"""
+
+[<Test>]
+let ``non stroustrup body in paren lambda`` () =
+    formatSourceString
+        false
+        """
+(fun m ->
+        try
+            f e
+        with ex ->
+            "meh"
+    )
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+(fun m ->
+    try
+        f e
+    with ex ->
+        "meh"
+)
 """