roku-debug 0.21.12 → 0.21.14

package/dist/debugSession/BrightScriptDebugSession.js

@@ -5,7 +5,7 @@ const fsExtra = require("fs-extra");
 const natural_orderby_1 = require("natural-orderby");
 const path = require("path");
 const roku_deploy_1 = require("roku-deploy");
-const vscode_debugadapter_1 = require("vscode-debugadapter");
+const debugadapter_1 = require("@vscode/debugadapter");
 const SceneGraphDebugCommandController_1 = require("../SceneGraphDebugCommandController");
 const util_1 = require("../util");
 const FileUtils_1 = require("../FileUtils");
@@ -23,7 +23,7 @@ const logging_1 = require("../logging");
 const VariablesResponse_1 = require("../debugProtocol/events/responses/VariablesResponse");
 const brighterscript_1 = require("brighterscript");
 const diagnosticSource = 'roku-debug';
-class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
+class BrightScriptDebugSession extends debugadapter_1.DebugSession {
     constructor() {
         super();
         this.logger = logging_1.logger.createLogger(`[session]`);
@@ -42,12 +42,13 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         this.evaluateRefIdLookup = {};
         this.evaluateRefIdCounter = 1;
         this.variables = {};
-        this.variableHandles = new vscode_debugadapter_1.Handles();
+        this.variableHandles = new debugadapter_1.Handles();
         this.tempVarPrefix = '__rokudebug__';
         /**
          * A magic number to represent a fake thread that will be used for showing compile errors in the UI as if they were runtime crashes
          */
         this.COMPILE_ERROR_THREAD_ID = 7777;
+        this.exceptionBreakpoints = [];
         this.evaluateRequestPromise = Promise.resolve();
         this.evaluateVarIndexByFrameId = new Map();
         /**
@@ -82,7 +83,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                     path: breakpoint.srcPath
                 }
             };
-            this.sendEvent(new vscode_debugadapter_1.BreakpointEvent(eventName, event));
+            this.sendEvent(new debugadapter_1.BreakpointEvent(eventName, event));
         }
     }
     get enableDebugProtocol() {
@@ -91,8 +92,10 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
     /**
      * Get a promise that resolves when the roku adapter is ready to be used
      */
-    getRokuAdapter() {
-        return this.rokuAdapterDeferred.promise;
+    async getRokuAdapter() {
+        await this.rokuAdapterDeferred.promise;
+        await this.rokuAdapter.onReady();
+        return this.rokuAdapter;
     }
     /**
      * The 'initialize' request is the first request called by the frontend
@@ -101,10 +104,6 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
     initializeRequest(response, args) {
         this.initRequestArgs = args;
         this.logger.log('initializeRequest');
-        // since this debug adapter can accept configuration requests like 'setBreakpoint' at any time,
-        // we request them early by sending an 'initializeRequest' to the frontend.
-        // The frontend will end the configuration sequence by calling 'configurationDone' request.
-        this.sendEvent(new vscode_debugadapter_1.InitializedEvent());
         response.body = response.body || {};
         // This debug adapter implements the configurationDoneRequest.
         response.body.supportsConfigurationDoneRequest = true;
@@ -116,6 +115,24 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         response.body.supportsStepBack = false;
         // This debug adapter supports conditional breakpoints
         response.body.supportsConditionalBreakpoints = true;
+        response.body.supportsExceptionFilterOptions = true;
+        response.body.supportsExceptionOptions = true;
+        //the list of exception breakpoints (we have to send them all the time, even if the device doesn't support them)
+        response.body.exceptionBreakpointFilters = [{
+                filter: 'caught',
+                supportsCondition: true,
+                conditionDescription: '__brs_err__.rethrown = true',
+                label: 'Caught Exceptions',
+                description: `Breaks on all errors, even if they're caught later.`,
+                default: false
+            }, {
+                filter: 'uncaught',
+                supportsCondition: true,
+                conditionDescription: '__brs_err__.rethrown = true',
+                label: 'Uncaught Exceptions',
+                description: 'Breaks only on errors that are not handled.',
+                default: true
+            }];
         // This debug adapter supports breakpoints that break execution after a specified number of hits
         response.body.supportsHitConditionalBreakpoints = true;
         // This debug adapter supports log points by interpreting the 'logMessage' attribute of the SourceBreakpoint
@@ -125,8 +142,58 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         logging_1.debugServerLogOutputEventTransport.setWriter((message) => {
             this.sendEvent(new Events_1.DebugServerLogOutputEvent(message.logger.formatMessage(message, false)));
         });
+        // since this debug adapter can accept configuration requests like 'setBreakpoint' at any time,
+        // we request them early by sending an 'initializeRequest' to the frontend.
+        // The frontend will end the configuration sequence by calling 'configurationDone' request.
+        this.sendEvent(new debugadapter_1.InitializedEvent());
         this.logger.log('initializeRequest finished');
     }
+    async setExceptionBreakPointsRequest(response, args) {
+        var _a;
+        (_a = response.body) !== null && _a !== void 0 ? _a : (response.body = {});
+        try {
+            let filterOptions;
+            if (args.filterOptions) {
+                filterOptions = args.filterOptions.map(x => ({
+                    filter: x.filterId,
+                    conditionExpression: x.condition
+                }));
+            }
+            else if (args.filters) {
+                filterOptions = args.filters.map(x => ({
+                    filter: x
+                }));
+            }
+            this.exceptionBreakpoints = filterOptions;
+            //ensure the rokuAdapter is loaded
+            await this.getRokuAdapter();
+            if (this.rokuAdapter.supportsExceptionBreakpoints) {
+                await this.rokuAdapter.setExceptionBreakpoints(filterOptions);
+                //if success
+                response.body.breakpoints = [
+                    { verified: true },
+                    { verified: true }
+                ];
+            }
+            else {
+                response.body.breakpoints = [
+                    { verified: false },
+                    { verified: false }
+                ];
+            }
+        }
+        catch (e) {
+            //if error (or not supported)
+            response.body.breakpoints = [
+                { verified: false },
+                { verified: false }
+            ];
+            this.logger.error('Failed to set exception breakpoints', e);
+        }
+        finally {
+            this.sendResponse(response);
+        }
+    }
     showPopupMessage(message, severity, modal = false) {
         this.logger.trace('[showPopupMessage]', severity, message);
         this.sendEvent(new Events_1.PopupMessageEvent(message, severity, modal));
@@ -279,6 +346,9 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                     const message = 'App exit detected; but launchConfiguration.stopDebuggerOnAppExit is set to false, so keeping debug session running.';
                     this.logger.log('[launchRequest]', message);
                     this.sendEvent(new Events_1.LogOutputEvent(message));
+                    void this.rokuAdapter.once('connected').then(async () => {
+                        await this.rokuAdapter.setExceptionBreakpoints(this.exceptionBreakpoints);
+                    });
                 }
             });
             await this.publish();
@@ -388,7 +458,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         //find the first compile error (i.e. first DiagnosticSeverity.Error) if there is one
         this.compileError = diagnostics.find(x => x.severity === brighterscript_1.DiagnosticSeverity.Error);
         if (this.compileError) {
-            this.sendEvent(new vscode_debugadapter_1.StoppedEvent(Events_1.StoppedEventReason.exception, this.COMPILE_ERROR_THREAD_ID, `CompileError: ${this.compileError.message}`));
+            this.sendEvent(new debugadapter_1.StoppedEvent(Events_1.StoppedEventReason.exception, this.COMPILE_ERROR_THREAD_ID, `CompileError: ${this.compileError.message}`));
         }
         this.sendEvent(new Events_1.DiagnosticsEvent(diagnostics));
     }
@@ -409,8 +479,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
             const statusCode = (_b = (_a = e === null || e === void 0 ? void 0 : e.results) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode;
             const message = e.message;
             if (statusCode === 401) {
-                this.showPopupMessage(message, 'error', true);
-                await this.shutdown(message);
+                await this.shutdown(message, true);
                 throw e;
             }
             this.logger.warn('Failed to delete the dev channel...probably not a big deal', e);
@@ -441,9 +510,8 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
             var _a, _b;
             const statusCode = (_b = (_a = e === null || e === void 0 ? void 0 : e.results) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode;
             const message = e.message;
-            if (statusCode && statusCode !== 200) {
-                this.showPopupMessage(message, 'error', true);
-                await this.shutdown(message);
+            if ((statusCode && statusCode !== 200) || (0, roku_deploy_1.isUpdateCheckRequiredError)(e) || (0, roku_deploy_1.isConnectionResetError)(e)) {
+                await this.shutdown(message, true);
                 throw e;
             }
             this.logger.error(e);
@@ -471,7 +539,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         const lines = logOutput.split(/\r?\n/g);
         for (let line of lines) {
             line += '\n';
-            this.sendEvent(new vscode_debugadapter_1.OutputEvent(line, 'stdout'));
+            this.sendEvent(new debugadapter_1.OutputEvent(line, 'stdout'));
             this.sendEvent(new Events_1.LogOutputEvent(line));
         }
     }
@@ -672,7 +740,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         let threads = [];
         //This is a bit of a hack. If there's a compile error, send a thread to represent it so we can show the compile error like a runtime exception
         if (this.compileError) {
-            threads.push(new vscode_debugadapter_1.Thread(this.COMPILE_ERROR_THREAD_ID, 'Compile Error'));
+            threads.push(new debugadapter_1.Thread(this.COMPILE_ERROR_THREAD_ID, 'Compile Error'));
         }
         else {
             //wait for the roku adapter to load
@@ -681,7 +749,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
             if (this.rokuAdapter.isAtDebuggerPrompt) {
                 let rokuThreads = await this.rokuAdapter.getThreads();
                 for (let thread of rokuThreads) {
-                    threads.push(new vscode_debugadapter_1.Thread(thread.threadId, `Thread ${thread.threadId}`));
+                    threads.push(new debugadapter_1.Thread(thread.threadId, `Thread ${thread.threadId}`));
                 }
                 if (threads.length === 0) {
                     threads = [{
@@ -707,12 +775,12 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
             let frames = [];
             //this is a bit of a hack. If there's a compile error, send a full stack frame so we can show the compile error like a runtime crash
             if (this.compileError) {
-                frames.push(new vscode_debugadapter_1.StackFrame(0, 'Compile Error', new vscode_debugadapter_1.Source(path.basename(this.compileError.path), this.compileError.path), 
+                frames.push(new debugadapter_1.StackFrame(0, 'Compile Error', new debugadapter_1.Source(path.basename(this.compileError.path), this.compileError.path), 
                 //diagnostics are 0 based, vscode expects 1 based
                 this.compileError.range.start.line + 1, this.compileError.range.start.character + 1));
             }
             else if (args.threadId === 1001) {
-                frames.push(new vscode_debugadapter_1.StackFrame(0, 'ERROR: threads would not stop', new vscode_debugadapter_1.Source('main.brs', (0, FileUtils_1.standardizePath) `${this.launchConfiguration.stagingDir}/manifest`), 1, 1));
+                frames.push(new debugadapter_1.StackFrame(0, 'ERROR: threads would not stop', new debugadapter_1.Source('main.brs', (0, FileUtils_1.standardizePath) `${this.launchConfiguration.stagingDir}/manifest`), 1, 1));
                 this.showPopupMessage('Unable to suspend threads. Debugger is in an unstable state, please press Continue to resume debugging', 'warn');
             }
             else {
@@ -739,7 +807,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                             this.logger.error('Error correcting function identifier case', { error, sourceLocation, debugFrame });
                         }
                         const filePath = (_a = sourceLocation === null || sourceLocation === void 0 ? void 0 : sourceLocation.filePath) !== null && _a !== void 0 ? _a : debugFrame.filePath;
-                        const frame = new vscode_debugadapter_1.StackFrame(debugFrame.frameId, `${debugFrame.functionIdentifier}`, new vscode_debugadapter_1.Source(path.basename(filePath), filePath), (_b = sourceLocation === null || sourceLocation === void 0 ? void 0 : sourceLocation.lineNumber) !== null && _b !== void 0 ? _b : debugFrame.lineNumber, 1);
+                        const frame = new debugadapter_1.StackFrame(debugFrame.frameId, `${debugFrame.functionIdentifier}`, new debugadapter_1.Source(path.basename(filePath), filePath), (_b = sourceLocation === null || sourceLocation === void 0 ? void 0 : sourceLocation.lineNumber) !== null && _b !== void 0 ? _b : debugFrame.lineNumber, 1);
                         if (!sourceLocation) {
                             frame.presentationHint = 'subtle';
                         }
@@ -783,12 +851,12 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                     v.request_seq = response.request_seq;
                     v.frameId = args.frameId;
                 }
-                let scope = new vscode_debugadapter_1.Scope('Local', refId, false);
+                let scope = new debugadapter_1.Scope('Local', refId, false);
                 scopes.push(scope);
             }
             else {
                 // NOTE: Legacy telnet support
-                scopes.push(new vscode_debugadapter_1.Scope('Local', this.variableHandles.create('local'), false));
+                scopes.push(new debugadapter_1.Scope('Local', this.variableHandles.create('local'), false));
             }
             response.body = {
                 scopes: scopes
@@ -901,13 +969,14 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                 if (this.launchConfiguration.enableVariablesPanel) {
                     const vars = await this.rokuAdapter.getScopeVariables();
                     for (const varName of vars) {
-                        let result = await this.rokuAdapter.getVariable(varName, -1);
+                        let { evalArgs } = await this.evaluateExpressionToTempVar({ expression: varName, frameId: -1 }, util_1.util.getVariablePath(varName));
+                        let result = await this.rokuAdapter.getVariable(evalArgs.expression, -1);
                         let tempVar = this.getVariableFromResult(result, -1);
                         childVariables.push(tempVar);
                     }
                 }
                 else {
-                    childVariables.push(new vscode_debugadapter_1.Variable('variables disabled by launch.json setting', 'enableVariablesPanel: false'));
+                    childVariables.push(new debugadapter_1.Variable('variables disabled by launch.json setting', 'enableVariablesPanel: false'));
                 }
             }
             else {
@@ -921,7 +990,8 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                 logger.log('variable', v);
                 //query for child vars if we haven't done it yet.
                 if (v.childVariables.length === 0) {
-                    let result = await this.rokuAdapter.getVariable(v.evaluateName, v.frameId);
+                    let { evalArgs } = await this.evaluateExpressionToTempVar({ expression: v.evaluateName, frameId: v.frameId }, util_1.util.getVariablePath(v.evaluateName));
+                    let result = await this.rokuAdapter.getVariable(evalArgs.expression, v.frameId);
                     let tempVar = this.getVariableFromResult(result, v.frameId);
                     tempVar.frameId = v.frameId;
                     v.childVariables = tempVar.childVariables;
@@ -981,7 +1051,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
             if (!this.rokuAdapter.isAtDebuggerPrompt) {
                 let message = 'Skipped evaluate request because RokuAdapter is not accepting requests at this time';
                 if (args.context === 'repl') {
-                    this.sendEvent(new vscode_debugadapter_1.OutputEvent(message, 'stderr'));
+                    this.sendEvent(new debugadapter_1.OutputEvent(message, 'stderr'));
                     response.body = {
                         result: 'invalid',
                         variablesReference: 0
@@ -993,40 +1063,25 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                 //is at debugger prompt
             }
             else {
-                let variablePath = util_1.util.getVariablePath(args.expression);
-                if (!variablePath && util_1.util.isAssignableExpression(args.expression)) {
-                    let varIndex = this.getNextVarIndex(args.frameId);
-                    let arrayVarName = this.tempVarPrefix + 'eval';
-                    if (varIndex === 0) {
-                        const response = await this.rokuAdapter.evaluate(`${arrayVarName} = []`, args.frameId);
-                        console.log(response);
-                    }
-                    let statement = `${arrayVarName}[${varIndex}] = ${args.expression}`;
-                    args.expression = `${arrayVarName}[${varIndex}]`;
-                    let commandResults = await this.rokuAdapter.evaluate(statement, args.frameId);
-                    if (commandResults.type === 'error') {
-                        throw new Error(commandResults.message);
-                    }
-                    variablePath = [arrayVarName, varIndex.toString()];
-                }
+                let { evalArgs, variablePath } = await this.evaluateExpressionToTempVar(args, util_1.util.getVariablePath(args.expression));
                 //if we found a variable path (e.g. ['a', 'b', 'c']) then do a variable lookup because it's faster and more widely supported than `evaluate`
                 if (variablePath) {
-                    let refId = this.getEvaluateRefId(args.expression, args.frameId);
+                    let refId = this.getEvaluateRefId(evalArgs.expression, evalArgs.frameId);
                     let v;
                     //if we already looked this item up, return it
                     if (this.variables[refId]) {
                         v = this.variables[refId];
                     }
                     else {
-                        let result = await this.rokuAdapter.getVariable(args.expression, args.frameId);
+                        let result = await this.rokuAdapter.getVariable(evalArgs.expression, evalArgs.frameId);
                         if (!result) {
                             throw new Error('Error: unable to evaluate expression');
                         }
-                        v = this.getVariableFromResult(result, args.frameId);
+                        v = this.getVariableFromResult(result, evalArgs.frameId);
                         //TODO - testing something, remove later
                         // eslint-disable-next-line camelcase
                         v.request_seq = response.request_seq;
-                        v.frameId = args.frameId;
+                        v.frameId = evalArgs.frameId;
                     }
                     response.body = {
                         result: v.value,
@@ -1038,16 +1093,16 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                     //run an `evaluate` call
                 }
                 else {
-                    let commandResults = await this.rokuAdapter.evaluate(args.expression, args.frameId);
+                    let commandResults = await this.rokuAdapter.evaluate(evalArgs.expression, evalArgs.frameId);
                     commandResults.message = util_1.util.trimDebugPrompt(commandResults.message);
                     if (args.context !== 'watch') {
                         //clear variable cache since this action could have side-effects
                         this.clearState();
-                        this.sendInvalidatedEvent(null, args.frameId);
+                        this.sendInvalidatedEvent(null, evalArgs.frameId);
                     }
                     //if the adapter captured output (probably only telnet), print it to the vscode debug console
                     if (typeof commandResults.message === 'string') {
-                        this.sendEvent(new vscode_debugadapter_1.OutputEvent(commandResults.message, commandResults.type === 'error' ? 'stderr' : 'stdio'));
+                        this.sendEvent(new debugadapter_1.OutputEvent(commandResults.message, commandResults.type === 'error' ? 'stderr' : 'stdio'));
                     }
                     if (this.enableDebugProtocol || (typeof commandResults.message !== 'string')) {
                         response.body = {
@@ -1075,6 +1130,25 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         catch (_b) { }
         deferred.resolve();
     }
+    async evaluateExpressionToTempVar(args, variablePath) {
+        let returnVal = { evalArgs: args, variablePath };
+        if (!variablePath && util_1.util.isAssignableExpression(args.expression)) {
+            let varIndex = this.getNextVarIndex(args.frameId);
+            let arrayVarName = this.tempVarPrefix + 'eval';
+            if (varIndex === 0) {
+                const response = await this.rokuAdapter.evaluate(`${arrayVarName} = []`, args.frameId);
+                console.log(response);
+            }
+            let statement = `${arrayVarName}[${varIndex}] = ${args.expression}`;
+            returnVal.evalArgs.expression = `${arrayVarName}[${varIndex}]`;
+            let commandResults = await this.rokuAdapter.evaluate(statement, args.frameId);
+            if (commandResults.type === 'error') {
+                throw new Error(commandResults.message);
+            }
+            returnVal.variablePath = [arrayVarName, varIndex.toString()];
+        }
+        return returnVal;
+    }
     /**
      * Called when the host stops debugging
      * @param response
@@ -1128,7 +1202,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
             let rokuAdapter = await this.getRokuAdapter();
             let threads = await rokuAdapter.getThreads();
             let threadId = (_a = threads[0]) === null || _a === void 0 ? void 0 : _a.threadId;
-            this.sendEvent(new vscode_debugadapter_1.StoppedEvent(Events_1.StoppedEventReason.exception, threadId, exception.message));
+            this.sendEvent(new debugadapter_1.StoppedEvent(Events_1.StoppedEventReason.exception, threadId, exception.message));
         });
         // If the roku says it can't continue, we are no longer able to debug, so kill the debug session
         this.rokuAdapter.on('cannot-continue', () => {
@@ -1181,7 +1255,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
             }
         }
         this.clearState();
-        const event = new vscode_debugadapter_1.StoppedEvent(Events_1.StoppedEventReason.breakpoint, 
+        const event = new debugadapter_1.StoppedEvent(Events_1.StoppedEventReason.breakpoint, 
         //Not sure why, but sometimes there is no active thread. Just pick thread 0 to prevent the app from totally crashing
         (_b = activeThread === null || activeThread === void 0 ? void 0 : activeThread.threadId) !== null && _b !== void 0 ? _b : 0, '' //exception text
         );
@@ -1199,12 +1273,12 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                     // check to see if this is an dictionary or a list
                     if (result.keyType === 'Integer') {
                         // list type
-                        v = new vscode_debugadapter_1.Variable(result.name, result.type, refId, result.elementCount, 0);
+                        v = new debugadapter_1.Variable(result.name, result.type, refId, result.elementCount, 0);
                         this.variables[refId] = v;
                     }
                     else if (result.keyType === 'String') {
                         // dictionary type
-                        v = new vscode_debugadapter_1.Variable(result.name, result.type, refId, 0, result.elementCount);
+                        v = new debugadapter_1.Variable(result.name, result.type, refId, 0, result.elementCount);
                     }
                 }
                 else {
@@ -1218,30 +1292,30 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                     else {
                         value = `${result.value}`;
                     }
-                    v = new vscode_debugadapter_1.Variable(result.name, value);
+                    v = new debugadapter_1.Variable(result.name, value);
                 }
                 this.variables[refId] = v;
             }
             else {
                 if (result.highLevelType === 'primative' || result.highLevelType === 'uninitialized') {
-                    v = new vscode_debugadapter_1.Variable(result.name, `${result.value}`);
+                    v = new debugadapter_1.Variable(result.name, `${result.value}`);
                 }
                 else if (result.highLevelType === 'array') {
                     let refId = this.getEvaluateRefId(result.evaluateName, frameId);
-                    v = new vscode_debugadapter_1.Variable(result.name, result.type, refId, (_c = (_b = result.children) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0, 0);
+                    v = new debugadapter_1.Variable(result.name, result.type, refId, (_c = (_b = result.children) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0, 0);
                     this.variables[refId] = v;
                 }
                 else if (result.highLevelType === 'object') {
                     let refId = this.getEvaluateRefId(result.evaluateName, frameId);
-                    v = new vscode_debugadapter_1.Variable(result.name, result.type, refId, 0, (_e = (_d = result.children) === null || _d === void 0 ? void 0 : _d.length) !== null && _e !== void 0 ? _e : 0);
+                    v = new debugadapter_1.Variable(result.name, result.type, refId, 0, (_e = (_d = result.children) === null || _d === void 0 ? void 0 : _d.length) !== null && _e !== void 0 ? _e : 0);
                     this.variables[refId] = v;
                 }
                 else if (result.highLevelType === 'function') {
-                    v = new vscode_debugadapter_1.Variable(result.name, result.value);
+                    v = new debugadapter_1.Variable(result.name, result.value);
                 }
                 else {
                     //all other cases, but mostly for HighLevelType.unknown
-                    v = new vscode_debugadapter_1.Variable(result.name, result.value);
+                    v = new debugadapter_1.Variable(result.name, result.value);
                 }
             }
             v.type = result.type;
@@ -1249,6 +1323,9 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
             v.frameId = frameId;
             v.type = result.type;
             v.presentationHint = result.presentationHint ? { kind: result.presentationHint } : undefined;
+            if (util_1.util.isTransientVariable(v.name)) {
+                v.presentationHint = { kind: 'virtual' };
+            }
             if (result.children) {
                 let childVariables = [];
                 for (let childContainer of result.children) {
@@ -1283,7 +1360,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
     sendInvalidatedEvent(threadId, stackFrameId) {
         //if the client supports this request, send it
         if (this.initRequestArgs.supportsInvalidatedEvent) {
-            this.sendEvent(new vscode_debugadapter_1.InvalidatedEvent(['variables'], threadId, stackFrameId));
+            this.sendEvent(new debugadapter_1.InvalidatedEvent(['variables'], threadId, stackFrameId));
         }
     }
     /**
@@ -1301,7 +1378,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
      * Called when the debugger is terminated. Feel free to call this as frequently as you want; we'll only run the shutdown process the first time, and return
      * the same promise on subsequent calls
      */
-    async shutdown(errorMessage) {
+    async shutdown(errorMessage, modal = false) {
         if (this.shutdownPromise === undefined) {
             this.logger.log('[shutdown] Beginning shutdown sequence', errorMessage);
             this.shutdownPromise = this._shutdown(errorMessage);
@@ -1311,7 +1388,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         }
         return this.shutdownPromise;
     }
-    async _shutdown(errorMessage) {
+    async _shutdown(errorMessage, modal = false) {
         var _a, _b, _c, _d, _e, _f, _g;
         try {
             (_a = this.componentLibraryServer) === null || _a === void 0 ? void 0 : _a.stop();
@@ -1333,7 +1410,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
             //if there was an error message, display it to the user
             if (errorMessage) {
                 this.logger.error(errorMessage);
-                this.showPopupMessage(errorMessage, 'error');
+                this.showPopupMessage(errorMessage, 'error', modal);
             }
             this.logger.log('Destroy rokuAdapter');
             await ((_g = (_f = this.rokuAdapter) === null || _f === void 0 ? void 0 : _f.destroy) === null || _g === void 0 ? void 0 : _g.call(_f));
@@ -1346,7 +1423,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                 this.logger.error(e);
             }
             this.logger.log('Send terminated event');
-            this.sendEvent(new vscode_debugadapter_1.TerminatedEvent());
+            this.sendEvent(new debugadapter_1.TerminatedEvent());
             //shut down the process
             this.logger.log('super.shutdown()');
             super.shutdown();