Skip to content

Commit 8a57cd7

Browse files
Replace previous commit with new fix
1 parent 5427488 commit 8a57cd7

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/fsharp/CompileOps.fs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5005,8 +5005,7 @@ module private ScriptPreprocessClosure =
50055005
[ClosedSourceFile(filename,m,None,[],[],[])] // Don't traverse into .fs leafs.
50065006

50075007
let loadedSources = (!tcConfig).GetAvailableLoadedSources() |> List.rev |> List.map AddFileIfNotSeen |> List.concat
5008-
(loadedSources |> List.map FindClosure |> List.concat)
5009-
@ [ClosedSourceFile(filename,m,Some(input),!errors,!warnings,!noWarns)]
5008+
ClosedSourceFile(filename,m,Some(input),!errors,!warnings,!noWarns) :: loadedSources |> List.map FindClosure |> List.concat // Final closure is in reverse order. Keep the closed source at the top.
50105009
| None -> [ClosedSourceFile(filename,m,None,!errors,!warnings,[])]
50115010

50125011
closureDirectives |> List.map FindClosure |> List.concat, !tcConfig
@@ -5068,7 +5067,7 @@ module private ScriptPreprocessClosure =
50685067
let rootWarnings = rootWarnings |> List.filter isRootRange
50695068

50705069
let result : LoadClosure =
5071-
{ SourceFiles = List.groupByFirst !sourceFiles |> List.rev
5070+
{ SourceFiles = List.groupByFirst !sourceFiles
50725071
References = List.groupByFirst references
50735072
UnresolvedReferences = unresolvedReferences
50745073
Inputs = !sourceInputs

src/fsharp/vs/service.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2546,7 +2546,7 @@ type BackgroundCompiler(projectCacheSize, keepAssemblyContents, keepAllBackgroun
25462546
let co =
25472547
{
25482548
ProjectFileName = filename + ".fsproj" // Make a name that is unique in this directory.
2549-
ProjectFileNames = fas.SourceFiles |> List.map fst |> List.toArray
2549+
ProjectFileNames = fas.Inputs |> List.map fst |> List.toArray
25502550
OtherOptions = otherFlags
25512551
ReferencedProjects= [| |]
25522552
IsIncompleteTypeCheckEnvironment = false

0 commit comments

Comments
 (0)