Don't consider attribute above field a proper candidate for trivia af…

…ter. Fixes #910 (#912)
fsprojects · Jun 12, 2020 · 09c842e · 09c842e
1 parent 5453abd
commit 09c842e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/src/Fantomas.Tests/TypeDeclarationTests.fs b/src/Fantomas.Tests/TypeDeclarationTests.fs
@@ -1306,4 +1306,25 @@ type VersionMismatchDuringDeserializationException(message: string, innerExcepti
 type VersionMismatchDuringDeserializationException(message : string,
                                                    innerException : System.Exception) =
     inherit System.Exception(message, innerException)
-"""
+"""
+
+[<Test>]
+let ``type record declaration with attributes, 910`` () =
+    formatSourceString false """type Commenter =
+    { [<JsonProperty("display_name")>]
+      DisplayName: string }
+
+type Message =
+    { [<JsonProperty("body")>]
+      Body: string }
+"""  config
+    |> prepend newline
+    |> should equal """
+type Commenter =
+    { [<JsonProperty("display_name")>]
+      DisplayName: string }
+
+type Message =
+    { [<JsonProperty("body")>]
+      Body: string }
+"""
diff --git a/src/Fantomas/Trivia.fs b/src/Fantomas/Trivia.fs
@@ -204,19 +204,25 @@ let private triviaBetweenAttributeAndParentBinding (triviaNodes: TriviaNodeAssig
             | MainNode("SynModuleSigDecl.NestedModule")
             | MainNode("ValSpfn")
             | MainNode("SynMemberDefn.Member")
-            | MainNode("SynMemberDefn.LetBindings") -> true
+            | MainNode("SynMemberDefn.LetBindings")
+            | MainNode("Field") -> true
             | _ -> false
         )
         |> List.pairwise
+
     filteredNodes |> List.tryFind (function
+        | f, a when (f.Type = MainNode("Field")
+                     && a.Type = MainNode("SynAttributeList")
+                     && f.Range.StartLine = a.Range.StartLine
+                     && a.Range.StartLine + 1 = f.Range.EndLine) -> true
         | a, p when (a.Type = MainNode("SynAttributeList") && a.Range.StartLine < line && a.Range.StartLine = a.Range.EndLine) ->
             match p.Type with
               | MainNode("SynModuleDecl.Let") when (p.Range.StartLine > line) -> true
               | MainNode("SynAttributeList") when (p.Range.StartLine > line) -> true
               | MainNode("SynModuleDecl.Types") when (p.Range.StartLine > line) -> true
               | _ -> false
         | _ -> false)
-    |> Option.map fst
+    |> Option.bind (fun (a,_) -> if a.Type = MainNode("SynAttributeList") then Some a else None)
 
 let private findASTNodeOfTypeThatContains (nodes: TriviaNodeAssigner list) typeName range =
     nodes