Use findFirstNodeAfterLine to assign Directive trivia. Fixes #1597. (#…

…1600)
fsprojects · Apr 4, 2021 · 7adf48f · 7adf48f
1 parent 21b45bd
commit 7adf48f
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 11 deletions.
diff --git a/src/Fantomas.Tests/CompilerDirectivesTests.fs b/src/Fantomas.Tests/CompilerDirectivesTests.fs
@@ -2451,3 +2451,51 @@ let inputFileFlagsFsiBase (_tcConfigB: TcConfigBuilder) =
     List.empty<CompilerOption>
 #endif
 """
+
+[<Test>]
+let ``define before opening bracket of array, 1597`` () =
+    formatSourceString
+        false
+        """
+    let Environment = { new IEnvironment with
+        member _.IsWindows() =
+            InteropServices.RuntimeInformation.IsOSPlatform(InteropServices.OSPlatform.Windows)
+
+        member _.GetScriptArgs() =
+    #if INTERACTIVE
+            fsi.CommandLineArgs
+            |> Array.skip 1
+    #else
+            [||]
+    #endif
+
+        member _.GetEnvironmentVariable(varName) =
+            System.Environment.GetEnvironmentVariable(varName)
+
+        member _.SetEnvironmentVariable(varName, value) =
+            System.Environment.SetEnvironmentVariable(varName, value)
+    }
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+let Environment =
+    { new IEnvironment with
+        member _.IsWindows() =
+            InteropServices.RuntimeInformation.IsOSPlatform(InteropServices.OSPlatform.Windows)
+
+        member _.GetScriptArgs() =
+#if INTERACTIVE
+            fsi.CommandLineArgs |> Array.skip 1
+#else
+            [||]
+#endif
+
+        member _.GetEnvironmentVariable(varName) =
+            System.Environment.GetEnvironmentVariable(varName)
+
+        member _.SetEnvironmentVariable(varName, value) =
+            System.Environment.SetEnvironmentVariable(varName, value) }
+"""
diff --git a/src/Fantomas/Trivia.fs b/src/Fantomas/Trivia.fs
@@ -56,20 +56,18 @@ let inline private isNotMemberKeyword (node: TriviaNodeAssigner) =
 
 let private findFirstNodeAfterLine
     (nodes: TriviaNodeAssigner list)
-    lineNumber
-    hasAnonModulesAndOpenStatements
+    (lineNumber: int)
+    (hasAnonModulesAndOpenStatements: bool)
     : TriviaNodeAssigner option =
     nodes
     |> List.tryFind
         (fun tn ->
-            if tn.Range.StartLine > lineNumber
-               && isNotMemberKeyword tn then
-                not (
-                    hasAnonModulesAndOpenStatements
-                    && mainNodeIs SynModuleOrNamespace_AnonModule tn
-                )
-            else
-                false)
+            tn.Range.StartLine > lineNumber
+            && isNotMemberKeyword tn
+            && not (
+                hasAnonModulesAndOpenStatements
+                && mainNodeIs SynModuleOrNamespace_AnonModule tn
+            ))
 
 let private findLastNodeOnLine (nodes: TriviaNodeAssigner list) lineNumber : TriviaNodeAssigner option =
     nodes
@@ -433,7 +431,7 @@ let private addTriviaToTriviaNode
         match triviaBetweenAttributeAndParentBinding triviaNodes range.StartLine with
         | Some _ as node -> updateTriviaNode (fun tn -> tn.ContentAfter.Add(directive)) triviaNodes node
         | _ ->
-            match findNodeAfterLineAndColumn triviaNodes range.EndLine range.EndColumn with
+            match findFirstNodeAfterLine triviaNodes range.StartLine hasAnonModulesAndOpenStatements with
             | Some _ as node -> updateTriviaNode (fun tn -> tn.ContentBefore.Add(directive)) triviaNodes node
             | None ->
                 let findNode nodes =