Format multi-line record types with access modifiers consistently. Fixes #1171. (#1175)

Author: nojaf

src/Fantomas.Tests/MultilineBlockBracketsOnSameColumnRecordTests.fs

@@ -661,7 +661,7 @@ type TestType =
         {
             Foo : int
         }
-"""  config
+"""  { config with MaxRecordWidth = 10 }
     |> prepend newline
     |> should equal """
 type TestType =
@@ -720,3 +720,54 @@ let person =
         Address = { Street = "Bakerstreet" ; Number = 42 } // end address
     } // end person
 """
+
+[<Test>]
+let ``line comments before access modifier of multiline record type`` () =
+    formatSourceString true """
+namespace Foo
+
+type TestType =
+    // Here is some comment about the type
+    // Some more comments
+    private
+        {
+            Foo : int
+            Barry: string
+        }
+"""  { config with MaxRecordWidth = 10 }
+    |> prepend newline
+    |> should equal """
+namespace Foo
+
+type TestType =
+    // Here is some comment about the type
+    // Some more comments
+    private
+        {
+            Foo : int
+            Barry : string
+        }
+"""
+
+[<Test>]
+let ``line comments before access modifier of single line record type`` () =
+    formatSourceString true """
+namespace Foo
+
+type TestType =
+    // Here is some comment about the type
+    // Some more comments
+    private
+        {
+            Meh : TimeSpan
+        }
+"""  config
+    |> prepend newline
+    |> should equal """
+namespace Foo
+
+type TestType =
+    // Here is some comment about the type
+    // Some more comments
+    private { Meh : TimeSpan }
+"""

src/Fantomas.Tests/NumberOfItemsRecordTests.fs

@@ -492,8 +492,6 @@ type ShortExpressionInfo =
     member x.Foo() = ()
 """
 
-// FIXME: See https://github.com/fsprojects/fantomas/issues/1171
-[<Ignore("Issue #1171")>]
 [<Test>]
 let ``internal keyword before multiline record type, 1171`` () =
     formatSourceString false """
@@ -506,8 +504,6 @@ type A =
           YetAnotherLongIdentifier: bool }
 """
 
-// FIXME: See https://github.com/fsprojects/fantomas/issues/1171
-[<Ignore("Issue #1171")>]
 [<Test>]
 let ``internal keyword before multiline record type in signature file, 1171`` () =
     formatSourceString true """namespace Bar

src/Fantomas.Tests/SignatureTests.fs

@@ -586,8 +586,9 @@ let ``internal keyword before long record type`` () =
 namespace Bar
 
 type A =
-    internal { ALongIdentifier: string
-               YetAnotherLongIdentifier: bool }
+    internal
+        { ALongIdentifier: string
+          YetAnotherLongIdentifier: bool }
 """
 
 [<Test>]
@@ -849,3 +850,52 @@ type t1 = bool
 [<SomeAttribute>]
 type t2 = bool
 """
+
+[<Test>]
+let ``line comments before access modifier of multiline record type`` () =
+    formatSourceString true """
+namespace Foo
+
+type TestType =
+    // Here is some comment about the type
+    // Some more comments
+    private
+        {
+            Foo : int
+            Barry: string
+        }
+"""  { config with MaxRecordWidth = 10 }
+    |> prepend newline
+    |> should equal """
+namespace Foo
+
+type TestType =
+    // Here is some comment about the type
+    // Some more comments
+    private
+        { Foo: int
+          Barry: string }
+"""
+
+[<Test>]
+let ``line comments before access modifier of single line record type`` () =
+    formatSourceString true """
+namespace Foo
+
+type TestType =
+    // Here is some comment about the type
+    // Some more comments
+    private
+        {
+            Meh : TimeSpan
+        }
+"""  config
+    |> prepend newline
+    |> should equal """
+namespace Foo
+
+type TestType =
+    // Here is some comment about the type
+    // Some more comments
+    private { Meh: TimeSpan }
+"""

src/Fantomas.Tests/TypeDeclarationTests.fs

@@ -1527,6 +1527,30 @@ type TestType =
     private { Foo: int }
 """
 
+[<Test>]
+let ``comments before access modifier and multiline record type`` () =
+    formatSourceString false """
+type OlapCube =
+    // Here is some comment about the type
+    // Some more comments
+    private
+        {
+            OneDimension : int
+            TwoDimension : int
+            ThreeDimension : int
+        }
+"""  config
+    |> prepend newline
+    |> should equal """
+type OlapCube =
+    // Here is some comment about the type
+    // Some more comments
+    private
+        { OneDimension: int
+          TwoDimension: int
+          ThreeDimension: int }
+"""
+
 [<Test>]
 let ``alternative long member definition`` () =
     formatSourceString false """
@@ -1805,3 +1829,21 @@ let ``union type with constraint`` () =
     formatSourceString false """type 'a t when 'a :> IDisposable = T  of  'a option""" config
     |> should equal """type 'a t when 'a :> IDisposable = T of 'a option
 """
+
+[<Test>]
+let ``add newline and indent for multiline internal record definition, 658`` () =
+    formatSourceString false """
+type RequestParser<'ctx, 'a> = internal {
+  consumedFields: Set<ConsumedFieldName>
+  parse: 'ctx -> Request ->  Async<Result<'a, Error list>>
+  prohibited: ProhibitedRequestGetter list
+}
+"""  config
+    |> prepend newline
+    |> should equal """
+type RequestParser<'ctx, 'a> =
+    internal
+        { consumedFields: Set<ConsumedFieldName>
+          parse: 'ctx -> Request -> Async<Result<'a, Error list>>
+          prohibited: ProhibitedRequestGetter list }
+"""