Live watch fixes (#612)

* Selecting only parent nodes for delete command
* Adding support for showing child elements in memory inspector

Author: omarArm

package.json

@@ -139,7 +139,7 @@
       "editor/context": [
         {
           "command": "vscode-cmsis-debugger.liveWatch.addToLiveWatchFromTextEditor",
-          "when": "editorTextFocus && resourceScheme == file",
+          "when": "editorTextFocus",
           "group": "z_commands"
         }
       ],
@@ -239,12 +239,12 @@
       "view/item/context": [
         {
           "command": "vscode-cmsis-debugger.liveWatch.modify",
-          "when": "view == cmsis-debugger.liveWatch && viewItem == expression",
+          "when": "view == cmsis-debugger.liveWatch && viewItem == parentExpression",
           "group": "inline@1"
         },
         {
           "command": "vscode-cmsis-debugger.liveWatch.delete",
-          "when": "view == cmsis-debugger.liveWatch && viewItem == expression",
+          "when": "view == cmsis-debugger.liveWatch && viewItem == parentExpression",
           "group": "inline@2"
         },
         {
@@ -254,17 +254,17 @@
         },
         {
           "command": "vscode-cmsis-debugger.liveWatch.modify",
-          "when": "view == cmsis-debugger.liveWatch && viewItem == expression",
+          "when": "view == cmsis-debugger.liveWatch && viewItem == parentExpression",
           "group": "contextMenuG1@2"
         },
         {
           "command": "vscode-cmsis-debugger.liveWatch.copy",
-          "when": "view == cmsis-debugger.liveWatch && viewItem == expression",
+          "when": "view == cmsis-debugger.liveWatch",
           "group": "contextMenuG1@3"
         },
         {
           "command": "vscode-cmsis-debugger.liveWatch.delete",
-          "when": "view == cmsis-debugger.liveWatch && viewItem == expression",
+          "when": "view == cmsis-debugger.liveWatch && viewItem == parentExpression",
           "group": "contextMenuG1@4"
         },
         {
@@ -279,7 +279,7 @@
         },
         {
           "command": "vscode-cmsis-debugger.liveWatch.showInMemoryInspector",
-          "when": "view == cmsis-debugger.liveWatch && viewItem == expression",
+          "when": "view == cmsis-debugger.liveWatch",
           "group": "contextMenuG3@1"
         }
       ]

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

@@ -154,12 +154,22 @@ describe('LiveWatchTreeDataProvider', () => {
             expect(parent.children.length).toBe(0);
         });
 
-        it('getTreeItem returns correct TreeItem', () => {
-            const node = makeNode('expression', { result: 'value', variablesReference: 1 }, 1);
+        it('returns correct TreeItem for parent nodes', () => {
+            const node = makeNode('expression', { result: 'value', variablesReference: 0 }, 1);
             const item = liveWatchTreeDataProvider.getTreeItem(node);
             expect(item.label).toBe('expression = ');
             expect(item.description).toBe('value');
-            expect(item.contextValue).toBe('expression');
+            expect(item.contextValue).toBe('parentExpression');
+        });
+
+        it('returns correct TreeItem for leaf nodes', () => {
+            // Create a child node within a parent node
+            const parent = makeNode('parentExpression', { result: 'parentValue', variablesReference: 1 }, 1);
+            const child = makeNode('childExpression', { result: 'childValue', variablesReference: 0 }, 2, parent);
+            const item = liveWatchTreeDataProvider.getTreeItem(child);
+            expect(item.label).toBe('childExpression = ');
+            expect(item.description).toBe('childValue');
+            expect(item.contextValue).toBe('childExpression');
         });
     });
 
@@ -220,14 +230,18 @@ describe('LiveWatchTreeDataProvider', () => {
 
         it('AddFromSelection adds selected text as new live watch expression to roots', async () => {
             jest.spyOn(liveWatchTreeDataProvider as any, 'evaluate').mockResolvedValue({ result: '5678', variablesReference: 0 });
-            // Mock the active text editor with a selection whose active position returns a word range
-            const fakeRange = { start: { line: 0, character: 0 }, end: { line: 0, character: 10 } };
+            // Mock the active text editor with fake range
+            const fakeRange = { start: { line: 0, character: 0 }, end: { line: 0, character: 17 } };
             const mockEditor: any = {
                 document: {
-                    getWordRangeAtPosition: jest.fn().mockReturnValue(fakeRange),
-                    getText: jest.fn().mockReturnValue('selected-expression')
+                    getText: jest.fn().mockReturnValue('selected-expression'),
+                    getWordRangeAtPosition: jest.fn().mockReturnValue(fakeRange)
                 },
-                selection: { active: { line: 0, character: 5 } }
+                selection: {
+                    active: { line: 0, character: 5 },
+                    start: { line: 0, character: 0 },
+                    end: { line: 0, character: 17 }
+                }
             };
             (vscode.window as any).activeTextEditor = mockEditor;
             await (liveWatchTreeDataProvider as any).handleAddFromSelectionCommand();
@@ -238,6 +252,25 @@ describe('LiveWatchTreeDataProvider', () => {
             expect(roots[0].expression).toBe('selected-expression');
             expect(roots[0].value.result).toBe('5678');
         });
+
+        it('AddFromSelection does nothing when selection spans multiple lines', async () => {
+            const mockEditor: any = {
+                document: {
+                    getText: jest.fn().mockReturnValue('multi-line\nselection'),
+                    getWordRangeAtPosition: jest.fn().mockReturnValue(undefined)
+                },
+                selection: {
+                    active: { line: 0, character: 5 },
+                    start: { line: 0, character: 0 },
+                    end: { line: 1, character: 9 }
+                }
+            };
+            (vscode.window as any).activeTextEditor = mockEditor;
+            await (liveWatchTreeDataProvider as any).handleAddFromSelectionCommand();
+            const roots = (liveWatchTreeDataProvider as any).roots;
+            expect(mockEditor.document.getWordRangeAtPosition).toHaveBeenCalledWith(mockEditor.selection.active);
+            expect(roots.length).toBe(0);
+        });
     });
 
     describe('refresh', () => {

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

@@ -83,9 +83,9 @@ export class LiveWatchTreeDataProvider implements vscode.TreeDataProvider<LiveWa
     public getTreeItem(element: LiveWatchNode): vscode.TreeItem {
         const item = new vscode.TreeItem(element.expression + ' = ');
         item.description = element.value.result;
-        item.contextValue = 'expression';
         item.tooltip = element.value.type ?? '';
         item.collapsibleState = element.value.variablesReference !== 0 ? vscode.TreeItemCollapsibleState.Collapsed : vscode.TreeItemCollapsibleState.None;
+        item.contextValue = element.parent ? 'childExpression' : 'parentExpression';
         return item;
     }
 
@@ -228,7 +228,7 @@ export class LiveWatchTreeDataProvider implements vscode.TreeDataProvider<LiveWa
         if (!payload || !payload.variable) {
             return;
         }
-        await this.addToRoots(payload.variable.name);
+        await this.addToRoots(payload.variable.evaluateName ?? payload.variable.name);
     }
 
     private async handleShowInMemoryInspector(node: LiveWatchNode) {
@@ -244,14 +244,14 @@ export class LiveWatchTreeDataProvider implements vscode.TreeDataProvider<LiveWa
         const args = {
             sessionId: this._activeSession?.session.id,
             container: {
-                name: node.expression,
+                name: node.value.evaluateName ?? node.expression,
                 variablesReference: node.value.variablesReference
             },
             variable: {
-                name: node.expression,
+                name: node.value.evaluateName ?? node.expression,
                 value: node.value.result,
                 variablesReference: node.value.variablesReference,
-                memoryReference: `&(${node.expression})`
+                memoryReference: `&(${node.value.evaluateName ?? node.expression})`
             }
         };
         await vscode.commands.executeCommand('memory-inspector.show-variable', args);