Merge pull request #657 from dsyme/fix-666

Fix 631
fsharp · Jan 17, 2017 · 52ccde3 · 52ccde3
2 parents f654890 + 4f78d3b
commit 52ccde3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/fsharp/fsi/fsi.fs b/src/fsharp/fsi/fsi.fs
@@ -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
@@ -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 

diff --git a/src/fsharp/vs/service.fs b/src/fsharp/vs/service.fs
@@ -2725,7 +2725,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) = 
@@ -2996,7 +2996,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