refactoring and taking reviews into consideration

Author: omarArm

__mocks__/vscode.js

@@ -36,8 +36,6 @@ const MockTreeItemCollapsibleState = {
     Expanded: 2 
 };
 
-const registerTreeDataProviderMock = jest.fn(() => ({ dispose: jest.fn() }));
-
 class MockTreeItem {
     label;
     description;
@@ -73,7 +71,7 @@ module.exports = {
             warn: jest.fn(),
             error: jest.fn(),
         })),
-        registerTreeDataProvider: registerTreeDataProviderMock,
+        registerTreeDataProvider: jest.fn(() => ({ dispose: jest.fn() })),
         showWarningMessage: jest.fn(),
         createStatusBarItem: jest.fn(),
         showQuickPick: jest.fn(),

package.json

@@ -51,7 +51,7 @@
       "activitybar": [
         {
           "id": "cmsis-debugger",
-          "title": "CMSIS Debug",
+          "title": "Trace and Live View",
           "icon": "images/trace-and-live-dark.svg"
         }
       ]

src/debug-session/gdbtarget-debug-session.ts

@@ -54,6 +54,7 @@ export class GDBTargetDebugSession {
         this._cbuildRunParsePromise = undefined;
     }
 
+    /** Function returns string only in case of failure */
     public async evaluateGlobalExpression(expression: string, context = 'hover'): Promise<DebugProtocol.EvaluateResponse['body'] | string> {
         try {
             const frameId = (vscode.debug.activeStackItem as vscode.DebugStackFrame)?.frameId ?? 0;

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

@@ -17,7 +17,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import * as vscode from 'vscode';
 import { debugSessionFactory, extensionContextFactory } from '../../__test__/vscode.factory';
-import { EvaluateNodeResponse, LiveWatchTreeDataProvider } from './live-watch';
+import { LiveWatchValue, LiveWatchTreeDataProvider } from './live-watch';
 import { GDBTargetDebugSession, GDBTargetDebugTracker } from '../../debug-session';
 import { gdbTargetConfiguration } from '../../debug-configuration/debug-configuration.factory';
 import { GDBTargetConfiguration } from '../../debug-configuration';
@@ -31,7 +31,7 @@ describe('LiveWatchTreeDataProvider', () => {
     let debugConfig: GDBTargetConfiguration;
 
     // Helper: create a dummy node
-    function makeNode(expression = 'x', value: EvaluateNodeResponse = { result: '1', variablesReference: 0 }, id = 1) {
+    function makeNode(expression = 'x', value: LiveWatchValue = { result: '1', variablesReference: 0 }, id = 1) {
         return { id, expression, value, parent: undefined, children: [] };
     }
 

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

@@ -15,17 +15,18 @@
  */
 
 import * as vscode from 'vscode';
+import { DebugProtocol } from '@vscode/debugprotocol';
 import { GDBTargetDebugSession, GDBTargetDebugTracker } from '../../debug-session';
 
 interface LiveWatchNode {
   id: number;
   expression: string;
   parent: LiveWatchNode | undefined; // if undefined, it's a root node
-  children: LiveWatchNode[]; // keep for future grouping; flat list for now
-  value: EvaluateNodeResponse
+  children: LiveWatchNode[];
+  value: LiveWatchValue
 }
 
-export interface EvaluateNodeResponse {
+export interface LiveWatchValue {
     result: string;
     variablesReference: number;
 }
@@ -56,31 +57,28 @@ export class LiveWatchTreeDataProvider implements vscode.TreeDataProvider<LiveWa
         }
         try {
             const children = await this._activeSession?.session.customRequest('variables', { variablesReference: element.value.variablesReference });
-            const childNodes: LiveWatchNode[] = [];
-            for(const child of children?.variables || []) {
-                const childNode: LiveWatchNode = {
-                    id: this.nodeID++,
-                    expression: child.name,
-                    children: [],
-                    parent: element,
-                    value: {
-                        result: child.value,
-                        variablesReference: child.variablesReference
-                    }
-                };
-                childNodes.push(childNode);
-            }
+            const childNodes = children?.variables.map((child: DebugProtocol.Variable) => ({
+                id: this.nodeID++,
+                expression: child.name,
+                children: [],
+                parent: element,
+                value: {
+                    result: child.value,
+                    variablesReference: child.variablesReference
+                }
+            })) ?? [];
+
             // We do not store children of nodes in the tree, as they are dynamic
-            return Promise.resolve(childNodes);
+            return childNodes;
         } catch (error) {
             console.error('Error fetching children:', error);
-            return Promise.resolve([]);
+            return [];
         }
     }
 
     public getTreeItem(element: LiveWatchNode): vscode.TreeItem {
         const item = new vscode.TreeItem(element.expression + ' = ');
-        item.description = element.value.result || '';
+        item.description = element.value.result;
         item.contextValue = 'expression';
         item.tooltip = element.expression;
         item.collapsibleState = element.value.variablesReference !== 0 ? vscode.TreeItemCollapsibleState.Collapsed : vscode.TreeItemCollapsibleState.None;
@@ -175,8 +173,8 @@ export class LiveWatchTreeDataProvider implements vscode.TreeDataProvider<LiveWa
         await this.rename(node, expression);
     }
 
-    private async evaluate(expression: string): Promise<EvaluateNodeResponse> {
-        const response: EvaluateNodeResponse = { result: '', variablesReference: 0 };
+    private async evaluate(expression: string): Promise<LiveWatchValue> {
+        const response: LiveWatchValue = { result: '', variablesReference: 0 };
         if (!this._activeSession) {
             response.result = 'No active session';
             return response;