Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 631 #657

Merged
merged 3 commits into from
Jan 17, 2017
Merged

Fix 631 #657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba78ba3
Fix 631
dsyme Oct 21, 2016
f09e4aa
Fix 631
dsyme Oct 21, 2016
4f78d3b
Fix 631
dsyme Oct 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/fsharp/fsi/fsi.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1513,14 +1513,11 @@ module internal MagicAssemblyResolution =

let Install(tcConfigB, tcImports: TcImports, fsiDynamicCompiler: FsiDynamicCompiler, fsiConsoleOutput: FsiConsoleOutput) =

let rangeStdin = rangeN Lexhelp.stdinMockFilename 0

#if TODO_REWORK_ASSEMBLY_LOAD
ignore tcConfigB
ignore tcImports
ignore fsiDynamicCompiler
ignore fsiConsoleOutput
ignore rangeStdin
{ new System.IDisposable with
member x.Dispose() = () }
#else
Expand Down Expand Up @@ -2459,7 +2456,7 @@ type FsiEvaluationSession (fsi: FsiEvaluationSessionHostConfig, argv:string[], i

/// The single, global interactive checker that can be safely used in conjunction with other operations
/// on the FsiEvaluationSession.
let checker = FSharpChecker.Create()
let checker = FSharpChecker.Create(msbuildEnabled=msbuildEnabled)

let (tcGlobals,frameworkTcImports,nonFrameworkResolutions,unresolvedReferences) =
try
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/vs/service.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2718,7 +2718,7 @@ type FSharpChecker(referenceResolver, projectCacheSize, keepAssemblyContents, ke

let backgroundCompiler = BackgroundCompiler(referenceResolver, projectCacheSize, keepAssemblyContents, keepAllBackgroundResolutions)

static let globalInstance = FSharpChecker.Create()
static let globalInstance = lazy FSharpChecker.Create()

// Parse using backgroundCompiler
let ComputeBraceMatching(filename:string,source,options:FSharpProjectOptions) =
Expand Down Expand Up @@ -2989,7 +2989,7 @@ type FSharpChecker(referenceResolver, projectCacheSize, keepAssemblyContents, ke
bc.ParseFileInProject(filename, source, options)
|> Async.RunSynchronously

static member Instance = globalInstance
static member Instance = globalInstance.Value
member internal __.FrameworkImportsCache = backgroundCompiler.FrameworkImportsCache


Expand Down