Enrich transformed Oak. (#2869)

fsprojects · Jun 20, 2023 · 62dadb3 · 62dadb3
1 parent 7f58913
commit 62dadb3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/Fantomas.Core.Tests/CodeFormatterTests.fs b/src/Fantomas.Core.Tests/CodeFormatterTests.fs
@@ -108,3 +108,22 @@ let b = 0
     match oak.ModulesOrNamespaces.[0].Declarations.[0] with
     | ModuleDecl.TopLevelBinding _ -> Assert.Pass()
     | _ -> Assert.Fail()
+
+[<Test>]
+let ``transform parsedInput contains trivia in Oak`` () =
+    let source =
+        """
+module A
+
+// foo
+let b = 0
+"""
+
+    let ast, _ =
+        Fantomas.FCS.Parse.parseFile false (FSharp.Compiler.Text.SourceText.ofString source) []
+
+    let oak = CodeFormatter.TransformAST(ast, source)
+
+    match oak.ModulesOrNamespaces.[0].Declarations.[0] with
+    | ModuleDecl.TopLevelBinding node -> Assert.True node.HasContentBefore
+    | _ -> Assert.Fail()
diff --git a/src/Fantomas.Core/CodeFormatter.fs b/src/Fantomas.Core/CodeFormatter.fs
@@ -81,7 +81,9 @@ type CodeFormatter =
     static member TransformAST ast = ASTTransformer.mkOak None ast
 
     static member TransformAST(ast, source) =
-        ASTTransformer.mkOak (Some(SourceText.ofString source)) ast
+        let sourceText = SourceText.ofString source
+        let oak = ASTTransformer.mkOak (Some sourceText) ast
+        Trivia.enrichTree FormatConfig.Default sourceText ast oak
 
     static member FormatOakAsync(oak: Oak) : Async<string> =
         async {