Print trivia of SynBinding prefix outside multiline check. Fixes fspr…

…ojects#2130.
nojaf · Mar 8, 2022 · 1096fa8 · 1096fa8
1 parent 1e98bc3
commit 1096fa8
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 * Comment after match keyword is lost. [#1851](https://github.com/fsprojects/fantomas/issues/1851)
 * Preserve in keyword on next line. [#1182](https://github.com/fsprojects/fantomas/issues/1182)
 * Remove Ionide.KeepAChangelog.Tasks and Dotnet.ReproducibleBuilds as NuGet dependencies. [#2131](https://github.com/fsprojects/fantomas/pull/2131)
+* Comment lost between attribute and member. [#2130](https://github.com/fsprojects/fantomas/issues/2130)
 
 ## [4.7.0] - 2022-03-04
 

diff --git a/src/Fantomas.Tests/AttributeTests.fs b/src/Fantomas.Tests/AttributeTests.fs
@@ -1042,3 +1042,31 @@ module AsyncOptionCEExtensions =
     type AsyncOptionBuilder with
         member inline Source: string -> string
 """
+
+[<Test>]
+let ``comment between attribute and member, 2130`` () =
+    formatSourceString
+        false
+        """
+type StreamReaderExtensions = 
+  [<Extension>]
+  // Extension method for StreamReader using Tasks to enable specifying timeout.
+  // Returns `None` if timeout occurs, otherwise `Some string`.
+  // Beware that since StreamReader.ReadLineAsync task can't be cancelled,
+  // it might still be running after recieving None!
+  static member inline Meh(streamReader: StreamReader, timeout: TimeSpan) =
+    ()
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+type StreamReaderExtensions =
+    [<Extension>]
+    // Extension method for StreamReader using Tasks to enable specifying timeout.
+    // Returns `None` if timeout occurs, otherwise `Some string`.
+    // Beware that since StreamReader.ReadLineAsync task can't be cancelled,
+    // it might still be running after recieving None!
+    static member inline Meh(streamReader: StreamReader, timeout: TimeSpan) = ()
+"""
diff --git a/src/Fantomas/AstTransformer.fs b/src/Fantomas/AstTransformer.fs
@@ -902,7 +902,14 @@ module private Ast =
 
     and visitSynValData (svd: SynValData) : TriviaNodeAssigner list =
         match svd with
-        | SynValData (_, svi, _) -> visitSynValInfo svi
+        | SynValData (memberFlags, svi, _) ->
+            let flagNodes =
+                match memberFlags with
+                | Some { Trivia = trivia } -> mkNodeOption SynValData_Static trivia.StaticRange
+                | _ -> []
+
+            [ yield! flagNodes
+              yield! visitSynValInfo svi ]
 
     and visitSynValSig (svs: SynValSig) : TriviaNodeAssigner list =
         match svs with

diff --git a/src/Fantomas/CodePrinter.fs b/src/Fantomas/CodePrinter.fs
@@ -554,7 +554,9 @@ and genTypeParamPostfix astContext tds =
     | _ -> sepNone
 
 and genLetBinding astContext pref b =
-    let genPref = !-pref
+    let genPref letKeyword =
+        genTriviaForOption SynBinding_Let letKeyword !-pref
+
     let isRecursiveLetOrUseFunction = (pref = "and ")
 
     match b with
@@ -567,8 +569,7 @@ and genLetBinding astContext pref b =
                 isRecursiveLetOrUseFunction
                 px
                 ats
-                letKeyword
-                genPref
+                (genPref letKeyword)
                 ao
                 isInline
                 isMutable
@@ -587,8 +588,7 @@ and genLetBinding astContext pref b =
                 isRecursiveLetOrUseFunction
                 px
                 ats
-                letKeyword
-                genPref
+                (genPref letKeyword)
                 ao
                 isInline
                 isMutable
@@ -604,8 +604,7 @@ and genLetBinding astContext pref b =
                 isRecursiveLetOrUseFunction
                 px
                 ats
-                letKeyword
-                genPref
+                (genPref letKeyword)
                 ao
                 isInline
                 isMutable
@@ -632,8 +631,7 @@ and genLetBinding astContext pref b =
                 isRecursiveLetOrUseFunction
                 px
                 ats
-                letKeyword
-                genPref
+                (genPref letKeyword)
                 ao
                 isInline
                 isMutable
@@ -800,7 +798,7 @@ and genMemberBinding astContext b =
                     (onlyIfNot mf.IsInstance (!- "static ")
                      +> !- "member ")
 
-                genMemberBindingImpl astContext prefix b ats px ao isInline pat equalsRange e synValInfo
+                genMemberBindingImpl astContext prefix ats px ao isInline pat equalsRange e synValInfo
             | _ ->
                 let ps = List.map snd ps
 
@@ -822,7 +820,7 @@ and genMemberBinding astContext b =
     | MemberBinding (ats, px, ao, isInline, mf, p, equalsRange, e, synValInfo) ->
         let prefix = genMemberFlags mf
 
-        genMemberBindingImpl astContext prefix b ats px ao isInline p equalsRange e synValInfo
+        genMemberBindingImpl astContext prefix ats px ao isInline p equalsRange e synValInfo
 
     | ExplicitCtor (ats, px, ao, p, equalsRange, e, so) ->
         let prefix =
@@ -865,7 +863,6 @@ and genMemberBinding astContext b =
 and genMemberBindingImpl
     (astContext: ASTContext)
     (prefix: Context -> Context)
-    (b: SynBinding)
     (ats: SynAttributes)
     (px: PreXmlDoc)
     (ao: SynAccess option)
@@ -883,7 +880,6 @@ and genMemberBindingImpl
             false
             px
             ats
-            None
             prefix
             ao
             isInline
@@ -897,15 +893,18 @@ and genMemberBindingImpl
             equalsRange
             e
     | e, PatLongIdent (ao, s, _, ps, tpso) when (List.isNotEmpty ps) ->
-        genSynBindingFunction astContext true false px ats None prefix ao isInline false s p.Range ps tpso equalsRange e
+        genSynBindingFunction astContext true false px ats prefix ao isInline false s p.Range ps tpso equalsRange e
     | TypedExpr (Typed, e, t), pat ->
-        genSynBindingValue astContext false px ats None prefix ao isInline false pat (Some t) equalsRange e
-    | _, pat -> genSynBindingValue astContext false px ats None prefix ao isInline false pat None equalsRange e
+        genSynBindingValue astContext false px ats prefix ao isInline false pat (Some t) equalsRange e
+    | _, pat -> genSynBindingValue astContext false px ats prefix ao isInline false pat None equalsRange e
 
 and genMemberFlags (mf: SynMemberFlags) =
     match mf.Trivia with
-    | { StaticRange = Some _s
-        MemberRange = Some _m } -> !- "static member "
+    | { StaticRange = Some s
+        MemberRange = Some _m } ->
+        genTriviaFor SynValData_Static s !- "static"
+        +> sepSpace
+        +> !- "member "
     | { OverrideRange = Some _o } -> !- "override "
     | { DefaultRange = Some _d } -> !- "default "
     | { AbstractRange = Some _a
@@ -5029,7 +5028,6 @@ and genSynBindingFunction
     (isRecursiveLetOrUseFunction: bool)
     (px: PreXmlDoc)
     (ats: SynAttributes)
-    (letKeyword: range option)
     (pref: Context -> Context)
     (ao: SynAccess option)
     (isInline: bool)
@@ -5074,8 +5072,7 @@ and genSynBindingFunction
             | _ -> sepSpace
 
         let short =
-            genPref
-            +> afterLetKeyword
+            afterLetKeyword
             +> genFunctionName
             +> spaceBeforeParameters
             +> col sepSpace parameters (genPatWithIdent astContext)
@@ -5088,8 +5085,7 @@ and genSynBindingFunction
                     genParenTupleWithIndentAndNewlines astContext lpr ps rpr pp.Range, true
                 | _ -> col sepNln parameters (genPatWithIdent astContext), false
 
-            (genPref
-             +> afterLetKeyword
+            (afterLetKeyword
              +> sepSpace
              +> genFunctionName
              +> indent
@@ -5113,7 +5109,7 @@ and genSynBindingFunction
 
     (genPreXmlDoc px
      +> genAttrIsFirstChild
-     +> optSingle (enterNodeFor SynBinding_Let) letKeyword
+     +> genPref
      +> leadingExpressionIsMultiline genSignature genExpr)
         ctx
 
@@ -5123,7 +5119,6 @@ and genSynBindingFunctionWithReturnType
     (isRecursiveLetOrUseFunction: bool)
     (px: PreXmlDoc)
     (ats: SynAttributes)
-    (letKeyword: range option)
     (pref: Context -> Context)
     (ao: SynAccess option)
     (isInline: bool)
@@ -5180,8 +5175,7 @@ and genSynBindingFunctionWithReturnType
             | _ -> sepSpace
 
         let short =
-            genPref
-            +> afterLetKeyword
+            afterLetKeyword
             +> sepSpace
             +> genFunctionName
             +> spaceBeforeParameters
@@ -5196,8 +5190,7 @@ and genSynBindingFunctionWithReturnType
                     genParenTupleWithIndentAndNewlines astContext lpr ps rpr pp.Range, true
                 | _ -> col sepNln parameters (genPatWithIdent astContext), false
 
-            (genPref
-             +> afterLetKeyword
+            (afterLetKeyword
              +> sepSpace
              +> genFunctionName
              +> indent
@@ -5221,7 +5214,7 @@ and genSynBindingFunctionWithReturnType
 
     (genPreXmlDoc px
      +> genAttrIsFirstChild
-     +> optSingle (enterNodeFor SynBinding_Let) letKeyword
+     +> genPref
      +> leadingExpressionIsMultiline genSignature genExpr)
         ctx
 
@@ -5277,7 +5270,6 @@ and genSynBindingValue
     (isRecursiveLetOrUseFunction: bool)
     (px: PreXmlDoc)
     (ats: SynAttributes)
-    (letKeyword: range option)
     (pref: Context -> Context)
     (ao: SynAccess option)
     (isInline: bool)
@@ -5325,7 +5317,6 @@ and genSynBindingValue
 
     genPreXmlDoc px
     +> genAttrIsFirstChild
-    +> optSingle (enterNodeFor SynBinding_Let) letKeyword
     +> genPref
     +> (fun ctx ->
         let prefix =

diff --git a/src/Fantomas/TriviaTypes.fs b/src/Fantomas/TriviaTypes.fs
@@ -355,6 +355,7 @@ type FsAstType =
     | SynType_Paren_OpeningParenthesis
     | SynType_Paren_ClosingParenthesis
     | SynValData_
+    | SynValData_Static
     | SynValInfo_
     | SynArgInfo_
     | ParsedHashDirective_