Fix some errors - force .fsi files to depend on all previous .fsi fil…

…es (short-term fix)
safesparrow · Nov 4, 2022 · fcc7537 · fcc7537
1 parent 9f83dc3
commit fcc7537
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/Compiler/Facilities/DiagnosticsLogger.fs b/src/Compiler/Facilities/DiagnosticsLogger.fs
@@ -343,6 +343,7 @@ type CapturingDiagnosticsLogger(nm, ?eagerFormat) =
             | Some f -> f diagnostic
 
         if severity = FSharpDiagnosticSeverity.Error then
+            printfn $"\r\nERROR {diagnostic.Exception.Message}\r\n"
             errorCount <- errorCount + 1
 
         diagnostics.Add(diagnostic, severity)

diff --git a/tests/ParallelTypeCheckingTests/Code/DepResolving.fs b/tests/ParallelTypeCheckingTests/Code/DepResolving.fs
@@ -147,6 +147,10 @@ module internal AutomatedDependencyResolving =
 
         let trie = buildTrie nodes
 
+        let fsiFiles =
+            nodes
+            |> Array.filter (fun f -> f.File.Name.EndsWith ".fsi")
+
         let processFile (node : FileData) =
             let deps =
                 let fsiDep =
@@ -224,6 +228,13 @@ module internal AutomatedDependencyResolving =
                     moduleRefs
                     |> Array.iter processRef
 
+                    // Force .fsi files to depend on all other (previous) .fsi files - avoids the issue of TcEnv being overriden  
+                    let additionalFsiDeps =
+                        if node.File.Name.EndsWith ".fsi" then
+                            fsiFiles
+                        else
+                            [||]
+
                     // Collect files from all reachable TrieNodes
                     let deps =
                         reachable
@@ -233,6 +244,7 @@ module internal AutomatedDependencyResolving =
                         // For starters: can module abbreviations affect other files?
                         // If not, then the below is not necessary.
                         |> Seq.append filesWithModuleAbbreviations
+                        |> Seq.append additionalFsiDeps
                         |> Seq.append fsiDep
                         |> Seq.map (fun f -> f.File)
                         |> Seq.toArray