For CPS projects, stop invalidating on document open and document cha…

…nged. Also started re-using stamps for options if invalidateConfig was false.
dotnet · May 12, 2018 · a6fc852 · a6fc852
1 parent 0b06a7a
commit a6fc852
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs b/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs
@@ -175,7 +175,8 @@ type internal FSharpProjectOptionsManager
         projectOptionsTable.AddOrUpdateProject(projectId, (fun isRefresh ->
             let extraProjectInfo = Some(box workspace)
             let tryGetOptionsForReferencedProject f = f |> tryGetOrCreateProjectId |> Option.bind this.TryGetOptionsForProject |> Option.map(fun (_, _, projectOptions) -> projectOptions)
-            let referencedProjects, projectOptions = ProjectSitesAndFiles.GetProjectOptionsForProjectSite(Settings.LanguageServicePerformance.EnableInMemoryCrossProjectReferences, tryGetOptionsForReferencedProject, site, serviceProvider, (tryGetOrCreateProjectId (site.ProjectFileName)), site.ProjectFileName, extraProjectInfo,  Some projectOptionsTable, true)
+            let useUniqueStamp = invalidateConfig // Do not ask for a unique stamp if we are not invalidating, otherwise it would recompute lots of things, such as assemblies!
+            let referencedProjects, projectOptions = ProjectSitesAndFiles.GetProjectOptionsForProjectSite(Settings.LanguageServicePerformance.EnableInMemoryCrossProjectReferences, tryGetOptionsForReferencedProject, site, serviceProvider, (tryGetOrCreateProjectId (site.ProjectFileName)), site.ProjectFileName, extraProjectInfo,  Some projectOptionsTable, useUniqueStamp)
             if invalidateConfig then checkerProvider.Checker.InvalidateConfiguration(projectOptions, startBackgroundCompileIfAlreadySeen = not isRefresh, userOpName = userOpName + ".UpdateProjectInfo")
             let referencedProjectIds = referencedProjects |> Array.choose tryGetOrCreateProjectId
             let parsingOptions, _ = checkerProvider.Checker.GetParsingOptionsFromProjectOptions(projectOptions)
@@ -675,7 +676,8 @@ type internal FSharpLanguageService(package : FSharpPackage) =
                             let fileContents = VsTextLines.GetFileContents(textLines, textViewAdapter)
                             this.SetupStandAloneFile(filename, fileContents, this.Workspace, hier)
                     | id ->
-                        projectInfoManager.UpdateProjectInfoWithProjectId(id.ProjectId, "SetupNewTextView", invalidateConfig=true)
+                        // Do not invalidate on document open. We only want to invalidate when the workspace tells us to via, DocumentAdded, DocumentReloaded, etc. - Also when HandleCommandLineChanges gets called.
+                        projectInfoManager.UpdateProjectInfoWithProjectId(id.ProjectId, "SetupNewTextView", invalidateConfig=false)
                 | _ ->
                     let fileContents = VsTextLines.GetFileContents(textLines, textViewAdapter)
                     this.SetupStandAloneFile(filename, fileContents, this.Workspace, hier)

diff --git a/vsintegration/src/FSharp.Editor/LanguageService/ProjectSitesAndFiles.fs b/vsintegration/src/FSharp.Editor/LanguageService/ProjectSitesAndFiles.fs
@@ -283,7 +283,7 @@ type internal ProjectSitesAndFiles() =
                 UnresolvedReferences = None
                 OriginalLoadReferences = []
                 ExtraProjectInfo=extraProjectInfo 
-                Stamp = if useUniqueStamp then (stamp <- stamp + 1L; Some stamp) else None 
+                Stamp = if useUniqueStamp then (stamp <- stamp + 1L; Some stamp) else Some stamp
             }
             match projectId, projectOptionsTable with
             | Some id, Some optionsTable ->