roku-debug 0.20.6 → 0.20.7

package/dist/debugSession/BrightScriptDebugSession.js

@@ -21,10 +21,13 @@ const LocationManager_1 = require("../managers/LocationManager");
 const BreakpointManager_1 = require("../managers/BreakpointManager");
 const logging_1 = require("../logging");
 const xml2js = require("xml2js");
+const VariablesResponse_1 = require("../debugProtocol/events/responses/VariablesResponse");
+const brighterscript_1 = require("brighterscript");
+const diagnosticSource = 'roku-debug';
 class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
     constructor() {
         super();
-        this.logger = logging_1.logger.createLogger(`[${BrightScriptDebugSession.name}]`);
+        this.logger = logging_1.logger.createLogger(`[session]`);
         /**
          * A sequence used to help identify log statements for requests
          */
@@ -42,6 +45,10 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         this.variables = {};
         this.variableHandles = new vscode_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.evaluateRequestPromise = Promise.resolve();
         this.evaluateVarIndexByFrameId = new Map();
         /**
@@ -59,24 +66,24 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         this.locationManager = new LocationManager_1.LocationManager(this.sourceMapManager);
         this.breakpointManager = new BreakpointManager_1.BreakpointManager(this.sourceMapManager, this.locationManager);
         //send newly-verified breakpoints to vscode
-        this.breakpointManager.on('breakpoints-verified', (data) => this.onDeviceVerifiedBreakpoints(data));
+        this.breakpointManager.on('breakpoints-verified', (data) => this.onDeviceBreakpointsChanged('changed', data));
         this.projectManager = new ProjectManager_1.ProjectManager(this.breakpointManager, this.locationManager);
         this.fileLoggingManager = new logging_1.FileLoggingManager();
     }
-    onDeviceVerifiedBreakpoints(data) {
+    onDeviceBreakpointsChanged(eventName, data) {
         this.logger.info('Sending verified device breakpoints to client', data);
         //send all verified breakpoints to the client
         for (const breakpoint of data.breakpoints) {
             const event = {
                 line: breakpoint.line,
                 column: breakpoint.column,
-                verified: true,
+                verified: breakpoint.verified,
                 id: breakpoint.id,
                 source: {
                     path: breakpoint.srcPath
                 }
             };
-            this.sendEvent(new vscode_debugadapter_1.BreakpointEvent('changed', event));
+            this.sendEvent(new vscode_debugadapter_1.BreakpointEvent(eventName, event));
         }
     }
     get enableDebugProtocol() {
@@ -163,8 +170,10 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         }
     }
     async launchRequest(response, config) {
-        var _a;
+        var _a, _b, _c, _d;
         this.logger.log('[launchRequest] begin');
+        //send the response right away so the UI immediately shows the debugger toolbar
+        this.sendResponse(response);
         this.launchConfiguration = config;
         //set the logLevel provided by the launch config
         if (this.launchConfiguration.logLevel) {
@@ -263,26 +272,23 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                     this.sendEvent(new Events_1.LogOutputEvent(message));
                 }
             });
-            //ignore the compile error failure from within the publish
-            this.launchConfiguration.failOnCompileError = false;
-            // Set the remote debug flag on the args to be passed to roku deploy so the socket debugger can be started if needed.
-            this.launchConfiguration.remoteDebug = this.enableDebugProtocol;
             await this.connectAndPublish();
             this.sendEvent(new Events_1.ChannelPublishedEvent(this.launchConfiguration));
             //tell the adapter adapter that the channel has been launched.
             await this.rokuAdapter.activate();
+            if (this.rokuAdapter.isDestroyed) {
+                throw new Error('Debug session encountered an error');
+            }
             if (!error) {
                 if (this.rokuAdapter.connected) {
                     this.logger.info('Host connection was established before the main public process was completed');
                     this.logger.log(`deployed to Roku@${this.launchConfiguration.host}`);
-                    this.sendResponse(response);
                 }
                 else {
                     this.logger.info('Main public process was completed but we are still waiting for a connection to the host');
                     this.rokuAdapter.on('connected', (status) => {
                         if (status) {
                             this.logger.log(`deployed to Roku@${this.launchConfiguration.host}`);
-                            this.sendResponse(response);
                         }
                     });
                 }
@@ -295,13 +301,11 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
             //if the message is anything other than compile errors, we want to display the error
             if (!(e instanceof roku_deploy_1.CompileError)) {
                 util_1.util.log('Encountered an issue during the publish process');
-                util_1.util.log(e.message);
-                this.sendErrorResponse(response, -1, e.message);
+                util_1.util.log((_b = e) === null || _b === void 0 ? void 0 : _b.stack);
+                this.sendErrorResponse(response, -1, (_c = e) === null || _c === void 0 ? void 0 : _c.stack);
+                //send any compile errors to the client
+                await ((_d = this.rokuAdapter) === null || _d === void 0 ? void 0 : _d.sendErrors());
             }
-            //send any compile errors to the client
-            await this.rokuAdapter.sendErrors();
-            this.logger.error('Error. Shutting down.', e);
-            return this.shutdown();
         }
         //at this point, the project has been deployed. If we need to use a deep link, launch it now.
         if (this.launchConfiguration.deepLinkUrl) {
@@ -357,6 +361,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
     async handleDiagnostics(diagnostics) {
         // Roku device and sourcemap work with 1-based line numbers, VSCode expects 0-based lines.
         for (let diagnostic of diagnostics) {
+            diagnostic.source = diagnosticSource;
             let sourceLocation = await this.projectManager.getSourceLocation(diagnostic.path, diagnostic.range.start.line + 1);
             if (sourceLocation) {
                 diagnostic.path = sourceLocation.filePath;
@@ -368,9 +373,12 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                 diagnostic.path = FileUtils_1.fileUtils.removeLeadingSlash(util_1.util.removeFileScheme(diagnostic.path));
             }
         }
+        //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 Events_1.DiagnosticsEvent(diagnostics));
-        //stop the roku adapter and exit the channel
-        return this.shutdown();
     }
     async connectAndPublish() {
         let connectPromise;
@@ -390,9 +398,18 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         //publish the package to the target Roku
         const publishPromise = this.rokuDeploy.publish({
             ...this.launchConfiguration,
+            //typing fix
+            logLevel: logging_1.LogLevelPriority[this.logger.logLevel],
+            // enable the debug protocol if true
+            remoteDebug: this.enableDebugProtocol,
+            //necessary for capturing compile errors from the protocol (has no effect on telnet)
+            remoteDebugConnectEarly: false,
+            //we don't want to fail if there were compile errors...we'll let our compile error processor handle that
             failOnCompileError: true
         }).then(() => {
             packageIsPublished = true;
+        }).catch((e) => {
+            this.logger.error(e);
         });
         await publishPromise;
         this.logger.log(`Uploading zip took ${Date.now() - start}ms`);
@@ -576,6 +593,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
      */
     async setBreakPointsRequest(response, args) {
         var _a;
+        this.logger.log('setBreakpointsRequest');
         let sanitizedBreakpoints = this.breakpointManager.replaceBreakpoints(args.source.path, args.breakpoints);
         //sort the breakpoints
         let sortedAndFilteredBreakpoints = (0, natural_orderby_1.orderBy)(sanitizedBreakpoints, [x => x.line, x => x.column]);
@@ -583,6 +601,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
             breakpoints: sortedAndFilteredBreakpoints
         };
         this.sendResponse(response);
+        this.logger.debug('[setBreakpointsRequest] syncBreakpoints()', args);
         await ((_a = this.rokuAdapter) === null || _a === void 0 ? void 0 : _a.syncBreakpoints());
     }
     exceptionInfoRequest(response, args) {
@@ -593,15 +612,21 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         //wait for the roku adapter to load
         await this.getRokuAdapter();
         let threads = [];
-        //only send the threads request if we are at the debugger prompt
-        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}`));
-            }
+        //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'));
         }
         else {
-            this.logger.log('Skipped getting threads because the RokuAdapter is not accepting input at this time.');
+            //only send the threads request if we are at the debugger prompt
+            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}`));
+                }
+            }
+            else {
+                this.logger.log('Skipped getting threads because the RokuAdapter is not accepting input at this time.');
+            }
         }
         response.body = {
             threads: threads
@@ -613,36 +638,44 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         try {
             this.logger.log('stackTraceRequest');
             let frames = [];
-            if (this.rokuAdapter.isAtDebuggerPrompt) {
-                let stackTrace = await this.rokuAdapter.getStackTrace(args.threadId);
-                for (let debugFrame of stackTrace) {
-                    let sourceLocation = await this.projectManager.getSourceLocation(debugFrame.filePath, debugFrame.lineNumber);
-                    //the stacktrace returns function identifiers in all lower case. Try to get the actual case
-                    //load the contents of the file and get the correct casing for the function identifier
-                    try {
-                        let functionName = this.fileManager.getCorrectFunctionNameCase(sourceLocation === null || sourceLocation === void 0 ? void 0 : sourceLocation.filePath, debugFrame.functionIdentifier);
-                        if (functionName) {
-                            //search for original function name if this is an anonymous function.
-                            //anonymous function names are prefixed with $ in the stack trace (i.e. $anon_1 or $functionname_40002)
-                            if (functionName.startsWith('$')) {
-                                functionName = this.fileManager.getFunctionNameAtPosition(sourceLocation.filePath, sourceLocation.lineNumber - 1, functionName);
+            //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), 
+                //diagnostics are 0 based, vscode expects 1 based
+                this.compileError.range.start.line + 1, this.compileError.range.start.character + 1));
+            }
+            else {
+                if (this.rokuAdapter.isAtDebuggerPrompt) {
+                    let stackTrace = await this.rokuAdapter.getStackTrace(args.threadId);
+                    for (let debugFrame of stackTrace) {
+                        let sourceLocation = await this.projectManager.getSourceLocation(debugFrame.filePath, debugFrame.lineNumber);
+                        //the stacktrace returns function identifiers in all lower case. Try to get the actual case
+                        //load the contents of the file and get the correct casing for the function identifier
+                        try {
+                            let functionName = this.fileManager.getCorrectFunctionNameCase(sourceLocation === null || sourceLocation === void 0 ? void 0 : sourceLocation.filePath, debugFrame.functionIdentifier);
+                            if (functionName) {
+                                //search for original function name if this is an anonymous function.
+                                //anonymous function names are prefixed with $ in the stack trace (i.e. $anon_1 or $functionname_40002)
+                                if (functionName.startsWith('$')) {
+                                    functionName = this.fileManager.getFunctionNameAtPosition(sourceLocation.filePath, sourceLocation.lineNumber - 1, functionName);
+                                }
+                                debugFrame.functionIdentifier = functionName;
                             }
-                            debugFrame.functionIdentifier = functionName;
                         }
+                        catch (error) {
+                            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);
+                        if (!sourceLocation) {
+                            frame.presentationHint = 'subtle';
+                        }
+                        frames.push(frame);
                     }
-                    catch (error) {
-                        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);
-                    if (!sourceLocation) {
-                        frame.presentationHint = 'subtle';
-                    }
-                    frames.push(frame);
                 }
-            }
-            else {
-                this.logger.log('Skipped calculating stacktrace because the RokuAdapter is not accepting input at this time');
+                else {
+                    this.logger.log('Skipped calculating stacktrace because the RokuAdapter is not accepting input at this time');
+                }
             }
             response.body = {
                 stackFrames: frames,
@@ -659,7 +692,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         logger.info('begin', { args });
         try {
             const scopes = new Array();
-            if (this.enableDebugProtocol) {
+            if ((0, DebugProtocolAdapter_1.isDebugProtocolAdapter)(this.rokuAdapter)) {
                 let refId = this.getEvaluateRefId('', args.frameId);
                 let v;
                 //if we already looked this item up, return it
@@ -667,7 +700,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                     v = this.variables[refId];
                 }
                 else {
-                    let result = await this.rokuAdapter.getVariable('', args.frameId, true);
+                    let result = await this.rokuAdapter.getLocalVariables(args.frameId);
                     if (!result) {
                         throw new Error(`Could not get scopes`);
                     }
@@ -696,12 +729,24 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         }
     }
     async continueRequest(response, args) {
+        //if we have a compile error, we should shut down
+        if (this.compileError) {
+            this.sendResponse(response);
+            await this.shutdown();
+            return;
+        }
         this.logger.log('continueRequest');
         await this.rokuAdapter.continue();
         this.sendResponse(response);
     }
     async pauseRequest(response, args) {
         this.logger.log('pauseRequest');
+        //if we have a compile error, we should shut down
+        if (this.compileError) {
+            this.sendResponse(response);
+            await this.shutdown();
+            return;
+        }
         await this.rokuAdapter.pause();
         this.sendResponse(response);
     }
@@ -716,6 +761,12 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
      */
     async nextRequest(response, args) {
         this.logger.log('[nextRequest] begin');
+        //if we have a compile error, we should shut down
+        if (this.compileError) {
+            this.sendResponse(response);
+            await this.shutdown();
+            return;
+        }
         try {
             await this.rokuAdapter.stepOver(args.threadId);
             this.logger.info('[nextRequest] end');
@@ -727,12 +778,24 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
     }
     async stepInRequest(response, args) {
         this.logger.log('[stepInRequest]');
+        //if we have a compile error, we should shut down
+        if (this.compileError) {
+            this.sendResponse(response);
+            await this.shutdown();
+            return;
+        }
         await this.rokuAdapter.stepInto(args.threadId);
         this.sendResponse(response);
         this.logger.info('[stepInRequest] end');
     }
     async stepOutRequest(response, args) {
         this.logger.log('[stepOutRequest] begin');
+        //if we have a compile error, we should shut down
+        if (this.compileError) {
+            this.sendResponse(response);
+            await this.shutdown();
+            return;
+        }
         await this.rokuAdapter.stepOut(args.threadId);
         this.sendResponse(response);
         this.logger.info('[stepOutRequest] end');
@@ -761,7 +824,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                 logger.log('reference', reference);
                 // NOTE: Legacy telnet support for local vars
                 if (this.launchConfiguration.enableVariablesPanel) {
-                    const vars = await this.rokuAdapter.getScopeVariables(reference);
+                    const vars = await this.rokuAdapter.getScopeVariables();
                     for (const varName of vars) {
                         let result = await this.rokuAdapter.getVariable(varName, -1);
                         let tempVar = this.getVariableFromResult(result, -1);
@@ -819,6 +882,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         return value;
     }
     async evaluateRequest(response, args) {
+        var _a;
         let deferred = (0, util_1.defer)();
         if (args.context === 'repl' && !this.enableDebugProtocol && args.expression.trim().startsWith('>')) {
             this.clearState();
@@ -856,11 +920,15 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                     let varIndex = this.getNextVarIndex(args.frameId);
                     let arrayVarName = this.tempVarPrefix + 'eval';
                     if (varIndex === 0) {
-                        await this.rokuAdapter.evaluate(`${arrayVarName} = []`, args.frameId);
+                        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()];
                 }
                 //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`
@@ -872,9 +940,9 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                         v = this.variables[refId];
                     }
                     else {
-                        let result = await this.rokuAdapter.getVariable(args.expression, args.frameId, true);
+                        let result = await this.rokuAdapter.getVariable(args.expression, args.frameId);
                         if (!result) {
-                            throw new Error(`bad variable request "${args.expression}"`);
+                            throw new Error('Error: unable to evaluate expression');
                         }
                         v = this.getVariableFromResult(result, args.frameId);
                         //TODO - testing something, remove later
@@ -920,12 +988,13 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         }
         catch (error) {
             this.logger.error('Error during variables request', error);
+            response.success = false;
+            response.message = (_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : error;
         }
-        //
         try {
             this.sendResponse(response);
         }
-        catch (_a) { }
+        catch (_b) { }
         deferred.resolve();
     }
     /**
@@ -934,19 +1003,16 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
      * @param args
      */
     async disconnectRequest(response, args, request) {
-        if (this.rokuAdapter) {
-            await this.rokuAdapter.destroy();
-        }
         //return to the home screen
         if (!this.enableDebugProtocol) {
             await this.rokuDeploy.pressHomeButton(this.launchConfiguration.host, this.launchConfiguration.remotePort);
         }
-        this.componentLibraryServer.stop();
         this.sendResponse(response);
+        await this.shutdown();
     }
     createRokuAdapter(host, rendezvousTracker) {
         if (this.enableDebugProtocol) {
-            this.rokuAdapter = new DebugProtocolAdapter_1.DebugProtocolAdapter(this.launchConfiguration, this.projectManager, this.breakpointManager, rendezvousTracker);
+            this.rokuAdapter = new DebugProtocolAdapter_1.DebugProtocolAdapter(this.launchConfiguration, this.projectManager, this.breakpointManager, rendezvousTracker, this.deviceInfo);
         }
         else {
             this.rokuAdapter = new TelnetAdapter_1.TelnetAdapter(this.launchConfiguration, rendezvousTracker);
@@ -999,9 +1065,6 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         var _a, _b;
         //clear the index for storing evalutated expressions
         this.evaluateVarIndexByFrameId.clear();
-        //sync breakpoints
-        await ((_a = this.rokuAdapter) === null || _a === void 0 ? void 0 : _a.syncBreakpoints());
-        this.logger.info('received "suspend" event from adapter');
         const threads = await this.rokuAdapter.getThreads();
         const activeThread = threads.find(x => x.isSelected);
         //TODO remove this once Roku fixes their threads off-by-one line number issues
@@ -1015,6 +1078,21 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                 thread.lineNumber = stackTraceLineNumber;
             }
         }));
+        outer: for (const bp of this.breakpointManager.failedDeletions) {
+            for (const thread of threads) {
+                let sourceLocation = await this.projectManager.getSourceLocation(thread.filePath, thread.lineNumber);
+                // This stop was due to a breakpoint that we tried to delete, but couldn't.
+                // Now that we are stopped, we can delete it. We won't stop here again unless you re-add the breakpoint. You're welcome.
+                if ((bp.srcPath === sourceLocation.filePath) && (bp.line === sourceLocation.lineNumber)) {
+                    this.showPopupMessage(`Stopped at breakpoint that failed to delete. Deleting now, and should not cause future stops.`, 'info');
+                    this.logger.warn(`Stopped at breakpoint that failed to delete. Deleting now, and should not cause future stops`, bp, thread, sourceLocation);
+                    break outer;
+                }
+            }
+        }
+        //sync breakpoints
+        await ((_a = this.rokuAdapter) === null || _a === void 0 ? void 0 : _a.syncBreakpoints());
+        this.logger.info('received "suspend" event from adapter');
         //if !stopOnEntry, and we haven't encountered a suspend yet, THIS is the entry breakpoint. auto-continue
         if (!this.entryBreakpointWasHandled && !this.launchConfiguration.stopOnEntry) {
             this.entryBreakpointWasHandled = true;
@@ -1034,7 +1112,7 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         this.sendEvent(event);
     }
     getVariableFromResult(result, frameId) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         let v;
         if (result) {
             if (this.enableDebugProtocol) {
@@ -1052,7 +1130,17 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                     }
                 }
                 else {
-                    v = new vscode_debugadapter_1.Variable(result.name, `${result.value}`);
+                    let value;
+                    if (result.type === VariablesResponse_1.VariableType.Invalid) {
+                        value = (_a = result.value) !== null && _a !== void 0 ? _a : 'Invalid';
+                    }
+                    else if (result.type === VariablesResponse_1.VariableType.Uninitialized) {
+                        value = 'Uninitialized';
+                    }
+                    else {
+                        value = `${result.value}`;
+                    }
+                    v = new vscode_debugadapter_1.Variable(result.name, value);
                 }
                 this.variables[refId] = v;
             }
@@ -1062,12 +1150,12 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                 }
                 else if (result.highLevelType === 'array') {
                     let refId = this.getEvaluateRefId(result.evaluateName, frameId);
-                    v = new vscode_debugadapter_1.Variable(result.name, result.type, refId, (_b = (_a = result.children) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0, 0);
+                    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);
                     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, (_d = (_c = result.children) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0);
+                    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);
                     this.variables[refId] = v;
                 }
                 else if (result.highLevelType === 'function') {
@@ -1091,6 +1179,10 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                 }
                 v.childVariables = childVariables;
             }
+            // if the var is an array and debugProtocol is enabled, include the array size
+            if (this.enableDebugProtocol && v.type === VariablesResponse_1.VariableType.Array) {
+                v.value = `${v.type}(${result.elementCount})`;
+            }
         }
         return v;
     }
@@ -1142,13 +1234,13 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
         return this.shutdownPromise;
     }
     async _shutdown(errorMessage) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         try {
-            //
-            (_b = (_a = this.rendezvousTracker) === null || _a === void 0 ? void 0 : _a.destroy) === null || _b === void 0 ? void 0 : _b.call(_a);
+            (_a = this.componentLibraryServer) === null || _a === void 0 ? void 0 : _a.stop();
+            (_c = (_b = this.rendezvousTracker) === null || _b === void 0 ? void 0 : _b.destroy) === null || _c === void 0 ? void 0 : _c.call(_b);
             //if configured, delete the staging directory
             if (!this.launchConfiguration.retainStagingFolder) {
-                const stagingFolders = (_d = (_c = this.projectManager) === null || _c === void 0 ? void 0 : _c.getStagingFolderPaths()) !== null && _d !== void 0 ? _d : [];
+                const stagingFolders = (_e = (_d = this.projectManager) === null || _d === void 0 ? void 0 : _d.getStagingFolderPaths()) !== null && _e !== void 0 ? _e : [];
                 this.logger.info('deleting staging folders', stagingFolders);
                 for (let stagingFolderPath of stagingFolders) {
                     try {
@@ -1165,18 +1257,15 @@ class BrightScriptDebugSession extends vscode_debugadapter_1.DebugSession {
                 this.logger.error(errorMessage);
                 this.showPopupMessage(errorMessage, 'error');
             }
-            if (this.launchConfiguration.stopDebuggerOnAppExit !== false) {
-                this.logger.log('Destroy rokuAdapter');
-                await ((_f = (_e = this.rokuAdapter) === null || _e === void 0 ? void 0 : _e.destroy) === null || _f === void 0 ? void 0 : _f.call(_e));
-                //press the home button to return to the home screen
-                try {
-                    this.logger.log('Press home button');
-                    await this.rokuDeploy.pressHomeButton(this.launchConfiguration.host, this.launchConfiguration.remotePort);
-                }
-                catch (e) {
-                    console.error(e);
-                    this.logger.error(e);
-                }
+            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));
+            //press the home button to return to the home screen
+            try {
+                this.logger.log('Press home button');
+                await this.rokuDeploy.pressHomeButton(this.launchConfiguration.host, this.launchConfiguration.remotePort);
+            }
+            catch (e) {
+                this.logger.error(e);
             }
             this.logger.log('Send terminated event');
             this.sendEvent(new vscode_debugadapter_1.TerminatedEvent());