Updating live watch on stop and on initiation of debug session

Author: omarArm

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

@@ -76,12 +76,12 @@ describe('GDBTargetDebugSession', () => {
         (vscode.debug.activeStackItem as unknown) = undefined;
     });
 
-    it('returns undefined if evaluating a global expression fails', async () => {
+    it('returns a string if evaluating a global expression fails', async () => {
         // Only mock relevant properties, return value is body of EvaluateResponse
         const logDebugSpy = jest.spyOn(logger, 'debug');
         (debugSession.customRequest as jest.Mock).mockRejectedValueOnce(new Error('myError'));
         const result = await gdbTargetSession.evaluateGlobalExpression('myGlobalVariable');
-        expect(result).toBeUndefined();
+        expect(result).toBe('Error: could not evaluate expression');
         expect(debugSession.customRequest as jest.Mock).toHaveBeenCalledWith('evaluate', { expression: 'myGlobalVariable', frameId: 0, context: 'hover' });
         expect(logDebugSpy).toHaveBeenCalledWith('Session \'session-name\': Failed to evaluate global expression \'myGlobalVariable\' - \'myError\'');
     });

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

@@ -54,7 +54,7 @@ export class GDBTargetDebugSession {
         this._cbuildRunParsePromise = undefined;
     }
 
-    public async evaluateGlobalExpression(expression: string): Promise<string|undefined> {
+    public async evaluateGlobalExpression(expression: string): Promise<string> {
         try {
             const frameId = (vscode.debug.activeStackItem as vscode.DebugStackFrame)?.frameId ?? 0;
             const args: DebugProtocol.EvaluateArguments = {
@@ -63,12 +63,12 @@ export class GDBTargetDebugSession {
                 context: 'hover'
             };
             const response = await this.session.customRequest('evaluate', args) as DebugProtocol.EvaluateResponse['body'];
-            return response.result.match(/\d+/) ? response.result : undefined;
+            return response.result;
         } catch (error: unknown) {
             const errorMessage = (error as Error)?.message;
             logger.debug(`Session '${this.session.name}': Failed to evaluate global expression '${expression}' - '${errorMessage}'`);
+            return errorMessage;
         }
-        return undefined;
     }
 
     public async readMemory(address: number, length = 4): Promise<ArrayBuffer|undefined> {

src/live-watch/live-watch.ts

@@ -47,11 +47,18 @@ export class LiveWatchTreeDataProvider implements vscode.TreeDataProvider<LiveWa
         this.addVSCodeCommands();
         const onDidChangeActiveDebugSession = tracker.onDidChangeActiveDebugSession((session) => {
             this.activeSession = session;
+            this.refresh();
             this.continueEvaluate = false;
         });
         const onWillStartSession =  tracker.onWillStartSession(session => this.handleOnWillStartSession(session));
+        // Doing a refresh on stop to ensure we have the latest data
+        const onStopped = tracker.onStopped(() => this.refresh());
+        // Using this event because this is when the threadId is available for evaluations
+        const onStackTrace = tracker.onDidChangeActiveStackItem(() => this.refresh());
         this._context.subscriptions.push(onDidChangeActiveDebugSession);
         this._context.subscriptions.push(onWillStartSession);
+        this._context.subscriptions.push(onStopped);
+        this._context.subscriptions.push(onStackTrace);
     }
 
     handleOnWillStartSession(session: GDBTargetDebugSession): void {