Add newline between assembly level attributes. Fixes fsprojects#796

nojaf · May 1, 2020 · cbd354f · cbd354f
1 parent 7a6d380
commit cbd354f
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 3 deletions.
diff --git a/src/Fantomas.Tests/AttributeTests.fs b/src/Fantomas.Tests/AttributeTests.fs
@@ -305,4 +305,32 @@ let main argv =
     |> Array.map getJsonNetJson
     |> Array.iter(printfn "%s")
     0 // return an integer exit code
+"""
+
+[<Test>]
+let ``multiple assembly attributes, 796`` () =
+    formatSourceString false """namespace Foo.AssemblyInfo
+
+open System.Reflection
+open System.Runtime.CompilerServices
+open System.Runtime.InteropServices
+
+[<assembly: AssemblyTitle("Foo")>]
+[<assembly: AssemblyDescription("")>]
+
+do
+  ()
+"""  config
+    |> prepend newline
+    |> should equal """
+namespace Foo.AssemblyInfo
+
+open System.Reflection
+open System.Runtime.CompilerServices
+open System.Runtime.InteropServices
+
+[<assembly:AssemblyTitle("Foo")>]
+[<assembly:AssemblyDescription("")>]
+
+do ()
 """
diff --git a/src/Fantomas/CodePrinter.fs b/src/Fantomas/CodePrinter.fs
@@ -278,9 +278,25 @@ and genSigModuleDeclList astContext node =
 and genModuleDecl astContext (node: SynModuleDecl) =
     match node with
     | Attributes(ats) ->
-        col sepNone ats
-            (fun a -> col sepNln a.Attributes (genAttribute astContext)
-                      |> genTrivia a.Range)
+        fun ctx ->
+            let attributesExpr =
+                // attributes can have trivia content before or after
+                // we do extra detection to ensure no additional newline is introduced
+                // first attribute should not have a newline anyway
+                List.fold (fun (prevContentAfterPresent, prevExpr) (a: SynAttributeList) ->
+                    let expr =
+                        ifElse prevContentAfterPresent sepNone (sepNlnConsideringTriviaContentBefore a.Range)
+                        +> ((col sepNln a.Attributes (genAttribute astContext)) |> genTrivia a.Range)
+
+                    let hasContentAfter =
+                        TriviaHelpers.``has content after after that matches``
+                            (fun tn -> tn.Range = a.Range)
+                            (function | Directive(_) -> true | _ -> false)
+                            ctx.Trivia
+                    (hasContentAfter, prevExpr +> expr)
+                ) (true, sepNone) ats
+                |> snd
+            (attributesExpr +> dumpAndContinue) ctx
     | DoExpr(e) ->
         genExpr astContext e
     | Exception(ex) ->