Put match inside match on the next line. Fixes #1400. (#1459)

fsprojects · Feb 19, 2021 · 38a10dd · 38a10dd
1 parent 872950f
commit 38a10dd
Show file tree

Hide file tree

Showing 2 changed files with 138 additions and 0 deletions.
diff --git a/src/Fantomas.Tests/PatternMatchingTests.fs b/src/Fantomas.Tests/PatternMatchingTests.fs
@@ -1267,3 +1267,123 @@ let private formatResponse<'options> () =
         | Error err -> return sendInternalError (err)
     }
 """
+
+[<Test>]
+let ``match inside match expression, 1400`` () =
+    formatSourceString
+        false
+        """
+let u = ""
+match
+    match u with
+    | null -> ""
+    | s -> s
+    with
+    | "" -> x
+    | _ -> failwith ""
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+let u = ""
+
+match
+    match u with
+    | null -> ""
+    | s -> s
+    with
+| "" -> x
+| _ -> failwith ""
+"""
+
+[<Test>]
+let ``match bang inside match expression`` () =
+    formatSourceString
+        false
+        """
+let u = ""
+match
+    match! u with
+    | null -> ""
+    | s -> s
+    with
+    | "" -> x
+    | _ -> failwith ""
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+let u = ""
+
+match
+    match! u with
+    | null -> ""
+    | s -> s
+    with
+| "" -> x
+| _ -> failwith ""
+"""
+
+[<Test>]
+let ``match inside match bang expression`` () =
+    formatSourceString
+        false
+        """
+let u = ""
+match!
+    match u with
+    | null -> ""
+    | s -> s
+    with
+    | "" -> x
+    | _ -> failwith ""
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+let u = ""
+
+match!
+    match u with
+    | null -> ""
+    | s -> s
+    with
+| "" -> x
+| _ -> failwith ""
+"""
+
+[<Test>]
+let ``match bang inside match bang expression`` () =
+    formatSourceString
+        false
+        """
+let u = ""
+match!
+    match! u with
+    | null -> ""
+    | s -> s
+    with
+    | "" -> x
+    | _ -> failwith ""
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+let u = ""
+
+match!
+    match! u with
+    | null -> ""
+    | s -> s
+    with
+| "" -> x
+| _ -> failwith ""
+"""
diff --git a/src/Fantomas/CodePrinter.fs b/src/Fantomas/CodePrinter.fs
@@ -1592,6 +1592,15 @@ and genExpr astContext synExpr ctx =
                              +> tokN withRange WITH (!- "with")
                              +> unindent)
                                 ctx
+                        | Match _
+                        | MatchBang _ ->
+                            (indent
+                             +> sepNln
+                             +> genExpr astContext e
+                             +> sepNln
+                             +> tokN withRange WITH (!- "with")
+                             +> unindent)
+                                ctx
                         | _ ->
                             atCurrentColumnIndent
                                 (genExpr astContext e
@@ -1621,6 +1630,15 @@ and genExpr astContext synExpr ctx =
                              +> tokN withRange WITH (!- "with")
                              +> unindent)
                                 ctx
+                        | Match _
+                        | MatchBang _ ->
+                            (indent
+                             +> sepNln
+                             +> genExpr astContext e
+                             +> sepNln
+                             +> tokN withRange WITH (!- "with")
+                             +> unindent)
+                                ctx
                         | _ ->
                             atCurrentColumnIndent
                                 (genExpr astContext e