Better record and value formatting in tools (#7021)

* Remove semicolons from record tooltips

* Update to put a space between braces

* Update formatting as best I can, plus some tests I guess

* More baseline updates

* Anonymous records

* Update anon records tests

* Add vsbsl lol

* Update baselines and reduce a simple filter

* Update baselines maybe last time

* Update fsharpqa test

* make tests pass

* Add formatting for values

* Update tests

* Update test

* Update fsharpqa tests

* tryit

* lol

* get yote

* shlerp

* Update tests again I guess

* more update

* mother of pearl

* this is a real turd

Author: cartermp

fcs/FSharp.Compiler.Service.Tests/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)
     ()

src/fsharp/NicePrint.fs

@@ -32,8 +32,8 @@ 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 braceBarL x = leftL Literals.leftBraceBar ^^ x ^^ rightL Literals.rightBraceBar
+    let braceL x = wordL Literals.leftBrace ^^ x ^^ wordL Literals.rightBrace
+    let braceBarL x = wordL Literals.leftBraceBar ^^ x ^^ wordL Literals.rightBraceBar
 
     let comment str = wordL (tagText (sprintf "(* %s *)" str))
 
@@ -942,7 +942,7 @@ module private PrintTypes =
 
         // Layout a tuple type 
         | TType_anon (anonInfo, tys) ->
-            let core = sepListL (wordL (tagPunctuation ";")) (List.map2 (fun nm ty -> wordL (tagField nm) ^^ wordL (tagPunctuation ":") ^^ layoutTypeWithInfoAndPrec denv env prec ty) (Array.toList anonInfo.SortedNames) tys)
+            let core = sepListL (rightL (tagPunctuation ";")) (List.map2 (fun nm ty -> wordL (tagField nm) ^^ rightL (tagPunctuation ":") ^^ layoutTypeWithInfoAndPrec denv env prec ty) (Array.toList anonInfo.SortedNames) tys)
             if evalAnonInfoIsStruct anonInfo then 
                 WordL.keywordStruct --- braceBarL core
             else 
@@ -1457,7 +1457,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
@@ -1738,8 +1738,15 @@ 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
+                          |> aboveListL
+                          |> braceL
+
                       Some (addMembersAsWithEnd (addReprAccessL recdL))
 
                   | TFSharpObjectRepr r -> 
@@ -1771,8 +1778,7 @@ module private TastDefinitionPrinting =
                                   | _ -> []
                               let vsprs = 
                                   tycon.MembersOfFSharpTyconSorted
-                                  |> List.filter (fun v -> isNil (Option.get v.MemberInfo).ImplementedSlotSigs) 
-                                  |> List.filter (fun v -> v.IsDispatchSlot)
+                                  |> List.filter (fun v -> isNil (Option.get v.MemberInfo).ImplementedSlotSigs && v.IsDispatchSlot) 
                                   |> List.map (fun vref -> PrintTastMemberOrVals.prettyLayoutOfValOrMemberNoInst denv vref.Deref)
                               let staticValsLs = 
                                   tycon.TrueFieldsAsList

src/utils/sformat.fs

@@ -759,18 +759,14 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl
         // pprinter: attributes
         // -------------------------------------------------------------------- 
 
-        let makeRecordVerticalL nameXs =
-            let itemL (name,xL) = let labelL = wordL name in ((labelL ^^ wordL Literals.equals)) -- (xL  ^^ (rightL Literals.semicolon))
-            let braceL xs = (leftL Literals.leftBrace) ^^ xs ^^ (rightL Literals.rightBrace)
-            braceL (aboveListL (List.map itemL nameXs))
-
-        // This is a more compact rendering of records - and is more like tuples 
-        let makeRecordHorizontalL nameXs = 
-            let itemL (name,xL) = let labelL = wordL name in ((labelL ^^ wordL Literals.equals)) -- xL
-            let braceL xs = (leftL Literals.leftBrace) ^^ xs ^^ (rightL Literals.rightBrace)
-            braceL (sepListL (rightL Literals.semicolon)  (List.map itemL nameXs))
-
-        let makeRecordL nameXs = makeRecordVerticalL nameXs 
+        let makeRecordL nameXs =
+            let itemL (name,xL) = wordL name ^^ wordL Literals.equals -- xL
+            let braceL xs = (wordL Literals.leftBrace) ^^ xs ^^ (wordL Literals.rightBrace)
+            
+            nameXs
+            |> List.map itemL
+            |> aboveListL
+            |> braceL
 
         let makePropertiesL nameXs =
             let itemL (name,v) =