Adding command Show in Memory Inspector to Live Watch context menu

Author: omarArm

__mocks__/vscode.js

@@ -73,6 +73,7 @@ module.exports = {
         })),
         registerTreeDataProvider: jest.fn(() => ({ dispose: jest.fn() })),
         showWarningMessage: jest.fn(),
+        showErrorMessage: jest.fn(),
         createStatusBarItem: jest.fn(),
         showQuickPick: jest.fn(),
     },

package.json

@@ -129,6 +129,11 @@
         "command": "vscode-cmsis-debugger.liveWatch.addToLiveWatchFromVariablesView",
         "title": "Add to Live Watch",
         "category": "Live Watch"
+      },
+      {
+        "command": "vscode-cmsis-debugger.liveWatch.showInMemoryInspector",
+        "title": "Show in Memory Inspector",
+        "category": "Live Watch"
       }
     ],
     "menus": {
@@ -151,6 +156,11 @@
           "command": "vscode-cmsis-debugger.liveWatch.addToLiveWatchFromWatchWindow",
           "when": "inDebugMode",
           "group": "z_commands"
+        },
+        {
+          "command": "vscode-cmsis-debugger.liveWatch.showInMemoryInspector",
+          "when": "inDebugMode",
+          "group": "z_commands"
         }
       ],
       "commandPalette": [
@@ -189,6 +199,18 @@
         {
           "command": "vscode-cmsis-debugger.liveWatch.addToLiveWatchFromTextEditor",
           "when": "false"
+        },
+        {
+          "command": "vscode-cmsis-debugger.liveWatch.addToLiveWatchFromWatchWindow",
+          "when": "false"
+        },
+        {
+          "command": "vscode-cmsis-debugger.liveWatch.addToLiveWatchFromVariablesView",
+          "when": "false"
+        },
+        {
+          "command": "vscode-cmsis-debugger.liveWatch.showInMemoryInspector",
+          "when": "false"
         }
       ],
       "view/title": [
@@ -231,20 +253,25 @@
           "when": "view == cmsis-debugger.liveWatch && viewItem == expression",
           "group": "inline@2"
         },
+        {
+          "command": "vscode-cmsis-debugger.liveWatch.add",
+          "when": "view == cmsis-debugger.liveWatch",
+          "group": "contextMenuG1@1"
+        },
         {
           "command": "vscode-cmsis-debugger.liveWatch.modify",
           "when": "view == cmsis-debugger.liveWatch && viewItem == expression",
           "group": "contextMenuG1@2"
         },
         {
-          "command": "vscode-cmsis-debugger.liveWatch.delete",
+          "command": "vscode-cmsis-debugger.liveWatch.copy",
           "when": "view == cmsis-debugger.liveWatch && viewItem == expression",
-          "group": "contextMenuG1@4"
+          "group": "contextMenuG1@3"
         },
         {
-          "command": "vscode-cmsis-debugger.liveWatch.add",
-          "when": "view == cmsis-debugger.liveWatch",
-          "group": "contextMenuG1@1"
+          "command": "vscode-cmsis-debugger.liveWatch.delete",
+          "when": "view == cmsis-debugger.liveWatch && viewItem == expression",
+          "group": "contextMenuG1@4"
         },
         {
           "command": "vscode-cmsis-debugger.liveWatch.deleteAll",
@@ -257,9 +284,10 @@
           "group": "contextMenuG2@2"
         },
         {
-          "command": "vscode-cmsis-debugger.liveWatch.copy",
+          "command": "vscode-cmsis-debugger.liveWatch.showInMemoryInspector",
           "when": "view == cmsis-debugger.liveWatch && viewItem == expression",
-          "group": "contextMenuG1@3"
+          "group": "contextMenuG3@1",
+          "extensionDependency": "eclipse-cdt.memory-inspector"
         }
       ]
     },

src/views/live-watch/live-watch.test.ts

@@ -279,7 +279,8 @@ describe('LiveWatchTreeDataProvider', () => {
                 'vscode-cmsis-debugger.liveWatch.copy',
                 'vscode-cmsis-debugger.liveWatch.addToLiveWatchFromTextEditor',
                 'vscode-cmsis-debugger.liveWatch.addToLiveWatchFromWatchWindow',
-                'vscode-cmsis-debugger.liveWatch.addToLiveWatchFromVariablesView'
+                'vscode-cmsis-debugger.liveWatch.addToLiveWatchFromVariablesView',
+                'vscode-cmsis-debugger.liveWatch.showInMemoryInspector'
             ]));
         });
 
@@ -393,6 +394,42 @@ describe('LiveWatchTreeDataProvider', () => {
             await handler({ container: { name: 'local' } });
             expect((liveWatchTreeDataProvider as any).roots.length).toBe(0);
         });
+
+        it('showInMemoryInspector command does nothing when node is undefined', async () => {
+            liveWatchTreeDataProvider.activate(tracker);
+            const handler = getRegisteredHandler('vscode-cmsis-debugger.liveWatch.showInMemoryInspector');
+            expect(handler).toBeDefined();
+            await handler(undefined);
+            expect(vscode.commands.executeCommand).not.toHaveBeenCalledWith('memory-inspector.show-variable', expect.anything());
+        });
+
+        it('showInMemoryInspector shows error if extension is missing', async () => {
+            (vscode.extensions.getExtension as jest.Mock).mockReturnValue(undefined);
+            (vscode.window.showErrorMessage as jest.Mock).mockClear();
+            liveWatchTreeDataProvider.activate(tracker);
+            const handler = getRegisteredHandler('vscode-cmsis-debugger.liveWatch.showInMemoryInspector');
+            const node = makeNode('node', { result: '0x1234', variablesReference: 77 }, 1);
+            await handler(node);
+            expect(vscode.window.showErrorMessage).toHaveBeenCalledWith(expect.stringContaining('Memory Inspector extension is not installed'));
+            expect(vscode.commands.executeCommand).not.toHaveBeenCalledWith('memory-inspector.show-variable', expect.anything());
+        });
+
+        it('showInMemoryInspector executes command with proper args when extension is present', async () => {
+            (vscode.extensions.getExtension as jest.Mock).mockReturnValue({ id: 'eclipse-cdt.memory-inspector' });
+            (vscode.commands.executeCommand as jest.Mock).mockResolvedValue('ok');
+            liveWatchTreeDataProvider.activate(tracker);
+            (liveWatchTreeDataProvider as any)._activeSession = { session: { id: 'session-1' } };
+            const handler = getRegisteredHandler('vscode-cmsis-debugger.liveWatch.showInMemoryInspector');
+            const node = makeNode('node', { result: '0x1234', variablesReference: 0 }, 1);
+            await handler(node);
+            const lastCall = (vscode.commands.executeCommand as jest.Mock).mock.calls.pop();
+            expect(lastCall[0]).toBe('memory-inspector.show-variable');
+            const args = lastCall[1];
+            expect(args.sessionId).toBe('session-1');
+            expect(args.container.name).toBe('node');
+            expect(args.variable.name).toBe('node');
+            expect(args.variable.memoryReference).toBe('&(node)');
+        });
     });
 
     describe('evaluate', () => {

src/views/live-watch/live-watch.ts

@@ -149,9 +149,10 @@ export class LiveWatchTreeDataProvider implements vscode.TreeDataProvider<LiveWa
         */
         const addToLiveWatchFromWatchWindowCommand = vscode.commands.registerCommand('vscode-cmsis-debugger.liveWatch.addToLiveWatchFromWatchWindow', async (payload: { container: DebugProtocol.Scope; variable: DebugProtocol.Variable; }) => { await this.registerAddToLiveWatchFromVariablesView(payload); });
         const addToLiveWatchFromVariablesViewCommand = vscode.commands.registerCommand('vscode-cmsis-debugger.liveWatch.addToLiveWatchFromVariablesView', async (payload: { container: DebugProtocol.Scope; variable: DebugProtocol.Variable; }) => { await this.registerAddToLiveWatchFromVariablesView(payload); });
+        const showInMemoryInspectorCommand = vscode.commands.registerCommand('vscode-cmsis-debugger.liveWatch.showInMemoryInspector', async (node: LiveWatchNode) => { await this.showInMemoryInspector(node); });
         this._context.subscriptions.push(registerLiveWatchView,
             addCommand,
-            deleteAllCommand, deleteCommand, refreshCommand, modifyCommand, copyCommand, addToLiveWatchCommand, addToLiveWatchFromWatchWindowCommand, addToLiveWatchFromVariablesViewCommand);
+            deleteAllCommand, deleteCommand, refreshCommand, modifyCommand, copyCommand, addToLiveWatchCommand, addToLiveWatchFromWatchWindowCommand, addToLiveWatchFromVariablesViewCommand, showInMemoryInspectorCommand);
     }
 
     private async registerAddCommand() {
@@ -214,6 +215,33 @@ export class LiveWatchTreeDataProvider implements vscode.TreeDataProvider<LiveWa
         await this.addToRoots(payload.variable.name);
     }
 
+    private async showInMemoryInspector(node: LiveWatchNode) {
+        if (!node) {
+            return;
+        }
+        const extensionId = 'eclipse-cdt.memory-inspector';
+        const memoryInspectorExtension = vscode.extensions.getExtension(extensionId);
+        if (!memoryInspectorExtension) {
+            vscode.window.showErrorMessage(`Memory Inspector extension is not installed. Please install it to use this feature.`);
+            return;
+        }
+        const args = {
+            sessionId: this._activeSession?.session.id,
+            container: {
+                name: node.expression,
+                variablesReference: node.value.variablesReference
+            },
+            variable: { 
+                name: node.expression, 
+                value: node.value.result,
+                variablesReference: node.value.variablesReference,
+                memoryReference: `&(${node.expression})` 
+            }
+        };
+        const result = await vscode.commands.executeCommand('memory-inspector.show-variable', args);
+        console.log(result);
+    }
+
     private async evaluate(expression: string): Promise<LiveWatchValue> {
         const response: LiveWatchValue = { result: '', variablesReference: 0 };
         if (!this._activeSession) {