Consolidate records part two

Directory.Build.props

@@ -38,7 +38,7 @@ Some common use cases include:
 
     <!-- Versions -->
     <PropertyGroup>
-        <FCSCommitHash>924a64e8e40c840f05fbe7113796f267dd603282</FCSCommitHash>
+        <FCSCommitHash>ec1f2e206445dacd88e17fbfed42c0688cb6216d</FCSCommitHash>
         <StreamJsonRpcVersion>2.8.28</StreamJsonRpcVersion>
         <FSharpCoreVersion>6.0.1</FSharpCoreVersion>
     </PropertyGroup>

src/Fantomas.Core.Tests/MultilineBlockBracketsOnSameColumnArrayOrListTests.fs → src/Fantomas.Core.Tests/AlignedMultilineBracketStyleArrayOrListTests.fs

@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.MultilineBlockBracketsOnSameColumnArrayOrListTests
+module Fantomas.Core.Tests.AlignedMultilineBracketStyleArrayOrListTests
 
 open NUnit.Framework
 open FsUnit

src/Fantomas.Core.Tests/AlignedMultilineBracketStyleTests.fs

@@ -1545,3 +1545,28 @@ let v = {
         Lackeys = [ "Zippy" ; "George" ; "Bungle" ]
 }
 """
+
+[<Test>]
+let ``anonymous struct record with trivia`` () =
+    formatSourceString
+        false
+        """
+struct // 1
+    {| // 2
+        // 3
+        X = 4
+    // 5       
+    |} // 6 
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+struct // 1
+    {| // 2
+        // 3
+        X = 4
+    // 5
+    |} // 6
+"""

src/Fantomas.Core.Tests/CrampedMultilineBracketStyleTests.fs

@@ -1721,8 +1721,8 @@ let ``record with comments above field, indent 2`` () =
         equal
         """
 { Foo =
-    // bar
-    someValue }
+  // bar
+  someValue }
 """
 
 [<Test>]
@@ -1778,8 +1778,8 @@ let ``anonymous record with multiline field, indent 2`` () =
         equal
         """
 {| Foo =
-    //  meh
-    someValue |}
+  //  meh
+  someValue |}
 """
 
 [<Test>]

src/Fantomas.Core.Tests/Fantomas.Core.Tests.fsproj

@@ -59,7 +59,7 @@
     <Compile Include="SpaceBeforeClassConstructorTests.fs" />
     <Compile Include="SpaceBeforeMemberTests.fs" />
     <Compile Include="AlignedMultilineBracketStyleTests.fs" />
-    <Compile Include="MultilineBlockBracketsOnSameColumnArrayOrListTests.fs" />
+    <Compile Include="AlignedMultilineBracketStyleArrayOrListTests.fs" />
     <Compile Include="NewlineBetweenTypeDefinitionAndMembersTests.fs" />
     <Compile Include="MaxValueBindingWidthTests.fs" />
     <Compile Include="MaxFunctionBindingWidthTests.fs" />
@@ -108,6 +108,7 @@
     <Compile Include="Stroustrup\ElmishTests.fs" />
     <Compile Include="Stroustrup\FunctionApplicationSingleListTests.fs" />
     <Compile Include="Stroustrup\FunctionApplicationDualListTests.fs" />
+    <Compile Include="Stroustrup\SynExprAnonRecdStructTests.fs" />
     <Compile Include="IdentTests.fs" />
     <Compile Include="RecordDeclarationsWithXMLDocTests.fs" />
     <Compile Include="MaxIfThenShortWidthTests.fs" />

src/Fantomas.Core.Tests/NumberOfItemsRecordTests.fs

@@ -697,8 +697,8 @@ let ``indent update anonymous record fields far enough`` () =
         """
 let expected =
   {| ThisIsAThing.Empty with
-       TheNewValue = 1
-       ThatValue = 2 |}
+      TheNewValue = 1
+      ThatValue = 2 |}
 """
 
 [<Test>]

src/Fantomas.Core.Tests/Stroustrup/SynExprAnonRecdStructTests.fs

@@ -0,0 +1,35 @@
+module Fantomas.Core.Tests.Stroustrup.SynExprAnonRecdStructTests
+
+open NUnit.Framework
+open FsUnit
+open Fantomas.Core.Tests.TestHelper
+open Fantomas.Core
+
+let config =
+    { config with
+        MultilineBracketStyle = Stroustrup }
+
+[<Test>]
+let ``anonymous struct record with trivia`` () =
+    formatSourceString
+        false
+        """
+struct // 1
+    {| // 2
+        // 3
+        X = 4
+    // 5       
+    |} // 6 
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+struct // 1
+    {| // 2
+        // 3
+        X = 4
+    // 5
+    |} // 6
+"""

src/Fantomas.Core.Tests/StructTests.fs

@@ -164,3 +164,28 @@ type NameStruct() =
     struct
     end
 """
+
+[<Test>]
+let ``anonymous struct record with trivia`` () =
+    formatSourceString
+        false
+        """
+struct // 1
+    {| // 2
+        // 3
+        X = 4
+    // 5       
+    |} // 6 
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+struct // 1
+    {| // 2
+       // 3
+       X = 4
+    // 5
+    |} // 6
+"""

src/Fantomas.Core/ASTTransformer.fs

@@ -975,7 +975,11 @@ let mkExpr (creationAide: CreationAide) (e: SynExpr) : Expr =
         | None, None ->
             ExprRecordNode(stn "{" mOpen, None, fieldNodes, stn "}" mClose, exprRange)
             |> Expr.Record
-    | SynExpr.AnonRecd(isStruct, copyInfo, recordFields, StartEndRange 2 (mOpen, _, mClose)) ->
+    | SynExpr.AnonRecd(true,
+                       copyInfo,
+                       recordFields,
+                       (StartRange 6 (mStruct, _) & EndRange 2 (mClose, _)),
+                       { OpeningBraceRange = mOpen }) ->
         let fields =
             recordFields
             |> List.choose (function
@@ -988,15 +992,36 @@ let mkExpr (creationAide: CreationAide) (e: SynExpr) : Expr =
                     Some(RecordFieldNode(longIdent, stn "=" mEq, mkExpr creationAide e, m))
                 | _ -> None)
 
-        ExprAnonRecordNode(
-            isStruct,
+        ExprAnonStructRecordNode(
+            stn "struct" mStruct,
             stn "{|" mOpen,
             Option.map (fst >> mkExpr creationAide) copyInfo,
             fields,
             stn "|}" mClose,
             exprRange
         )
-        |> Expr.AnonRecord
+        |> Expr.AnonStructRecord
+    | SynExpr.AnonRecd(false, copyInfo, recordFields, EndRange 2 (mClose, _), { OpeningBraceRange = mOpen }) ->
+        let fields =
+            recordFields
+            |> List.choose (function
+                | ident, Some mEq, e ->
+                    let m = unionRanges ident.idRange e.Range
+
+                    let longIdent =
+                        IdentListNode([ IdentifierOrDot.Ident(mkIdent ident) ], ident.idRange)
+
+                    Some(RecordFieldNode(longIdent, stn "=" mEq, mkExpr creationAide e, m))
+                | _ -> None)
+
+        ExprRecordNode(
+            stn "{|" mOpen,
+            Option.map (fst >> mkExpr creationAide) copyInfo,
+            fields,
+            stn "|}" mClose,
+            exprRange
+        )
+        |> Expr.Record
     | SynExpr.ObjExpr(t, eio, withKeyword, bd, members, ims, StartRange 3 (mNew, _), StartEndRange 1 (mOpen, _, mClose)) ->
         let interfaceNodes =
             ims