Skip to content

When a solution becomes unloaded, we should clear F#'s cache #6420

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

Merged
TIHan merged 1 commit into from
Apr 3, 2019
Merged

When a solution becomes unloaded, we should clear F#'s cache #6420

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
When a solution becomes unloaded, we should clear F#'s cache
  • Loading branch information
@TIHan
TIHan committed Apr 2, 2019
commit c037bfe5119ccffdec2757fede133fc7d813f75c
33 changes: 33 additions & 0 deletions vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,33 @@ type internal FSharpCheckerWorkspaceServiceFactory
member this.Checker = checkerProvider.Checker
member this.FSharpProjectOptionsManager = projectInfoManager }

[<Sealed>]
type private FSharpSolutionEvents(projectManager: FSharpProjectOptionsManager) =

interface IVsSolutionEvents with

member __.OnAfterCloseSolution(_) =
projectManager.Checker.ClearLanguageServiceRootCachesAndCollectAndFinalizeAllTransients()
VSConstants.S_OK

member __.OnAfterLoadProject(_, _) = VSConstants.E_NOTIMPL

member __.OnAfterOpenProject(_, _) = VSConstants.E_NOTIMPL

member __.OnAfterOpenSolution(_, _) = VSConstants.E_NOTIMPL

member __.OnBeforeCloseProject(_, _) = VSConstants.E_NOTIMPL

member __.OnBeforeCloseSolution(_) = VSConstants.E_NOTIMPL

member __.OnBeforeUnloadProject(_, _) = VSConstants.E_NOTIMPL

member __.OnQueryCloseProject(_, _, _) = VSConstants.E_NOTIMPL

member __.OnQueryCloseSolution(_, _) = VSConstants.E_NOTIMPL

member __.OnQueryUnloadProject(_, _) = VSConstants.E_NOTIMPL

[<Microsoft.CodeAnalysis.Host.Mef.ExportWorkspaceServiceFactory(typeof<EditorOptions>, Microsoft.CodeAnalysis.Host.Mef.ServiceLayer.Default)>]
type internal FSharpSettingsFactory
[<Composition.ImportingConstructor>] (settings: EditorOptions) =
Expand Down Expand Up @@ -143,6 +170,8 @@ type internal FSharpPackage() as this =
vfsiToolWindow <- this.FindToolWindow(typeof<Microsoft.VisualStudio.FSharp.Interactive.FsiToolWindow>, 0, true) :?> Microsoft.VisualStudio.FSharp.Interactive.FsiToolWindow
vfsiToolWindow :> Microsoft.VisualStudio.FSharp.Interactive.ITestVFSI

let mutable solutionEventsOpt = None

// FSI-LINKAGE-POINT: unsited init
do
Microsoft.VisualStudio.FSharp.Interactive.Hooks.fsiConsoleWindowPackageCtorUnsited (this :> Package)
Expand All @@ -165,9 +194,13 @@ type internal FSharpPackage() as this =
let projectInfoManager = this.ComponentModel.DefaultExportProvider.GetExport<FSharpProjectOptionsManager>().Value
let solution = this.GetServiceAsync(typeof<SVsSolution>).Result
let solution = solution :?> IVsSolution
let solutionEvents = FSharpSolutionEvents(projectInfoManager)
let rdt = this.GetServiceAsync(typeof<SVsRunningDocumentTable>).Result
let rdt = rdt :?> IVsRunningDocumentTable

solutionEventsOpt <- Some(solutionEvents)
solution.AdviseSolutionEvents(solutionEvents) |> ignore

let projectContextFactory = this.ComponentModel.GetService<IWorkspaceProjectContextFactory>()
let workspace = this.ComponentModel.GetService<VisualStudioWorkspace>()
let miscFilesWorkspace = this.ComponentModel.GetService<MiscellaneousFilesWorkspace>()
Expand Down