Attach trivia to node after when node before is on the previous line. (…

…#2662) * Attach trivia to node after when node before is on the previous line. * Remove unused case, swap order.
fsprojects · Dec 26, 2022 · e9f1524 · e9f1524
1 parent 871e165
commit e9f1524
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/src/Fantomas.Core.Tests/CommentTests.fs b/src/Fantomas.Core.Tests/CommentTests.fs
@@ -2576,3 +2576,19 @@ type MyType2 =
         =
         inputA
 """
+
+[<Test>]
+let ``block comment before unit in binding, 2660`` () =
+    formatSourceString
+        false
+        """
+let run (log: ILogger) =
+    (* foo *)  ()
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+let run (log: ILogger) = (* foo *) ()
+"""
diff --git a/src/Fantomas.Core/Flowering.fs b/src/Fantomas.Core/Flowering.fs
@@ -284,13 +284,18 @@ let blockCommentToTriviaInstruction (containerNode: Node) (trivia: TriviaNode) :
 
     match nodeBefore, nodeAfter with
     | Some nb, None when nb.Range.EndLine = trivia.Range.StartLine -> nb.AddAfter(triviaWith false false)
-    | Some nb, Some na when
-        (nb.Range.EndLine < trivia.Range.StartLine
-         && na.Range.StartLine > trivia.Range.EndLine)
-        ->
-        nb.AddBefore(triviaWith true true)
-    | Some nb, _ when nb.Range.EndLine = trivia.Range.StartLine -> nb.AddAfter(triviaWith false false)
     | None, Some na -> na.AddBefore(triviaWith true false)
+    | Some nb, Some na ->
+        if nb.Range.EndLine = trivia.Range.StartLine then
+            // before (* comment *) after
+            nb.AddAfter(triviaWith false false)
+        elif
+            (nb.Range.EndLine < trivia.Range.StartLine
+             && trivia.Range.EndLine = na.Range.StartLine)
+        then
+            // before
+            // (* comment *) after
+            na.AddBefore(triviaWith false false)
     | _ -> ()
 
 let addToTree (tree: Oak) (trivia: TriviaNode seq) =