Always yield list items on separate lines if a conditional is present (…

…fsprojects#3002) * Always yield list items on separate lines if a conditional is present * Format code * Fix failing test * Add changelog entry * Update changelog to point to issue instead of PR Co-authored-by: Florian Verdonck <florian.verdonck@outlook.com> --------- Co-authored-by: Florian Verdonck <florian.verdonck@outlook.com>
nojaf · Nov 29, 2023 · 10ea3a3 · 10ea3a3
1 parent 12f373e
commit 10ea3a3
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Unreleased
+
+### Fixed
+* Always yield list items on separate lines if a conditional is present. [#2972](https://github.com/fsprojects/fantomas/issues/2972)
+
 ## 6.3.0-alpha-003 - 2023-11-15
 
 ### Fixed

diff --git a/src/Fantomas.Core.Tests/IfThenElseTests.fs b/src/Fantomas.Core.Tests/IfThenElseTests.fs
@@ -1,5 +1,6 @@
 module Fantomas.Core.Tests.IfThenElseTests
 
+open Fantomas.Core
 open NUnit.Framework
 open FsUnit
 open Fantomas.Core.Tests.TestHelpers
@@ -2599,3 +2600,24 @@ else
     let res = typesEqual (resT :: argTs) (haveResT :: haveArgTs)
     res
 """
+
+[<Test>]
+let ``always force list items to be on separate lines in if/then/else, 2972`` () =
+    formatSourceString
+        """
+[
+    if 1 = 1 then 1 else 2
+    3
+]
+"""
+        { config with
+            MultilineBracketStyle = Aligned }
+    |> prepend newline
+    |> should
+        equal
+        """
+[
+    if 1 = 1 then 1 else 2
+    3
+]
+"""
diff --git a/src/Fantomas.Core/CodePrinter.fs b/src/Fantomas.Core/CodePrinter.fs
@@ -1803,29 +1803,13 @@ let genArrayOrList (preferMultilineCramped: bool) (node: ExprArrayOrListNode) =
 
         fun ctx ->
             let alwaysMultiline =
-                let isIfThenElseWithYieldReturn e =
-                    let (|YieldLikeExpr|_|) e =
-                        match e with
-                        | Expr.Single singleNode ->
-                            if String.startsWithOrdinal "yield" singleNode.Leading.Text then
-                                Some e
-                            else
-                                None
-                        | _ -> None
-
-                    match e with
-                    | Expr.IfThen ifThenNode ->
-                        match ifThenNode.ThenExpr with
-                        | YieldLikeExpr _ -> true
-                        | _ -> false
-                    | Expr.IfThenElse ifThenElseNode ->
-                        match ifThenElseNode.IfExpr, ifThenElseNode.ElseExpr with
-                        | YieldLikeExpr _, _
-                        | _, YieldLikeExpr _ -> true
-                        | _ -> false
+                let isIfThenElse =
+                    function
+                    | Expr.IfThen _
+                    | Expr.IfThenElse _ -> true
                     | _ -> false
 
-                List.exists isIfThenElseWithYieldReturn node.Elements
+                List.exists isIfThenElse node.Elements
                 || List.forall isLambdaOrIfThenElse node.Elements
 
             if alwaysMultiline then