Skip to content

Commit

Permalink
Replace previous commit with new fix
Browse files Browse the repository at this point in the history
  • Loading branch information
alfonsogarciacaro committed Jun 27, 2016
1 parent f40d819 commit 2dfa90a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions src/fsharp/CompileOps.fs
Original file line number Diff line number Diff line change
Expand Up @@ -4947,8 +4947,7 @@ module private ScriptPreprocessClosure =
[ClosedSourceFile(filename,m,None,[],[],[])] // Don't traverse into .fs leafs.

let loadedSources = (!tcConfig).GetAvailableLoadedSources() |> List.rev |> List.map AddFileIfNotSeen |> List.concat
(loadedSources |> List.map FindClosure |> List.concat)
@ [ClosedSourceFile(filename,m,Some(input),!errors,!warnings,!noWarns)]
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.
| None -> [ClosedSourceFile(filename,m,None,!errors,!warnings,[])]

closureDirectives |> List.map FindClosure |> List.concat, !tcConfig
Expand Down Expand Up @@ -5010,7 +5009,7 @@ module private ScriptPreprocessClosure =
let rootWarnings = rootWarnings |> List.filter isRootRange

let result : LoadClosure =
{ SourceFiles = List.groupByFirst !sourceFiles |> List.rev
{ SourceFiles = List.groupByFirst !sourceFiles
References = List.groupByFirst references
UnresolvedReferences = unresolvedReferences
Inputs = !sourceInputs
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/vs/service.fs
Original file line number Diff line number Diff line change
Expand Up @@ -2549,7 +2549,7 @@ type BackgroundCompiler(projectCacheSize, keepAssemblyContents, keepAllBackgroun
let co =
{
ProjectFileName = filename + ".fsproj" // Make a name that is unique in this directory.
ProjectFileNames = fas.SourceFiles |> List.map fst |> List.toArray
ProjectFileNames = fas.Inputs |> List.map fst |> List.toArray
OtherOptions = otherFlags
ReferencedProjects= [| |]
IsIncompleteTypeCheckEnvironment = false
Expand Down

0 comments on commit 2dfa90a

Please sign in to comment.