Produce valid code for multiline array patterns.

fsprojects · Feb 10, 2023 · e1ce2e9 · e1ce2e9
1 parent d74c345
commit e1ce2e9
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 21 deletions.
diff --git a/src/Fantomas.Core.Tests/CrampedMultilineBracketStyleTests.fs b/src/Fantomas.Core.Tests/CrampedMultilineBracketStyleTests.fs
@@ -1621,8 +1621,9 @@ match entities with
         equal
         """
 match entities with
-| [| { Key = "0031ff53-e59b-49e3-8e0f-53f72a3890d1"
-       Type = Elephant }
+| [|
+    { Key = "0031ff53-e59b-49e3-8e0f-53f72a3890d1"
+      Type = Elephant }
     { Key = "0031ff53-e59b-49e3-8e0f-53f72a3890d2"
       Type = Elephant }
     { Key = "0031ff53-e59b-49e3-8e0f-53f72a3890d3"

diff --git a/src/Fantomas.Core.Tests/MultilinePatterns.fs b/src/Fantomas.Core.Tests/MultilinePatterns.fs
@@ -2,13 +2,9 @@
 
 open NUnit.Framework
 open FsUnit
+open Fantomas.Core
 open Fantomas.Core.Tests.TestHelper
 
-let formatSourceString isFsi input config =
-    let formatted = formatSourceString isFsi input config
-    printfn "%s" formatted
-    formatted
-
 [<Test>]
 let ``long ident tuple pattern`` () =
     formatSourceString
@@ -490,7 +486,8 @@ match x with
         equal
         """
 match x with
-| [| Y(itemOne =
+| [|
+    Y(itemOne =
         OhSomeActivePatternThing(
             a, b
         )
@@ -521,7 +518,7 @@ match x with
 """
         { config with
             MaxLineLength = 30
-            MultilineBlockBracketsOnSameColumn = true }
+            MultilineBracketStyle = Aligned }
     |> prepend newline
     |> should
         equal
@@ -595,7 +592,7 @@ match x with
 """
         { config with
             MaxLineLength = 30
-            MultilineBlockBracketsOnSameColumn = true }
+            MultilineBracketStyle = Aligned }
     |> prepend newline
     |> should
         equal

diff --git a/src/Fantomas.Core.Tests/PatternMatchingTests.fs b/src/Fantomas.Core.Tests/PatternMatchingTests.fs
@@ -1530,9 +1530,10 @@ let args =
         """
 let args =
     match args with
-    | [| LongPatIndentifierOne
-          | LongPatIndentifierTwo
-          | LongPatIndentifierThree |] -> args
+    | [|
+        LongPatIndentifierOne
+         | LongPatIndentifierTwo
+         | LongPatIndentifierThree |] -> args
     | _ -> failwith "meh"
 """
 

diff --git a/src/Fantomas.Core/CodePrinter.fs b/src/Fantomas.Core/CodePrinter.fs
@@ -2510,15 +2510,29 @@ let genPat (p: Pattern) =
             +> addSpaceIfSpaceAroundDelimiter
             +> genSingleTextNode node.CloseToken
 
-        // Note that we deliberately are not take the setting fsharp_multiline_block_brackets_on_same_column into account.
-        let multilineAlignBrackets =
-            genSingleTextNode node.OpenToken
-            +> indentSepNlnUnindent genPats
-            +> sepNln
-            +> genSingleTextNode node.CloseToken
+        let multiline =
+            let cramped =
+                if node.OpenToken.Text.Length = 1 then
+                    short
+                else
+                    // pattern is an array, which can lead to some offset problems.
+                    // It is better to play it safe and indent the patterns on the next line.
+                    genSingleTextNode node.OpenToken
+                    +> addSpaceIfSpaceAroundDelimiter
+                    +> indentSepNlnUnindent genPats
+                    +> addSpaceIfSpaceAroundDelimiter
+                    +> genSingleTextNode node.CloseToken
+
+            // Note that we deliberately are not take the setting fsharp_multiline_block_brackets_on_same_column into account.
+            let multilineAlignBrackets =
+                genSingleTextNode node.OpenToken
+                +> indentSepNlnUnindent genPats
+                +> sepNln
+                +> genSingleTextNode node.CloseToken
+
+            ifAlignOrStroustrupBrackets multilineAlignBrackets cramped
 
-        let nonEmpty =
-            expressionFitsOnRestOfLine short (ifAlignBrackets multilineAlignBrackets short)
+        let nonEmpty = expressionFitsOnRestOfLine short multiline
 
         ifElse node.Patterns.IsEmpty emptyPattern nonEmpty |> genNode node
     | Pattern.Record node ->