Merge pull request #2776 from TheAngryByrd/2771-comma-breaks-code

Fixes command breaking with lambda in tuple, #2771

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [5.2.2] - 2023-02-18
+
+### Fixed
+* Fixes comma breaking with lambda in tuple. [#2771](https://github.com/fsprojects/fantomas/issues/2771)
+
 ## [5.2.1] - 2023-02-04
 
 ### Fixed

src/Fantomas.Core.Tests/TupleTests.fs

@@ -397,3 +397,26 @@ let f x =
 
     ()
 """
+
+[<Test>]
+let ``comma should not break with lambda as tuple, 2771`` () =
+    formatSourceString
+        false
+        """
+let shiftTimes localDate (start: Utc, duration) =
+    ZonedDate.create TimeZone.current localDate
+    |> Time.ZonedDate.startOf
+    |> fun dayStart -> start + dayStart.Duration - refDay.StartTime.Duration
+    , duration
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+let shiftTimes localDate (start: Utc, duration) =
+    ZonedDate.create TimeZone.current localDate
+    |> Time.ZonedDate.startOf
+    |> fun dayStart -> start + dayStart.Duration - refDay.StartTime.Duration
+    , duration
+"""

src/Fantomas.Core/CodePrinter.fs

@@ -1754,6 +1754,10 @@ let genTupleMultiline (node: ExprTupleNode) =
                     match node.RightHandSide with
                     | Expr.Lambda _ -> true
                     | _ -> false
+                | Expr.SameInfixApps node ->
+                    match List.last node.SubsequentExpressions with
+                    | _, Expr.Lambda _ -> true
+                    | _ -> false
                 | _ -> false
             | _ -> false)