Indent multiline record field expressions from the opening brace.

fsprojects · Sep 27, 2021 · 2fdf476 · 2fdf476
1 parent fb3c595
commit 2fdf476
Show file tree

Hide file tree

Showing 7 changed files with 301 additions and 107 deletions.
diff --git a/src/Fantomas.Tests/CommentTests.fs b/src/Fantomas.Tests/CommentTests.fs
@@ -289,6 +289,53 @@ let a =
       B = 7 }
 """
 
+[<Test>]
+let ``comment alignment above record field`` () =
+    formatSourceString
+        false
+        """
+let a =
+    { c = 4
+      // foo
+      // bar
+      B = 7 }
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+let a =
+    { c = 4
+      // foo
+      // bar
+      B = 7 }
+"""
+
+[<Test>]
+let ``comment alignment above record field, fsharp_space_around_delimiter = false`` () =
+    formatSourceString
+        false
+        """
+let a =
+    { c = 4
+      // foo
+      // bar
+      B = 7 }
+"""
+        { config with
+              SpaceAroundDelimiter = false }
+    |> prepend newline
+    |> should
+        equal
+        """
+let a =
+    {c = 4
+     // foo
+     // bar
+     B = 7}
+"""
+
 [<Test>]
 let ``shouldn't break on one-line comment`` () =
     formatSourceString

diff --git a/src/Fantomas.Tests/CompilerDirectivesTests.fs b/src/Fantomas.Tests/CompilerDirectivesTests.fs
@@ -1911,7 +1911,7 @@ let config =
 #if WATCH
 
 #else
-          "https://fsprojects.github.io/fantomas/"
+        "https://fsprojects.github.io/fantomas/"
 #endif
     }
 """
@@ -1944,7 +1944,7 @@ let config =
       theme_variant = Some "red"
       root_url =
 #if WATCH
-          "http://localhost:8080/"
+        "http://localhost:8080/"
 #else
 
 #endif
@@ -1979,9 +1979,9 @@ let config =
       theme_variant = Some "red"
       root_url =
 #if WATCH
-          "http://localhost:8080/"
+        "http://localhost:8080/"
 #else
-          "https://fsprojects.github.io/fantomas/"
+        "https://fsprojects.github.io/fantomas/"
 #endif
     }
 """

diff --git a/src/Fantomas.Tests/NumberOfItemsRecordTests.fs b/src/Fantomas.Tests/NumberOfItemsRecordTests.fs
@@ -70,8 +70,8 @@ let myRecord =
       Progress = "foo"
       Bar = { Zeta = "bar" }
       Address =
-          { Street = "Bakerstreet"
-            ZipCode = "9000" }
+        { Street = "Bakerstreet"
+          ZipCode = "9000" }
       Number = 42 }
 """
 
@@ -220,8 +220,8 @@ let ``anonymous record with multiple field update`` () =
         """
 let a =
     {| foo with
-           Level = 7
-           Square = 9 |}
+        Level = 7
+        Square = 9 |}
 """
 
 [<Test>]
@@ -272,12 +272,12 @@ let anonRecord =
         """
 let anonRecord =
     {| A =
-           {| A1 = "string"
-              A2LongerIdentifier = "foo" |}
+        {| A1 = "string"
+           A2LongerIdentifier = "foo" |}
        B = {| B1 = 7 |}
        C =
-           { C1 = "foo"
-             C2LongerIdentifier = "bar" }
+        { C1 = "foo"
+          C2LongerIdentifier = "bar" }
        D = { D1 = "bar" } |}
 """
 
@@ -797,9 +797,9 @@ let config =
       theme_variant = Some "red"
       root_url =
 #if WATCH
-          "http://localhost:8080/"
+        "http://localhost:8080/"
 #else
-          "https://fsprojects.github.io/fantomas/"
+        "https://fsprojects.github.io/fantomas/"
 #endif
     }
 """
@@ -1036,9 +1036,9 @@ let s =
 
 let r' =
     {| r with
-           a = x
-           b = y
-           z = c |}
+        a = x
+        b = y
+        z = c |}
 
 let s' =
     {| s with AReallyLongExpressionThatIsMuchLongerThan50Characters = 1 |}
@@ -1054,9 +1054,9 @@ g s {| AReallyLongExpressionThatIsMuchLongerThan50Characters = 1 |}
 f
     r'
     {| r with
-           a = x
-           b = y
-           z = c |}
+        a = x
+        b = y
+        z = c |}
 
 g s' {| s with AReallyLongExpressionThatIsMuchLongerThan50Characters = 1 |}
 """

diff --git a/src/Fantomas.Tests/OperatorTests.fs b/src/Fantomas.Tests/OperatorTests.fs
@@ -766,11 +766,11 @@ Fooey
         "
 let r =
     {| Foo =
-           a
-           && // && b
-           c
+        a
+        && // && b
+        c
        Bar =
-           \"\"\"
+        \"\"\"
 Fooey
 \"\"\" |}
 "