genNode for SimplePatNode. (#2697)

* genNode for SimplePatNode. * Add changelog entry
fsprojects · Jan 10, 2023 · 1af0dfe · 1af0dfe
1 parent 06c7211
commit 1af0dfe
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 * Stroustrup style breaks on nested records. [#2587](https://github.com/fsprojects/fantomas/issues/2587)
 * Unit is lost inside dot get chain. [#2683](https://github.com/fsprojects/fantomas/issues/2683)
 * Piped multiline application is indented too far. [#2682](https://github.com/fsprojects/fantomas/issues/2682)
+* Comment not assigned to first parameter in constructor. [#2692](https://github.com/fsprojects/fantomas/issues/2692)
 
 ## [5.2.0-beta-001] - 2023-01-02
 

diff --git a/src/Fantomas.Core.Tests/TypeDeclarationTests.fs b/src/Fantomas.Core.Tests/TypeDeclarationTests.fs
@@ -3422,3 +3422,36 @@ module Primitives =
 #endif
         BlockHeightOffset16 = BlockHeightOffset16 of uint16
 """
+
+[<Test>]
+let ``trivia before constructor parameter, 2692`` () =
+    formatSourceString
+        false
+        """
+type SingleAppParenLambda
+    (
+        // Expr could be a single identifier or TypeApp
+        functionName: Expr, parenLambda: ExprParenLambdaNode, range
+    ) =
+    inherit NodeBase(range)
+    override this.Children = [| yield Expr.Node functionName; yield parenLambda |]
+    member x.FunctionName = functionName
+    member x.ParenLambda = parenLambda
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+type SingleAppParenLambda
+    (
+        // Expr could be a single identifier or TypeApp
+        functionName: Expr,
+        parenLambda: ExprParenLambdaNode,
+        range
+    ) =
+    inherit NodeBase(range)
+    override this.Children = [| yield Expr.Node functionName; yield parenLambda |]
+    member x.FunctionName = functionName
+    member x.ParenLambda = parenLambda
+"""
diff --git a/src/Fantomas.Core/ASTTransformer.fs b/src/Fantomas.Core/ASTTransformer.fs
@@ -2072,7 +2072,7 @@ let mkSynUnionCase
         fullRange
     )
 
-let mkImplicitCtor creationAide vis (attrs: SynAttributeList list) pats (self: Ident option) (xmlDoc: PreXmlDoc) m =
+let mkImplicitCtor creationAide vis (attrs: SynAttributeList list) pats (self: Ident option) (xmlDoc: PreXmlDoc) =
     let openNode, closeNode =
         match pats with
         | SynSimplePats.SimplePats(range = StartEndRange 1 (mOpen, _, mClose))
@@ -2095,7 +2095,7 @@ let mkImplicitCtor creationAide vis (attrs: SynAttributeList list) pats (self: I
                         m
                     )
                 )
-            | SynSimplePat.Typed(SynSimplePat.Id(ident = ident; isOptional = isOptional), t, _) ->
+            | SynSimplePat.Typed(SynSimplePat.Id(ident = ident; isOptional = isOptional), t, m) ->
                 Some(
                     SimplePatNode(
                         mkAttributes creationAide [],
@@ -2105,7 +2105,7 @@ let mkImplicitCtor creationAide vis (attrs: SynAttributeList list) pats (self: I
                         m
                     )
                 )
-            | SynSimplePat.Id(ident = ident; isOptional = isOptional) ->
+            | SynSimplePat.Id(ident = ident; isOptional = isOptional; range = m) ->
                 Some(SimplePatNode(mkAttributes creationAide [], isOptional, mkIdent ident, None, m))
             | _ -> None)
 
@@ -2152,8 +2152,8 @@ let mkTypeDefn
 
             let implicitConstructorNode =
                 match implicitConstructor with
-                | Some(SynMemberDefn.ImplicitCtor(vis, attrs, pats, self, xmlDoc, m)) ->
-                    mkImplicitCtor creationAide vis attrs pats self xmlDoc m |> Some
+                | Some(SynMemberDefn.ImplicitCtor(vis, attrs, pats, self, xmlDoc, _)) ->
+                    mkImplicitCtor creationAide vis attrs pats self xmlDoc |> Some
                 | _ -> None
 
             let m =

diff --git a/src/Fantomas.Core/CodePrinter.fs b/src/Fantomas.Core/CodePrinter.fs
@@ -3136,6 +3136,7 @@ let genImplicitConstructor (node: ImplicitConstructorNode) =
         +> onlyIf node.IsOptional (!- "?")
         +> genSingleTextNode node.Identifier
         +> optSingle (fun t -> sepColon +> autoIndentAndNlnIfExpressionExceedsPageWidth (genType t)) node.Type
+        |> genNode node
 
     let shortPats = col sepComma node.Parameters genSimplePat