Allow multiple waveform providers

Author: TheZoq2

src/debugger.ts

@@ -22,7 +22,9 @@ export class CXXRTLDebugger {
     private statusBarItem: StatusBarItem;
     private terminal: vscode.Terminal | null = null;
     session: Session | null = null;
-    waveformProvider: WaveformProvider | null = null;
+    nextWaveformviewId: number = 0;
+    waveformProviders: Map<string, WaveformProvider> = new Map();
+    lastActiveWaveformTab: string | null = null;
 
     // Session properties.
 

src/extension.ts

@@ -76,8 +76,12 @@ export function activate(context: vscode.ExtensionContext) {
     }));
 
     context.subscriptions.push(vscode.commands.registerCommand('rtlDebugger.addToWaveform', (treeItem) => {
-        if (rtlDebugger.waveformProvider) {
-            rtlDebugger.waveformProvider.addVariable(treeItem.designation.variable);
+        if (rtlDebugger.lastActiveWaveformTab) {
+            console.log(rtlDebugger.lastActiveWaveformTab);
+            const target = rtlDebugger.waveformProviders.get(rtlDebugger.lastActiveWaveformTab);
+            if (target) {
+                target.addVariable(treeItem.designation.variable);
+            }
         }
     }));
 
@@ -96,19 +100,48 @@ export function activate(context: vscode.ExtensionContext) {
         globalWatchList.remove(treeItem.metadata.index)));
 
     context.subscriptions.push(vscode.commands.registerCommand('rtlDebugger.browseWaveforms', () => {
+        const viewKey = `rtlDebugger.waveforms.${rtlDebugger.nextWaveformviewId++}`;
         const webviewPanel = vscode.window.createWebviewPanel(
-            'rtlDebugger.waveforms',
-            'Waveforms', {
+            viewKey,
+            'Waveforms',
+            {
                 viewColumn: vscode.ViewColumn.Beside,
-            }, {
+            },
+            {
                 enableScripts: true,
                 retainContextWhenHidden: true,
-            });
+            }
+        );
+        console.log(`Creating web view panel with viewType ${webviewPanel.viewType}`);
         const bundleRoot = vscode.Uri.joinPath(context.extensionUri, 'out/');
-        rtlDebugger.waveformProvider = new WaveformProvider(rtlDebugger, webviewPanel, bundleRoot);
-        context.subscriptions.push(rtlDebugger.waveformProvider);
+        const waveformProvider = new WaveformProvider(rtlDebugger, webviewPanel, bundleRoot);
+        rtlDebugger.waveformProviders.set(viewKey, waveformProvider);
+        rtlDebugger.lastActiveWaveformTab = viewKey;
+        context.subscriptions.push(waveformProvider);
     }));
 
+    vscode.window.tabGroups.onDidChangeTabs(event => {
+        const activeWaveformTab = event.changed.map((tab, _) => {
+            if (tab.input instanceof vscode.TabInputWebview) {
+                console.log(`${tab.input.viewType}`);
+
+                const key = tab.input.viewType.match(/.*(rtlDebugger.waveforms\.\d+)/);
+
+                if (key) {
+                    return key[1];
+                } else {
+                    return null;
+                }
+            } else {
+                return null;
+            }
+        }).find((id) => id !== null);
+
+        if (activeWaveformTab) {
+            rtlDebugger.lastActiveWaveformTab = activeWaveformTab;
+        }
+    });
+
     // For an unknown reason, the `vscode.open` command (which does the exact same thing) ignores the options.
     context.subscriptions.push(vscode.commands.registerCommand('rtlDebugger.openDocument',
         (uri: vscode.Uri, options: vscode.TextDocumentShowOptions) => {

src/surfer/embed.ts

@@ -22,7 +22,7 @@ document.addEventListener('DOMContentLoaded', async () => {
     const postMessage = <(message: WebviewToExtensionMessage) => void>vscode.postMessage;
     window.addEventListener('message', async (event: MessageEvent<ExtensionToWebviewMessage>) => {
         const message = event.data;
-        if (message.type === 'cxxrtl_scmessage') {
+        if (message.type === 'cxxrtl_sc_message') {
             await libsurfer.on_cxxrtl_sc_message(message.message.inner);
         } else if (message.type === 'wcp_cs_message') {
             await libsurfer.handle_wcp_cs_message(message.message);
@@ -35,7 +35,7 @@ document.addEventListener('DOMContentLoaded', async () => {
         while (true) {
             const message = await libsurfer.cxxrtl_cs_message();
             if (message) {
-                postMessage({type: 'cxxrtl_csmessage', message: new ClientPacketString(message)});
+                postMessage({type: 'cxxrtl_cs_message', message: new ClientPacketString(message)});
             } else {
                 throw Error('Got an undefined message from Surfer. Its client probably disconnected');
             }

src/ui/waveform.ts

@@ -18,15 +18,15 @@ export class ServerPacketString {
 export type ExtensionToWebviewMessage =
 | { type: 'restore', state: any }
 // TODO: Proper type here
-| { type: 'cxxrtl_scmessage', message: ServerPacketString }
+| { type: 'cxxrtl_sc_message', message: ServerPacketString }
 | { type: 'wcp_cs_message', message: string }
 ;
 
 export type WebviewToExtensionMessage =
 | { type: 'ready' }
 | { type: 'crash', error: any }
 // TODO: Proper type here
-| { type: 'cxxrtl_csmessage', message: ClientPacketString }
+| { type: 'cxxrtl_cs_message', message: ClientPacketString }
 | { type: 'wcp_sc_message', message: string }
 ;
 
@@ -47,7 +47,7 @@ export class WaveformProvider {
             this.debuggerLink = debuggerLink;
             this.debuggerLink.onRecv = async (message) => {
                 // console.log("Running on recv for ", message)
-                await this.sendMessage({ type: 'cxxrtl_scmessage', message: new ServerPacketString(message.asString()) });
+                await this.sendMessage({ type: 'cxxrtl_sc_message', message: new ServerPacketString(message.asString()) });
             };
         } else {
             throw new Error('Failed to create secondary debugger link');
@@ -74,7 +74,7 @@ export class WaveformProvider {
             console.log('[RTL Debugger] [WaveformProvider] Ready');
         } else if (message.type === 'crash') {
             console.log('[RTL Debugger] [WaveformProvider] Crash:', message.error);
-        } else if (message.type === 'cxxrtl_csmessage') {
+        } else if (message.type === 'cxxrtl_cs_message') {
             console.log('[RTL Debugger] [WaveformProvider] Got CSMessage', message.message);
             const packet: Packet<ClientPacket> = Packet.fromString(message.message.inner);
             await this.debuggerLink.send(packet);