fsprojects#1238 Added function multilineRecordExprAlignBrackets

HumbertoCortes · Jan 19, 2021 · 0edfd80 · 0edfd80
1 parent b36e5a5
commit 0edfd80
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 1 deletion.
diff --git a/src/Fantomas.Tests/ControlStructureTests.fs b/src/Fantomas.Tests/ControlStructureTests.fs
@@ -836,3 +836,35 @@ with ex ->
     Infrastructure.ReportWarning ex
     return None
 """
+
+[<Test>]
+let ``MultilineBlockBracketsOnSameColumn should be honored inside match block, 1238`` () =
+    formatSourceString
+        false
+        """
+      module Foo =
+          let Bar () =
+              if x then
+                  match foo with
+                  | { Bar = true
+                      Baz = _ } -> failwith "xxx"
+                  | _ -> None
+"""
+        { config with
+            MaxLineLength = 30
+            MultilineBlockBracketsOnSameColumn = true}
+    |> prepend newline
+    |> should
+        equal
+        """
+module Foo =
+    let Bar () =
+        if x then
+            match foo with
+            | {
+                  Bar = true
+                  Baz = _
+              } ->
+                failwith "xxx"
+            | _ -> None
+"""
diff --git a/src/Fantomas/CodePrinter.fs b/src/Fantomas/CodePrinter.fs
@@ -4535,9 +4535,22 @@ and genPat astContext pat =
             +> atCurrentColumn (col sepSemiNln xs (genPatRecordFieldName astContext))
             +> sepCloseS
 
+        let multilineRecordExprAlignBrackets =
+            sepOpenSFixed
+            +> indent
+            +> sepNln
+            +> atCurrentColumn (col sepSemiNln xs (genPatRecordFieldName astContext))
+            +> unindent
+            +> sepNln
+            +> sepCloseSFixed
+            |> atCurrentColumnIndent
+
+        let multilineExpressionIfAlignBrackets =
+            ifAlignBrackets multilineRecordExprAlignBrackets multilineRecordExpr  
+
         fun ctx ->
             let size = getRecordSize ctx xs
-            isSmallExpression size smallRecordExpr multilineRecordExpr ctx
+            isSmallExpression size smallRecordExpr multilineExpressionIfAlignBrackets ctx
     | PatConst (c, r) -> genConst c r
     | PatIsInst (TApp (_, [ _ ], _) as t)
     | PatIsInst (TArray _ as t) ->