Properly dispose panel references (152)

deephaven · Nov 13, 2024 · 735b623 · 735b623
1 parent 1c0ea10
commit 735b623
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/controllers/ExtensionController.ts b/src/controllers/ExtensionController.ts
@@ -382,6 +382,7 @@ export class ExtensionController implements Disposable {
 
     this._serverManager.onDidDisconnect(
       serverUrl => {
+        this._panelService?.clearServerData(serverUrl);
         this._outputChannel?.appendLine(
           `Disconnected from server: '${serverUrl}'.`
         );

diff --git a/src/services/PanelService.ts b/src/services/PanelService.ts
@@ -22,8 +22,14 @@ export class PanelService implements IPanelService, Disposable {
   private readonly _cnPanelMap: URLMap<VariablePanelMap>;
   private readonly _cnVariableMap: URLMap<VariableMap>;
 
+  clearServerData = (url: URL): void => {
+    this._cnPanelMap.delete(url);
+    this._cnVariableMap.delete(url);
+  };
+
   dispose = async (): Promise<void> => {
     this._cnPanelMap.clear();
+    this._cnVariableMap.clear();
   };
 
   /**

diff --git a/src/types/serviceTypes.d.ts b/src/types/serviceTypes.d.ts
@@ -110,6 +110,7 @@ export type IDheServiceFactory = IFactory<IDheService, [serverUrl: URL]>;
 export interface IPanelService extends Disposable {
   readonly onDidUpdate: vscode.Event<void>;
 
+  clearServerData: (url: URL) => void;
   getPanelUrls: () => URL[];
   getPanelVariables: (url: URL) => VariableDefintion[];
   getPanelOrThrow: (url: URL, variableId: VariableID) => vscode.WebviewPanel;