Print trivia for ident of ValSpfn. Fixes #1561. (#1568)

fsprojects · Apr 1, 2021 · a16da08 · a16da08
1 parent 82615ce
commit a16da08
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 11 deletions.
diff --git a/src/Fantomas.Tests/SignatureTests.fs b/src/Fantomas.Tests/SignatureTests.fs
@@ -1325,3 +1325,30 @@ type 'a Bar =
     ///
     | Quux
 """
+
+[<Test>]
+let ``comment between attribute and val, 1561`` () =
+    formatSourceString
+        true
+        """
+namespace Baz
+
+module Bar =
+
+    [<Obsolete "">]
+    ///
+    val f : unit -> unit
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+namespace Baz
+
+module Bar =
+
+    [<Obsolete "">]
+    ///
+    val f : unit -> unit
+"""
diff --git a/src/Fantomas/AstTransformer.fs b/src/Fantomas/AstTransformer.fs
@@ -778,8 +778,9 @@ module private Ast =
 
     and visitSynValSig (svs: SynValSig) : TriviaNodeAssigner list =
         match svs with
-        | ValSpfn (attrs, _, explicitValDecls, synType, arity, _, _, _, _, expr, range) ->
+        | ValSpfn (attrs, ident, explicitValDecls, synType, arity, _, _, _, _, expr, range) ->
             [ yield mkNode ValSpfn_ range
+              yield visitIdent ident
               yield! (visitSynAttributeLists range attrs)
               yield! visitSynValTyparDecls explicitValDecls
               yield! visitSynType synType

diff --git a/src/Fantomas/CodePrinter.fs b/src/Fantomas/CodePrinter.fs
@@ -862,7 +862,7 @@ and genMemberFlagsForMemberBinding astContext (mf: MemberFlags) (rangeOfBindingA
             |> Option.defaultValue (!- "override ")
         <| ctx
 
-and genVal astContext (Val (ats, px, ao, s, t, vi, isInline, _) as node) =
+and genVal astContext (Val (ats, px, ao, s, identRange, t, vi, isInline, _) as node) =
     let range, synValTyparDecls =
         match node with
         | ValSpfn (_, _, synValTyparDecls, _, _, _, _, _, _, _, range) -> range, synValTyparDecls
@@ -874,12 +874,14 @@ and genVal astContext (Val (ats, px, ao, s, t, vi, isInline, _) as node) =
 
     let (FunType namedArgs) = (t, vi)
 
-    genPreXmlDoc px +> genAttributes astContext ats
-    -- "val "
-    +> opt sepSpace ao genAccess
-    +> onlyIf isInline (!- "inline ")
-    -- s
-    +> genericParams
+    genPreXmlDoc px
+    +> genAttributes astContext ats
+    +> (!- "val "
+        +> opt sepSpace ao genAccess
+        +> onlyIf isInline (!- "inline ")
+        -- s
+        +> genericParams
+        |> genTriviaFor Ident_ identRange)
     +> sepColonWithSpacesFixed
     +> ifElse
         (List.isNotEmpty namedArgs)
@@ -3898,7 +3900,7 @@ and genMemberSig astContext node =
         | SynMemberSig.NestedType (_, r) -> r, SynMemberSig_NestedType
 
     match node with
-    | MSMember (Val (ats, px, ao, s, t, vi, isInline, ValTyparDecls (tds, _, tcs)), mf) ->
+    | MSMember (Val (ats, px, ao, s, _, t, vi, isInline, ValTyparDecls (tds, _, tcs)), mf) ->
         let (FunType namedArgs) = (t, vi)
 
         let isFunctionProperty =

diff --git a/src/Fantomas/SourceParser.fs b/src/Fantomas/SourceParser.fs
@@ -1505,8 +1505,10 @@ let (|MSMember|MSInterface|MSInherit|MSValField|MSNestedType|) =
     | SynMemberSig.ValField (f, _) -> MSValField f
     | SynMemberSig.NestedType (tds, _) -> MSNestedType tds
 
-let (|Val|) (ValSpfn (ats, IdentOrKeyword (OpNameFullInPattern (s, _)), tds, t, vi, isInline, _, px, ao, _, _)) =
-    (ats, px, ao, s, t, vi, isInline, tds)
+let (|Val|)
+    (ValSpfn (ats, ((IdentOrKeyword (OpNameFullInPattern (s, _)) as ident)), tds, t, vi, isInline, _, px, ao, _, _))
+    =
+    (ats, px, ao, s, ident.idRange, t, vi, isInline, tds)
 
 // Misc