Better record and value formatting in tools

src/fsharp/NicePrint.fs

@@ -32,7 +32,7 @@ module internal PrintUtilities =
     let bracketIfL x lyt = if x then bracketL lyt else lyt
     let squareAngleL x = LeftL.leftBracketAngle ^^ x ^^ RightL.rightBracketAngle
     let angleL x = sepL Literals.leftAngle ^^ x ^^ rightL Literals.rightAngle
-    let braceL x = leftL Literals.leftBrace ^^ x ^^ rightL Literals.rightBrace
+    let braceL x = wordL Literals.leftBrace ^^ x ^^ wordL Literals.rightBrace
     let braceBarL x = leftL Literals.leftBraceBar ^^ x ^^ rightL Literals.rightBraceBar
 
     let comment str = wordL (tagText (sprintf "(* %s *)" str))
@@ -1445,7 +1445,7 @@ module private TastDefinitionPrinting =
         let lhs =
             tagRecordField fld.Name
             |> mkNav fld.DefinitionRange
-            |> wordL 
+            |> wordL
         let lhs = (if addAccess then layoutAccessibility denv fld.Accessibility lhs else lhs)
         let lhs = if fld.IsMutable then wordL (tagKeyword "mutable") --- lhs else lhs
         (lhs ^^ RightL.colon) --- layoutType denv fld.FormalType
@@ -1726,8 +1726,8 @@ module private TastDefinitionPrinting =
                   let denv = denv.AddAccessibility tycon.TypeReprAccessibility 
                   match repr with 
                   | TRecdRepr _ ->
-                      let recdFieldRefL fld = layoutRecdField false denv fld ^^ rightL (tagPunctuation ";")
-                      let recdL = tycon.TrueFieldsAsList |> List.map recdFieldRefL |> applyMaxMembers denv.maxMembers |> aboveListL |> braceL
+                      let recdFieldRefL fld = layoutRecdField false denv fld
+                      let recdL = tycon.TrueFieldsAsList |> List.map recdFieldRefL |> applyMaxMembers denv.maxMembers |> aboveListIndentOneL |> braceL
                       Some (addMembersAsWithEnd (addReprAccessL recdL))
 
                   | TFSharpObjectRepr r -> 

src/fsharp/layout.fs

@@ -256,6 +256,11 @@ let aboveListL = function
   | [x]   -> x
   | x :: ys -> List.fold (fun pre y -> pre @@ y) x ys
 
+let aboveListIndentOneL = function
+    | [] -> emptyL
+    | [x] -> x
+    | x :: xs -> (x, xs) ||> List.fold (fun pre y -> pre @@- y)
+
 let optionL xL = function
   | None   -> wordL (tagUnionCase "None")
   | Some x -> wordL (tagUnionCase "Some") -- (xL x)

src/fsharp/layout.fsi

@@ -46,6 +46,7 @@ val bracketL              : Layout -> Layout
 val tupleL                : Layout list -> Layout
 val aboveL                : Layout -> Layout -> Layout
 val aboveListL            : Layout list -> Layout
+val aboveListIndentOneL : Layout list -> Layout
 
 val optionL               : ('a -> Layout) -> 'a option -> Layout    
 val listL                 : ('a -> Layout) -> 'a list   -> Layout

vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.QuickInfo.fs

@@ -762,7 +762,7 @@ Full name: Microsoft.FSharp.Control.Async""".TrimStart().Replace("\r\n", "\n")
 
         let fileContents = """namespace NS
                            type Re(*MarkerRecord*) = { X : int } """
-        let expectedQuickinfoTypeRecored = "type Re =  {X: int;}"
+        let expectedQuickinfoTypeRecored = "type Re =  { X: int }"
 
         this.InfoInDeclarationTestQuickInfoImplWithTrim fileContents "Re(*MarkerRecord*)" expectedQuickinfoTypeRecored
 

vsintegration/tests/UnitTests/QuickInfoTests.fs

@@ -154,9 +154,9 @@ module Test =
     let quickInfo = GetQuickInfoTextFromCode code
     let expected =
         expectedLines [ "type MyEmployee ="
-                        "  {mutable Name: string;"
-                        "   mutable Age: int;"
-                        "   mutable IsFTE: bool;}"
+                        "  { mutable Name: string"
+                        "    mutable Age: int"
+                        "    mutable IsFTE: bool }"
                         "Full name: FsTest.MyEmployee" ]
     Assert.AreEqual(expected, quickInfo)
     ()