Uninitialize __brs_err__ when stepping or continuing

src/debugProtocol/client/DebugProtocolClient.ts

@@ -401,10 +401,8 @@ export class DebugProtocolClient {
             this.isStopped = false;
             let stepResult = await this.sendRequest<GenericResponse>(request);
             if (stepResult.data.errorCode === ErrorCode.OK) {
-                this.isStopped = true;
-                //TODO this is not correct. Do we get a new threads event after a step? Perhaps that should be what triggers the event instead of us?
-                this.emit('suspend', stepResult as AllThreadsStoppedUpdate);
-            } else {
+                //Step command received and will recieve a separate update when threads have reattached
+            } else if (stepResult.data.errorCode === ErrorCode.CANT_CONTINUE) {
                 // there is a CANT_CONTINUE error code but we can likely treat all errors like a CANT_CONTINUE
                 this.emit('cannot-continue');
             }
@@ -1222,8 +1220,8 @@ export class DebugProtocolClient {
             this.logger.log('[destroy] controlSocket is: ', this.controlSocketClosed.isResolved ? 'closed' : 'not closed');
 
             //destroy the controlSocket
-            this.controlSocket.removeAllListeners();
-            this.controlSocket.destroy();
+            this.controlSocket?.removeAllListeners();
+            this.controlSocket?.destroy();
             this.controlSocket = undefined;
             this.isDestroyingControlSocket = false;
         }

src/debugSession/BrightScriptDebugSession.ts

@@ -281,6 +281,15 @@ export class BrightScriptDebugSession extends BaseDebugSession {
         }
     }
 
+
+    protected async uninitializeExceptionsBreakpointVariables() {
+        let brsErr = Object.values(this.variables).find((v) => v.name === '__brs_err__');
+        if (brsErr && brsErr.type !== VariableType.Uninitialized) {
+            // Assigning the variable to the function call results in it becoming unintialized
+            await this.rokuAdapter.evaluate(`__brs_err__ = [].clear()`, brsErr.frameId);
+        }
+    }
+
     private showPopupMessage(message: string, severity: 'error' | 'warn' | 'info', modal = false) {
         this.logger.trace('[showPopupMessage]', severity, message);
         this.sendEvent(new PopupMessageEvent(message, severity, modal));
@@ -1076,6 +1085,10 @@ export class BrightScriptDebugSession extends BaseDebugSession {
         }
 
         this.logger.log('continueRequest');
+        await this.uninitializeExceptionsBreakpointVariables(); // call before clearState
+        this.clearState();
+
+        // The debug session ends after the next line. Do not put new work after this line.
         await this.rokuAdapter.continue();
         this.sendResponse(response);
     }
@@ -1114,6 +1127,10 @@ export class BrightScriptDebugSession extends BaseDebugSession {
             return;
         }
 
+        await this.uninitializeExceptionsBreakpointVariables(); // call before clearState
+        this.clearState();
+
+        // The debug session ends after the next line. Do not put new work after this line.
         try {
             await this.rokuAdapter.stepOver(args.threadId);
             this.logger.info('[nextRequest] end');
@@ -1133,6 +1150,9 @@ export class BrightScriptDebugSession extends BaseDebugSession {
             return;
         }
 
+        await this.uninitializeExceptionsBreakpointVariables(); // call before clearState
+        this.clearState();
+        // The debug session ends after the next line. Do not put new work after this line.
         await this.rokuAdapter.stepInto(args.threadId);
         this.sendResponse(response);
         this.logger.info('[stepInRequest] end');
@@ -1148,6 +1168,10 @@ export class BrightScriptDebugSession extends BaseDebugSession {
             return;
         }
 
+        await this.uninitializeExceptionsBreakpointVariables(); // call before clearState
+        this.clearState();
+
+        // The debug session ends after the next line. Do not put new work after this line.
         await this.rokuAdapter.stepOut(args.threadId);
         this.sendResponse(response);
         this.logger.info('[stepOutRequest] end');
@@ -1221,6 +1245,11 @@ export class BrightScriptDebugSession extends BaseDebugSession {
             let filteredChildVariables = this.launchConfiguration.showHiddenVariables !== true ? childVariables.filter(
                 (child: AugmentedVariable) => !child.name.startsWith(this.tempVarPrefix)) : childVariables;
 
+            filteredChildVariables = this.launchConfiguration.showHiddenVariables !== true
+                ? childVariables.filter((child: AugmentedVariable) => !util.isTransientVariable(child.name) ||
+                    (child.name === '__brs_err__' && child.type !== VariableType.Uninitialized))
+                : childVariables;
+
             response.body = {
                 variables: filteredChildVariables
             };