Print trivia for all lids in genLidsWithDots. Fixes #2098. (#2099)

fsprojects · Feb 16, 2022 · 840e11b · 840e11b
1 parent decb31b
commit 840e11b
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 3 deletions.
diff --git a/src/Fantomas.Tests/DotGetTests.fs b/src/Fantomas.Tests/DotGetTests.fs
@@ -1300,3 +1300,63 @@ db
             .Select(fun x -> x.Id)
     )
 """
+
+[<Test>]
+let ``trivia between LongIdentWithDots in DotGet, 2098`` () =
+    formatSourceString
+        false
+        """
+namespace PmaBolero.Client
+
+open Microsoft.AspNetCore.Components.WebAssembly.Hosting
+open Microsoft.Extensions.DependencyInjection.Extensions
+open Bolero.Remoting.Client
+
+module Program =
+
+    [<EntryPoint>]
+    let Main args =
+        let builder = WebAssemblyHostBuilder.CreateDefault(args)
+        builder.RootComponents.Add<Pages.Main.MyApp>("#main")
+        builder.Services
+            .AddRemoting(builder.HostEnvironment)
+            .Services
+#if (!DEBUG)
+            .RemoveAll<Microsoft.Extensions.Http.IHttpMessageHandlerBuilderFilter>()
+#endif
+            |> ignore
+        builder.Build().RunAsync() |> ignore
+        0
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+namespace PmaBolero.Client
+
+open Microsoft.AspNetCore.Components.WebAssembly.Hosting
+open Microsoft.Extensions.DependencyInjection.Extensions
+open Bolero.Remoting.Client
+
+module Program =
+
+    [<EntryPoint>]
+    let Main args =
+        let builder = WebAssemblyHostBuilder.CreateDefault(args)
+        builder.RootComponents.Add<Pages.Main.MyApp>("#main")
+
+        builder
+            .Services
+            .AddRemoting(
+                builder.HostEnvironment
+            )
+            .Services
+#if (!DEBUG)
+            .RemoveAll<Microsoft.Extensions.Http.IHttpMessageHandlerBuilderFilter>()
+#endif
+        |> ignore
+
+        builder.Build().RunAsync() |> ignore
+        0
+"""
diff --git a/src/Fantomas/CodePrinter.fs b/src/Fantomas/CodePrinter.fs
@@ -2832,9 +2832,7 @@ and genExprInMultilineInfixExpr astContext e =
     | _ -> genExpr astContext e
 
 and genLidsWithDots (lids: (string * range) list) =
-    optSingle (fun (_, r) -> enterNodeFor Ident_ r) (List.tryHead lids)
-    +> !- "."
-    +> col !- "." lids (fun (s, _) -> !-s)
+    col sepNone lids (fun (s, r) -> genTriviaFor Ident_ r !- $".{s}")
 
 and genLidsWithDotsAndNewlines (lids: (string * range) list) =
     col sepNln lids (fun (s, r) -> genTriviaFor Ident_ r !- $".{s}")