Update FCS to 'Parser: recover on unfinished record decls (fsprojects…

…#3006) * Update FCS to 'Parser: recover on unfinished record decls, fix field ranges' * Add changelog entry for FCS update. * Fix missing trivia after mutable keyword
dawedawe · Dec 1, 2023 · a187cc5 · a187cc5
1 parent cee9a9e
commit a187cc5
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@
 ### Fixed
 * Process is reserved keyword. [#2996](https://github.com/fsprojects/fantomas/issues/2996)
 * Always yield list items on separate lines if a conditional is present. [#2972](https://github.com/fsprojects/fantomas/issues/2972)
+* Trivia after mutable keyword is missing. [#3005](https://github.com/fsprojects/fantomas/issues/3005)
+
+### Changed
+* Update FCS to 'Parser: recover on unfinished record decls, fix field ranges ', commit ee4a810ffe9e984e2ec8c55a9cb6d1c6631dd0b3 [#3006](https://github.com/fsprojects/fantomas/pull/3006)
 
 ## 6.3.0-alpha-003 - 2023-11-15
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -40,7 +40,7 @@ Some common use cases include:
 
     <!-- Versions -->
     <PropertyGroup>
-        <FCSCommitHash>f42bdae84727fc251a6e570c2f1c47a3deffe215</FCSCommitHash>
+        <FCSCommitHash>ee4a810ffe9e984e2ec8c55a9cb6d1c6631dd0b3</FCSCommitHash>
         <StreamJsonRpcVersion>2.8.28</StreamJsonRpcVersion>
         <FSharpCoreVersion>6.0.1</FSharpCoreVersion>
     </PropertyGroup>

diff --git a/src/Fantomas.Core.Tests/TypeDeclarationTests.fs b/src/Fantomas.Core.Tests/TypeDeclarationTests.fs
@@ -3531,3 +3531,27 @@ let typographyLabel<'msg, 'marker & #IFabLabel & #IFoo & #Bar>() = ()
         """
 let typographyLabel<'msg, 'marker & #IFabLabel & #IFoo & #Bar> () = ()
 """
+
+[<Test>]
+let ``trivia after mutable keyword, 3005`` () =
+    formatSourceString
+        """
+type R =
+    {
+        F1: int
+        mutable // voobar
+            F2: int
+        F3: int
+    }
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+type R =
+    { F1: int
+      mutable // voobar
+          F2: int
+      F3: int }
+"""
diff --git a/src/Fantomas.Core/ASTTransformer.fs b/src/Fantomas.Core/ASTTransformer.fs
@@ -2337,22 +2337,26 @@ let mkSynLeadingKeyword (lk: SynLeadingKeyword) =
 
 let mkSynField
     (creationAide: CreationAide)
-    (SynField(ats, _isStatic, ido, t, isMutable, px, ao, range, { LeadingKeyword = lk }))
+    (SynField(ats,
+              _isStatic,
+              ido,
+              t,
+              _,
+              px,
+              ao,
+              range,
+              { LeadingKeyword = lk
+                MutableKeyword = mk }))
     =
-    let m =
-        match ats with
-        | [] -> range
-        | head :: _ -> unionRanges head.Range range
-
     FieldNode(
         mkXmlDoc px,
         mkAttributes creationAide ats,
         Option.map mkSynLeadingKeyword lk,
-        isMutable,
+        Option.map (stn "mutable") mk,
         mkSynAccess ao,
         Option.map mkIdent ido,
         mkType creationAide t,
-        m
+        range
     )
 
 let mkSynUnionCase
@@ -2757,7 +2761,7 @@ let mkMemberDefn (creationAide: CreationAide) (md: SynMemberDefn) =
         memberDefn = SynBinding(
             attributes = ats
             xmlDoc = px
-            valData = SynValData(Some { MemberKind = SynMemberKind.Constructor }, _, ido, _)
+            valData = SynValData(memberFlags = Some { MemberKind = SynMemberKind.Constructor }; thisIdOpt = ido)
             headPat = SynPat.LongIdent(
                 longDotId = SynLongIdent(id = [ newIdent ])
                 argPats = SynArgPats.Pats [ SynPat.Paren _ as pat ]

diff --git a/src/Fantomas.Core/CodePrinter.fs b/src/Fantomas.Core/CodePrinter.fs
@@ -3611,17 +3611,20 @@ let genTypeInSignature (t: Type) =
     | _ -> autoIndentAndNlnIfExpressionExceedsPageWidth (genType t)
 
 let genField (node: FieldNode) =
+    let genAccessAndFieldContent =
+        genAccessOpt node.Accessibility
+        +> (match node.Name with
+            | None -> genType node.Type
+            | Some name ->
+                genSingleTextNode name
+                +> sepColon
+                +> autoIndentAndNlnTypeUnlessStroustrup genType node.Type)
+
     genXml node.XmlDoc
     +> genAttributes node.Attributes
     +> optSingle (fun lk -> genMultipleTextsNode lk +> sepSpace) node.LeadingKeyword
-    +> onlyIf node.IsMutable (!- "mutable ")
-    +> genAccessOpt node.Accessibility
-    +> (match node.Name with
-        | None -> genType node.Type
-        | Some name ->
-            genSingleTextNode name
-            +> sepColon
-            +> autoIndentAndNlnTypeUnlessStroustrup genType node.Type)
+    +> optSingle (fun mk -> genSingleTextNode mk +> onlyIfNot mk.HasContentAfter sepSpace) node.MutableKeyword
+    +> ifElseCtx hasWriteBeforeNewlineContent (indentSepNlnUnindent genAccessAndFieldContent) genAccessAndFieldContent
     |> genNode node
 
 let genUnionCase (hasVerticalBar: bool) (node: UnionCaseNode) =

diff --git a/src/Fantomas.Core/SyntaxOak.fs b/src/Fantomas.Core/SyntaxOak.fs
@@ -2046,7 +2046,7 @@ type FieldNode
         xmlDoc: XmlDocNode option,
         attributes: MultipleAttributeListNode option,
         leadingKeyword: MultipleTextsNode option,
-        isMutable: bool,
+        mutableKeyword: SingleTextNode option,
         accessibility: SingleTextNode option,
         name: SingleTextNode option,
         t: Type,
@@ -2058,14 +2058,15 @@ type FieldNode
         [| yield! noa xmlDoc
            yield! noa attributes
            yield! noa leadingKeyword
+           yield! noa mutableKeyword
            yield! noa accessibility
            yield! noa name
            yield Type.Node t |]
 
     member val XmlDoc = xmlDoc
     member val Attributes = attributes
     member val LeadingKeyword = leadingKeyword
-    member val IsMutable = isMutable
+    member val MutableKeyword = mutableKeyword
     member val Accessibility = accessibility
     member val Name = name
     member val Type = t