Indent multiline yield expression. Fixes #882. (#1001)

fsprojects · Aug 17, 2020 · ab5e8da · ab5e8da
1 parent ee6dd12
commit ab5e8da
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 1 deletion.
diff --git a/src/Fantomas.Tests/ListTests.fs b/src/Fantomas.Tests/ListTests.fs
@@ -1601,3 +1601,41 @@ let value =
         if bar then yield "d" else yield! [ "e"; "f" ]
     ]
 """
+
+[<Test>]
+let ``multiline yield expression should be indented, 882`` () =
+    formatSourceString false """
+let choices : Foo list =
+    [
+        yield! getMore 9
+        yield
+            // Test
+            Foo 2
+    ]
+"""  config
+    |> prepend newline
+    |> should equal """
+let choices: Foo list =
+    [ yield! getMore 9
+      yield
+          // Test
+          Foo 2 ]
+"""
+
+[<Test>]
+let ``multiline yield bang inside list`` () =
+    formatSourceString false """
+let choices : Foo list =
+    [
+        yield!
+            // Test
+            [ Foo 2 ]
+    ]
+"""  config
+    |> prepend newline
+    |> should equal """
+let choices: Foo list =
+    [ yield!
+        // Test
+        [ Foo 2 ] ]
+"""
diff --git a/src/Fantomas/CodePrinter.fs b/src/Fantomas/CodePrinter.fs
@@ -1070,7 +1070,13 @@ and genExpr astContext synExpr =
         str "lazy "
         +> ifElse isInfixExpr genInfixExpr genNonInfixExpr
 
-    | SingleExpr(kind, e) -> str kind +> genExpr astContext e
+    | SingleExpr(kind, e) ->
+        str kind
+        +> (match kind with
+            | YieldFrom
+            | Yield -> autoIndentAndNlnIfExpressionExceedsPageWidth (genExpr astContext e)
+            | _ -> genExpr astContext e)
+
     | ConstExpr(c,r) -> genConst c r
     | NullExpr -> !- "null"
     // Not sure about the role of e1