Don't add new line before SynAttributeList when previous SynAttribute…

…List had content after. Fixes fsprojects#1108.
nojaf · Sep 5, 2020 · f8c092e · f8c092e
1 parent de00dc4
commit f8c092e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/src/Fantomas.Tests/ModuleTests.fs b/src/Fantomas.Tests/ModuleTests.fs
@@ -512,3 +512,35 @@ namespace foo.quz
 // bar
 // baz
 """
+
+[<Test>]
+let ``don't add extra new lines between comments and attributes, 1108`` () =
+    formatSourceString false """
+namespace Foo
+
+// First
+[<someAnnotation>]
+
+// Second
+[<someAnnotation>]
+
+// Third
+[<someAnnotation>]
+
+do ()
+"""  config
+    |> prepend newline
+    |> should equal """
+namespace Foo
+
+// First
+[<someAnnotation>]
+
+// Second
+[<someAnnotation>]
+
+// Third
+[<someAnnotation>]
+
+do ()
+"""
diff --git a/src/Fantomas/CodePrinter.fs b/src/Fantomas/CodePrinter.fs
@@ -351,6 +351,8 @@ and genModuleDecl astContext (node: SynModuleDecl) =
                     let hasContentAfter =
                         TriviaHelpers.``has content after after that matches`` (fun tn ->
                             RangeHelpers.rangeEq tn.Range a.Range) (function
+                            | Newline
+                            | Comment (LineCommentOnSingleLine (_))
                             | Directive (_) -> true
                             | _ -> false) (Map.tryFindOrEmptyList SynAttributeList_ ctx.TriviaMainNodes)