preserve data when webviews are moved

Author: connor4312

.vscode/launch.json

@@ -13,7 +13,7 @@
       "debugWebviews": true,
       "cwd": "${workspaceFolder}/packages/vscode-js-profile-flame",
       "rendererDebugOptions": {
-        "webRoot": "${workspaceFolder}/packages/vscode-js-profile-table"
+        "webRoot": "${workspaceFolder}/packages/vscode-js-profile-flame"
       },
       "args": [
         "--extensionDevelopmentPath=${workspaceFolder}/packages/vscode-js-profile-table",

packages/vscode-js-profile-flame/src/extension.ts

@@ -34,7 +34,6 @@ export function activate(context: vscode.ExtensionContext) {
 
     vscode.workspace.onDidChangeConfiguration(evt => {
       if (allConfig.some(c => evt.affectsConfiguration(c))) {
-        realtime.updateSettings();
         realtimeTracker.updateSettings();
       }
     }),

packages/vscode-js-profile-flame/src/realtimeSessionTracker.ts

@@ -42,7 +42,6 @@ export class RealtimeSessionTracker {
   private webviews = new Set<vscode.WebviewView>();
   private sessionData = new Map<vscode.DebugSession, ISessionData>();
   private displayedSession?: vscode.DebugSession;
-  private hasVisibleSession = false;
 
   /**
    * Returns any realtime metric webviews that are currently visible.
@@ -56,16 +55,18 @@ export class RealtimeSessionTracker {
    */
   public trackWebview(webview: vscode.WebviewView) {
     this.webviews.add(webview);
+
     webview.onDidChangeVisibility(() => {
-      this.recalcVisibility();
+      if (webview.visible) {
+        this.hydrate(webview.webview);
+      }
     });
 
     webview.onDidDispose(() => {
       this.webviews.delete(webview);
-      this.recalcVisibility();
     });
 
-    this.recalcVisibility();
+    this.hydrate(webview.webview);
   }
 
   /**
@@ -98,7 +99,7 @@ export class RealtimeSessionTracker {
     }
 
     this.displayedSession = session;
-    this.postMessage({ type: MessageType.ApplyData, data: data.metrics.map(m => m.metrics) });
+    this.broadcast({ type: MessageType.ApplyData, data: data.metrics.map(m => m.metrics) });
   }
 
   /**
@@ -129,6 +130,8 @@ export class RealtimeSessionTracker {
         metric.reset(steps + 3); // no-ops if the steps are already the same
       }
     }
+
+    this.broadcast({ type: MessageType.UpdateSettings, settings: this.settings });
   }
 
   private collectFromSession(data: ISessionData) {
@@ -163,26 +166,34 @@ export class RealtimeSessionTracker {
     }
 
     if (session === this.displayedSession) {
-      this.postMessage({ type: MessageType.AddData, data: v });
+      this.broadcast({ type: MessageType.AddData, data: v });
     }
   }
 
-  private postMessage(message: ToWebViewMessage) {
+  private broadcast(message: ToWebViewMessage) {
     for (const webview of this.visibleWebviews) {
       webview.webview.postMessage(message);
     }
   }
 
-  private recalcVisibility() {
-    const wasVisible = this.hasVisibleSession;
-    const visible = [...this.webviews].some(w => w.visible);
-    this.hasVisibleSession = visible;
-    if (visible && !wasVisible) {
-      this.onDidChangeActiveSession(vscode.debug.activeDebugSession);
-    } else if (!visible) {
-      for (const session of this.sessionData.keys()) {
-        this.onSessionDidEnd(session);
-      }
+  private hydrate(webview: vscode.Webview) {
+    webview.postMessage(this.getSettingsUpdate());
+
+    const data = this.displayedSession && this.sessionData.get(this.displayedSession);
+    if (!data) {
+      return;
     }
+
+    const metrics: ToWebViewMessage = {
+      type: MessageType.ApplyData,
+      data: data.metrics.map(m => m.metrics),
+    };
+    webview.postMessage(metrics);
+  }
+
+  private getSettingsUpdate() {
+    const settings = readRealtimeSettings();
+    const message: ToWebViewMessage = { type: MessageType.UpdateSettings, settings };
+    return message;
   }
 }

packages/vscode-js-profile-flame/src/realtimeWebviewProvider.ts

@@ -4,8 +4,8 @@
 
 import { randomBytes } from 'crypto';
 import * as vscode from 'vscode';
-import { FromWebViewMessage, MessageType, ToWebViewMessage } from './realtime/protocol';
-import { readRealtimeSettings, RealtimeSessionTracker } from './realtimeSessionTracker';
+import { FromWebViewMessage, MessageType } from './realtime/protocol';
+import { RealtimeSessionTracker } from './realtimeSessionTracker';
 
 const enabledMetricsKey = 'enabledMetrics';
 
@@ -18,16 +18,6 @@ export class RealtimeWebviewProvider implements vscode.WebviewViewProvider {
     private readonly tracker: RealtimeSessionTracker,
   ) {}
 
-  /**
-   * Pushes a settings up to all active webviews.
-   */
-  public updateSettings() {
-    const message = this.getSettingsUpdate();
-    for (const view of this.tracker.visibleWebviews) {
-      view.webview.postMessage(message);
-    }
-  }
-
   /**
    * @inheritdoc
    */
@@ -39,14 +29,6 @@ export class RealtimeWebviewProvider implements vscode.WebviewViewProvider {
     webviewView.webview.html = this.getHtmlForWebview(webviewView.webview);
     this.tracker.trackWebview(webviewView);
 
-    webviewView.onDidChangeVisibility(() => {
-      if (webviewView.visible) {
-        webviewView.webview.postMessage(this.getSettingsUpdate());
-      }
-    });
-
-    webviewView.webview.postMessage(this.getSettingsUpdate());
-
     webviewView.webview.onDidReceiveMessage((evt: FromWebViewMessage) => {
       switch (evt.type) {
         case MessageType.SetEnabledMetrics:
@@ -58,12 +40,6 @@ export class RealtimeWebviewProvider implements vscode.WebviewViewProvider {
     });
   }
 
-  private getSettingsUpdate() {
-    const settings = readRealtimeSettings();
-    const message: ToWebViewMessage = { type: MessageType.UpdateSettings, settings };
-    return message;
-  }
-
   private getHtmlForWebview(webview: vscode.Webview) {
     const scriptUri = webview.asWebviewUri(
       vscode.Uri.joinPath(this.extensionUri, 'out', 'realtime.bundle.js'),