Allow adding waveforms surfer via VSC ui

Author: TheZoq2

package.json

@@ -328,7 +328,7 @@
         },
         {
           "command": "rtlDebugger.addToWaveform",
-          "when": "view == rtlDebugger.sidebar",
+          "when": "view == rtlDebugger.sidebar && viewItem =~ /variable/",
           "group": "inline"
         }
       ],

src/debugger.ts

@@ -4,6 +4,7 @@ import * as vscode from 'vscode';
 import { NodeStreamLink } from './cxxrtl/link';
 import { StatusBarItem } from './ui/status';
 import { Session } from './debug/session';
+import { WaveformProvider } from './ui/waveform';
 
 export enum CXXRTLSimulationStatus {
     Paused = 'paused',
@@ -21,6 +22,7 @@ export class CXXRTLDebugger {
     private statusBarItem: StatusBarItem;
     private terminal: vscode.Terminal | null = null;
     session: Session | null = null;
+    waveformProvider: WaveformProvider | null = null;
 
     // Session properties.
 

src/extension.ts

@@ -11,9 +11,6 @@ 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');
 
@@ -81,8 +78,9 @@ 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)
+        if (rtlDebugger.waveformProvider) {
+            rtlDebugger.waveformProvider.addVariable(treeItem.designation.variable)
+        }
     }));
 
     context.subscriptions.push(vscode.commands.registerCommand('rtlDebugger.setRadix.2', (treeItem) =>
@@ -112,8 +110,8 @@ export function activate(context: vscode.ExtensionContext) {
                 retainContextWhenHidden: true,
             });
         const bundleRoot = vscode.Uri.joinPath(context.extensionUri, 'out/');
-        waveformProvider = new WaveformProvider(rtlDebugger, webviewPanel, bundleRoot)
-        context.subscriptions.push(waveformProvider);
+        rtlDebugger.waveformProvider = new WaveformProvider(rtlDebugger, webviewPanel, bundleRoot)
+        context.subscriptions.push(rtlDebugger.waveformProvider);
     }));
 
     // For an unknown reason, the `vscode.open` command (which does the exact same thing) ignores the options.

src/surfer/embed.ts

@@ -65,8 +65,8 @@ document.addEventListener('DOMContentLoaded', async () => {
         await libsurfer.start_wcp();
 
         libsurferInjectMessage('ToggleMenu'); // turn off menu
-        // libsurferInjectMessage('ToggleStatusBar'); // turn off status bar
-        // libsurferInjectMessage('ToggleSidePanel');
+        libsurferInjectMessage('ToggleStatusbar'); // turn off status bar
+        libsurferInjectMessage('ToggleSidePanel');
         libsurferInjectMessage({ SelectTheme: 'dark+' }); // pick VS Code like theme
 
         overlay.style.display = 'none';

src/ui/sidebar.ts

@@ -203,10 +203,10 @@ class ScopeTreeItem extends TreeItem {
         for (const variable of variables) {
             if (variable instanceof ScalarVariable) {
                 children.push(new ScalarTreeItem(this.provider, variable.designation(),
-                    variable.width > 1 ? 'canWatch|canSetRadix' : 'canWatch'));
+                    variable.width > 1 ? 'canWatch|canSetRadix|variable' : 'canWatch|variable'));
             }
             if (variable instanceof MemoryVariable) {
-                children.push(new ArrayTreeItem(this.provider, variable.designation(), 'canWatch|canSetRadix'));
+                children.push(new ArrayTreeItem(this.provider, variable.designation(), 'canWatch|canSetRadix|variable'));
             }
         }
         return children;