Allow adding variables from the CXXRTL sidebar

Author: TheZoq2

package.json

@@ -175,6 +175,12 @@
         "command": "rtlDebugger.browseWaveforms",
         "category": "RTL Debugger",
         "title": "Browse Waveforms"
+      },
+      {
+        "command": "rtlDebugger.addToWaveform",
+        "category": "RTL Debugger",
+        "title": "Add to Waveform",
+        "icon": "$(keybindings-add)"
       }
     ],
     "viewsContainers": {
@@ -319,6 +325,11 @@
           "command": "rtlDebugger.unWatchVariable",
           "when": "view == rtlDebugger.sidebar && viewItem =~ /inWatchList/",
           "group": "inline"
+        },
+        {
+          "command": "rtlDebugger.addToWaveform",
+          "when": "view == rtlDebugger.sidebar",
+          "group": "inline"
         }
       ],
       "rtlDebugger.setRadix": [

src/extension.ts

@@ -11,6 +11,9 @@ import { WaveformProvider } from './ui/waveform';
 
 export function activate(context: vscode.ExtensionContext) {
     const rtlDebugger = new CXXRTLDebugger();
+    // TODO This is presumably not the right way to do it, but I'll do it like this for
+    // now in order to test the WCP stuff
+    var waveformProvider: WaveformProvider;
 
     console.log('Attached');
 
@@ -77,6 +80,11 @@ export function activate(context: vscode.ExtensionContext) {
         }
     }));
 
+    context.subscriptions.push(vscode.commands.registerCommand('rtlDebugger.addToWaveform', (treeItem) => {
+        console.log("Adding to waveform", waveformProvider)
+        waveformProvider.addVariable(treeItem.designation.variable.cxxrtlIdentifier)
+    }));
+
     context.subscriptions.push(vscode.commands.registerCommand('rtlDebugger.setRadix.2', (treeItem) =>
         globalVariableOptions.update(treeItem.designation.variable.cxxrtlIdentifier, { radix: 2 })));
     context.subscriptions.push(vscode.commands.registerCommand('rtlDebugger.setRadix.8', (treeItem) =>
@@ -104,7 +112,8 @@ export function activate(context: vscode.ExtensionContext) {
                 retainContextWhenHidden: true,
             });
         const bundleRoot = vscode.Uri.joinPath(context.extensionUri, 'out/');
-        context.subscriptions.push(new WaveformProvider(rtlDebugger, webviewPanel, bundleRoot));
+        waveformProvider = new WaveformProvider(rtlDebugger, webviewPanel, bundleRoot)
+        context.subscriptions.push(waveformProvider);
     }));
 
     // For an unknown reason, the `vscode.open` command (which does the exact same thing) ignores the options.

src/model/variable.ts

@@ -44,6 +44,10 @@ export abstract class Variable {
     get cxxrtlIdentifier(): string {
         return this.fullName.join(' ');
     }
+
+    get wcpIdentifier(): string {
+        return this.fullName.join(".");
+    }
 }
 
 export class ScalarVariable extends Variable {

src/surfer/embed.ts

@@ -25,7 +25,7 @@ document.addEventListener('DOMContentLoaded', async () => {
         if (message.type === 'cxxrtl_scmessage') {
             await libsurfer.on_cxxrtl_sc_message(message.message.inner);
         } else if (message.type === 'wcp_cs_message') {
-            await libsurfer.send_wcp_sc_message(message.message);
+            await libsurfer.handle_wcp_cs_message(message.message);
         } else {
             console.error('[RTL Debugger] [surferEmbed] Unhandled extension to webview message', message);
         }

src/ui/waveform.ts

@@ -5,6 +5,7 @@ import { CXXRTLDebugger } from '../debugger';
 import embedHtml from '../surfer/embed.html';
 import { ILink, Packet } from '../cxxrtl/link';
 import { ClientPacket } from '../cxxrtl/proto';
+import { Variable } from '../model/variable';
 
 export class ClientPacketString {
     constructor(public inner: string) { }
@@ -85,5 +86,15 @@ export class WaveformProvider {
         }
     }
 
+    async addVariable(variable: Variable) {
+        // TODO: How should we handle the callbacks here?
+        const message = JSON.stringify({
+            type: "command",
+            command: "add_variables",
+            names: [variable.wcpIdentifier]
+        })
+        this.sendMessage({type: 'wcp_cs_message', message})
+    }
+
     private debuggerLink: ILink;
 }