Keep track of newline inside trivia via special event WriteLineInside…

…Trivia. Fixes #1538. (#1752)
fsprojects · May 25, 2021 · b4ccb7b · b4ccb7b
1 parent 8611499
commit b4ccb7b
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/src/Fantomas.Tests/ColMultilineItemTests.fs b/src/Fantomas.Tests/ColMultilineItemTests.fs
@@ -527,3 +527,28 @@ let a = p
 let i = 0
 let y = p
 """
+
+[<Test>]
+let ``two short application followed by trailing block comment, 1538`` () =
+    formatSourceString
+        false
+        """
+printfn "%s" @"c:\def\ghi\jkl"
+printfn "%s" "c:\\def\\ghi\\jkl"
+
+(*
+xyz
+*)
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+printfn "%s" @"c:\def\ghi\jkl"
+printfn "%s" "c:\\def\\ghi\\jkl"
+
+(*
+xyz
+*)
+"""
diff --git a/src/Fantomas/Context.fs b/src/Fantomas/Context.fs
@@ -15,6 +15,7 @@ type WriterEvent =
     | WriteLineInsideStringConst
     | WriteBeforeNewline of string
     | WriteLineBecauseOfTrivia
+    | WriteLineInsideTrivia
     | IndentBy of int
     | UnIndentBy of int
     | SetIndent of int
@@ -94,7 +95,8 @@ module WriterModel =
             match cmd with
             | WriteLine
             | WriteLineBecauseOfTrivia -> doNewline m
-            | WriteLineInsideStringConst ->
+            | WriteLineInsideStringConst
+            | WriteLineInsideTrivia ->
                 { m with
                       Lines = "" :: m.Lines
                       Column = 0 }
@@ -150,9 +152,14 @@ module WriterEvents =
     let normalize ev =
         match ev with
         | Write s when s.Contains("\n") ->
+            let writeLine =
+                match ev with
+                | CommentOrDefineEvent _ -> WriteLineInsideTrivia
+                | _ -> WriteLineInsideStringConst
+
             s.Split('\n')
             |> Seq.map (fun x -> [ Write x ])
-            |> Seq.reduce (fun x y -> x @ [ WriteLineInsideStringConst ] @ y)
+            |> Seq.reduce (fun x y -> x @ [ writeLine ] @ y)
             |> Seq.toList
         | _ -> [ ev ]