brighterscript 0.65.1 → 0.65.3

package/CHANGELOG.md

@@ -6,6 +6,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+## [0.65.3](https://github.com/rokucommunity/brighterscript/compare/v0.65.2...0.65.3) - 2023-07-22
+### Changed
+ - Show busy spinner for lsp builds. Remove `build-status` event in favor of new `busy-status` ([#852](https://github.com/rokucommunity/brighterscript/pull/852))
+ - upgrade to [roku-deploy@3.10.3](https://github.com/rokucommunity/roku-deploy/blob/master/CHANGELOG.md#3103---2023-07-22). Notable changes since 3.10.2:
+     - Bump word-wrap from 1.2.3 to 1.2.4 ([roku-deploy#117](https://github.com/rokucommunity/roku-deploy/pull/117))
+ - Bump word-wrap from 1.2.3 to 1.2.4 ([#851](https://github.com/rokucommunity/brighterscript/pull/851))
+
+
+
+## [0.65.2](https://github.com/rokucommunity/brighterscript/compare/v0.65.1...v0.65.2) - 2023-07-17
+### Added
+ - beforeProgramDispose event ([#844](https://github.com/rokucommunity/brighterscript/pull/844)), ([#845](https://github.com/rokucommunity/brighterscript/pull/845))
+ - profiling support to the cli via the `--profile` flag ([#833](https://github.com/rokucommunity/brighterscript/pull/833))
+### Changed
+ - Make component ready on afterScopeCreate ([#843](https://github.com/rokucommunity/brighterscript/pull/843))
+ - Add project index to language server log entries ([#836](https://github.com/rokucommunity/brighterscript/pull/836))
+ - Prevent crashing when diagnostic is missing range. ([#832](https://github.com/rokucommunity/brighterscript/pull/832))
+ - Prevent crash when diagnostic is missing range ([#831](https://github.com/rokucommunity/brighterscript/pull/831))
+ - Add baseline interface docs ([#829](https://github.com/rokucommunity/brighterscript/pull/829))
+
+
+
 ## [0.65.1](https://github.com/rokucommunity/brighterscript/compare/v0.65.0...v0.65.1) - 2023-06-09
 ### Fixed
  - injection of duplicate super calls into classes ([#823](https://github.com/rokucommunity/brighterscript/pull/823))

package/dist/BusyStatusTracker.d.ts

@@ -0,0 +1,31 @@
+/**
+ * Tracks the busy/idle status of various sync or async tasks
+ * Reports the overall status to the client
+ */
+export declare class BusyStatusTracker {
+    /**
+     * @readonly
+     */
+    activeRuns: Set<{
+        label?: string;
+        startTime?: Date;
+    }>;
+    /**
+     * Start a new piece of work
+     */
+    run<T, R = T | Promise<T>>(callback: (finalize?: FinalizeBuildStatusRun) => R, label?: string): R;
+    private emitter;
+    on(eventName: 'change', handler: (status: BusyStatus) => void): () => void;
+    private emit;
+    destroy(): void;
+    /**
+     * The current status of the busy tracker.
+     * @readonly
+     */
+    get status(): BusyStatus;
+}
+export declare type FinalizeBuildStatusRun = (status?: BusyStatus) => void;
+export declare enum BusyStatus {
+    busy = "busy",
+    idle = "idle"
+}

package/dist/BusyStatusTracker.js

@@ -0,0 +1,83 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BusyStatus = exports.BusyStatusTracker = void 0;
+const eventemitter3_1 = require("eventemitter3");
+/**
+ * Tracks the busy/idle status of various sync or async tasks
+ * Reports the overall status to the client
+ */
+class BusyStatusTracker {
+    constructor() {
+        /**
+         * @readonly
+         */
+        this.activeRuns = new Set();
+        this.emitter = new eventemitter3_1.EventEmitter();
+    }
+    /**
+     * Start a new piece of work
+     */
+    run(callback, label) {
+        const run = {
+            label: label,
+            startTime: new Date()
+        };
+        this.activeRuns.add(run);
+        if (this.activeRuns.size === 1) {
+            this.emit('change', BusyStatus.busy);
+        }
+        let isFinalized = false;
+        const finalizeRun = () => {
+            if (isFinalized === false) {
+                isFinalized = true;
+                this.activeRuns.delete(run);
+                if (this.activeRuns.size <= 0) {
+                    this.emit('change', BusyStatus.idle);
+                }
+            }
+        };
+        let result;
+        //call the callback function
+        try {
+            result = callback(finalizeRun);
+            //if the result is a promise, don't finalize until it completes
+            if (typeof (result === null || result === void 0 ? void 0 : result.then) === 'function') {
+                return Promise.resolve(result).finally(finalizeRun).then(() => result);
+            }
+            else {
+                finalizeRun();
+                return result;
+            }
+        }
+        catch (e) {
+            finalizeRun();
+            throw e;
+        }
+    }
+    on(eventName, handler) {
+        this.emitter.on(eventName, handler);
+        return () => {
+            this.emitter.off(eventName, handler);
+        };
+    }
+    emit(eventName, value) {
+        this.emitter.emit(eventName, value);
+    }
+    destroy() {
+        this.emitter.removeAllListeners();
+    }
+    /**
+     * The current status of the busy tracker.
+     * @readonly
+     */
+    get status() {
+        return this.activeRuns.size === 0 ? BusyStatus.idle : BusyStatus.busy;
+    }
+}
+exports.BusyStatusTracker = BusyStatusTracker;
+var BusyStatus;
+(function (BusyStatus) {
+    BusyStatus["busy"] = "busy";
+    BusyStatus["idle"] = "idle";
+})(BusyStatus = exports.BusyStatus || (exports.BusyStatus = {}));
+//# sourceMappingURL=BusyStatusTracker.js.map

package/dist/BusyStatusTracker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BusyStatusTracker.js","sourceRoot":"","sources":["../src/BusyStatusTracker.ts"],"names":[],"mappings":";;;AAAA,iDAA6C;AAE7C;;;GAGG;AACH,MAAa,iBAAiB;IAA9B;QACI;;WAEG;QACI,eAAU,GAAG,IAAI,GAAG,EAGvB,CAAC;QA4CG,YAAO,GAAG,IAAI,4BAAY,EAAsB,CAAC;IAwB7D,CAAC;IAlEG;;OAEG;IACI,GAAG,CAAwB,QAAkD,EAAE,KAAc;QAChG,MAAM,GAAG,GAAG;YACR,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,IAAI,IAAI,EAAE;SACxB,CAAC;QACF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEzB,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,CAAC,EAAE;YAC5B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;SACxC;QAED,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,MAAM,WAAW,GAAG,GAAG,EAAE;YACrB,IAAI,WAAW,KAAK,KAAK,EAAE;gBACvB,WAAW,GAAG,IAAI,CAAC;gBACnB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC5B,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,EAAE;oBAC3B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;iBACxC;aACJ;QACL,CAAC,CAAC;QAEF,IAAI,MAA0B,CAAC;QAC/B,4BAA4B;QAC5B,IAAI;YACA,MAAM,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC/B,+DAA+D;YAC/D,IAAI,OAAO,CAAC,MAAc,aAAd,MAAM,uBAAN,MAAM,CAAU,IAAI,CAAA,KAAK,UAAU,EAAE;gBAC7C,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAQ,CAAC;aACjF;iBAAM;gBACH,WAAW,EAAE,CAAC;gBACd,OAAO,MAAM,CAAC;aACjB;SACJ;QAAC,OAAO,CAAC,EAAE;YACR,WAAW,EAAE,CAAC;YACd,MAAM,CAAC,CAAC;SACX;IACL,CAAC;IAIM,EAAE,CAAC,SAAmB,EAAE,OAAqC;QAChE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACpC,OAAO,GAAG,EAAE;YACR,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACzC,CAAC,CAAC;IACN,CAAC;IAEO,IAAI,CAAC,SAAmB,EAAE,KAAiB;QAC/C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;IAEM,OAAO;QACV,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;IACtC,CAAC;IAED;;;OAGG;IACH,IAAW,MAAM;QACb,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;IAC1E,CAAC;CACJ;AA3ED,8CA2EC;AAID,IAAY,UAGX;AAHD,WAAY,UAAU;IAClB,2BAAa,CAAA;IACb,2BAAa,CAAA;AACjB,CAAC,EAHW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAGrB"}

package/dist/DiagnosticCollection.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DiagnosticCollection = void 0;
+const util_1 = require("./util");
 class DiagnosticCollection {
     constructor() {
         this.previousDiagnosticsByFile = {};
@@ -13,7 +14,7 @@ class DiagnosticCollection {
         return patch;
     }
     getDiagnosticsByFileFromProjects(projects) {
-        var _a;
+        var _a, _b;
         const result = {};
         //get all diagnostics for all projects
         let diagnostics = Array.prototype.concat.apply([], projects.map((x) => x.builder.getDiagnostics()));
@@ -26,13 +27,15 @@ class DiagnosticCollection {
                 result[srcPath] = [];
             }
             const diagnosticMap = result[srcPath];
+            //fall back to a default range if missing
+            const range = (_b = diagnostic === null || diagnostic === void 0 ? void 0 : diagnostic.range) !== null && _b !== void 0 ? _b : util_1.util.createRange(0, 0, 0, 0);
             diagnostic.key =
                 srcPath.toLowerCase() + '-' +
                     diagnostic.code + '-' +
-                    diagnostic.range.start.line + '-' +
-                    diagnostic.range.start.character + '-' +
-                    diagnostic.range.end.line + '-' +
-                    diagnostic.range.end.character +
+                    range.start.line + '-' +
+                    range.start.character + '-' +
+                    range.end.line + '-' +
+                    range.end.character +
                     diagnostic.message;
             //don't include duplicates
             if (!keys[diagnostic.key]) {

package/dist/DiagnosticCollection.js.map

@@ -1 +1 @@
-{"version":3,"file":"DiagnosticCollection.js","sourceRoot":"","sources":["../src/DiagnosticCollection.ts"],"names":[],"mappings":";;;AAGA,MAAa,oBAAoB;IAAjC;QACY,8BAAyB,GAAG,EAAuC,CAAC;IA6GhF,CAAC;IA3GU,QAAQ,CAAC,QAAmB;QAC/B,MAAM,iBAAiB,GAAG,IAAI,CAAC,gCAAgC,CAAC,QAAQ,CAAC,CAAC;QAE1E,MAAM,KAAK,iDACJ,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,GACvC,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,GACxC,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAC3C,CAAC;QAEF,kCAAkC;QAClC,IAAI,CAAC,yBAAyB,GAAG,iBAAiB,CAAC;QACnD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,gCAAgC,CAAC,QAAmB;;QACxD,MAAM,MAAM,GAAG,EAAuC,CAAC;QAEvD,sCAAsC;QACtC,IAAI,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,EAAuB,EAClE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,CAC7B,CAAC;QAEvB,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,mDAAmD;QACnD,KAAK,IAAI,UAAU,IAAI,WAAW,EAAE;YAChC,MAAM,OAAO,GAAG,MAAA,UAAU,CAAC,IAAI,CAAC,OAAO,mCAAI,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC;YACnE,8BAA8B;YAC9B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;gBAClB,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;aACxB;YACD,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;YAEtC,UAAU,CAAC,GAAG;gBACV,OAAO,CAAC,WAAW,EAAE,GAAG,GAAG;oBAC3B,UAAU,CAAC,IAAI,GAAG,GAAG;oBACrB,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG;oBACjC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,GAAG;oBACtC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG;oBAC/B,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS;oBAC9B,UAAU,CAAC,OAAO,CAAC;YAEvB,0BAA0B;YAC1B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACvB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;gBAC5B,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aAClC;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;OAEG;IACK,eAAe,CAAC,wBAA2D;QAC/E,MAAM,MAAM,GAAG,EAAuC,CAAC;QACvD,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,yBAAyB,EAAE;YACnD,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,EAAE;gBACrC,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;aACzB;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;OAEG;IACK,gBAAgB,CAAC,wBAA2D;QAChF,MAAM,MAAM,GAAG,EAAuC,CAAC;QACvD,KAAK,MAAM,QAAQ,IAAI,wBAAwB,EAAE;YAC7C,qHAAqH;YACrH,IAAI,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,EAAE,wBAAwB,CAAC,QAAQ,CAAC,CAAC,EAAE;gBAC7J,MAAM,CAAC,QAAQ,CAAC,GAAG,wBAAwB,CAAC,QAAQ,CAAC,CAAC;aACzD;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;OAEG;IACK,2BAA2B,CAAC,KAAwB,EAAE,KAAwB;QAClF,oDAAoD;QACpD,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE;YAC/B,OAAO,KAAK,CAAC;SAChB;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACnC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE;gBAC/B,OAAO,KAAK,CAAC;aAChB;SACJ;QAED,6CAA6C;QAC7C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;OAEG;IACK,aAAa,CAAC,wBAA2D;QAC7E,MAAM,MAAM,GAAG,EAAuC,CAAC;QACvD,KAAK,MAAM,QAAQ,IAAI,wBAAwB,EAAE;YAC7C,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,EAAE;gBAC3C,MAAM,CAAC,QAAQ,CAAC,GAAG,wBAAwB,CAAC,QAAQ,CAAC,CAAC;aACzD;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AA9GD,oDA8GC"}
+{"version":3,"file":"DiagnosticCollection.js","sourceRoot":"","sources":["../src/DiagnosticCollection.ts"],"names":[],"mappings":"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"}

package/dist/LanguageServer.d.ts

@@ -3,6 +3,7 @@ import type { InitializeParams, ServerCapabilities, ExecuteCommandParams, Worksp
 import { FileChangeType } from 'vscode-languageserver/node';
 import { ProgramBuilder } from './ProgramBuilder';
 import { Throttler } from './Throttler';
+import { BusyStatusTracker } from './BusyStatusTracker';
 export declare class LanguageServer {
     private connection;
     projects: Project[];
@@ -34,7 +35,10 @@ export declare class LanguageServer {
     private sendDiagnosticsThrottler;
     private boundValidateAll;
     private validateAllThrottled;
+    busyStatusTracker: BusyStatusTracker;
     run(): void;
+    private busyStatusIndex;
+    private sendBusyStatus;
     /**
      * Called when the client starts initialization
      */
@@ -80,6 +84,15 @@ export declare class LanguageServer {
      */
     private documentFileResolver;
     private getConfigFilePath;
+    /**
+     * A unique project counter to help distinguish log entries in lsp mode
+     */
+    private projectCounter;
+    /**
+     * @param projectPath path to the project
+     * @param workspacePath path to the workspace in which all project should reside or are referenced by
+     * @param projectNumber an optional project number to assign to the project. Used when reloading projects that should keep the same number
+     */
     private createProject;
     private createStandaloneFileProject;
     private getProjects;
@@ -139,6 +152,7 @@ export declare class LanguageServer {
     private onDefinition;
     private onSignatureHelp;
     private onReferences;
+    private onValidateSettled;
     private onFullSemanticTokens;
     private diagnosticCollection;
     private sendDiagnostics;
@@ -147,6 +161,10 @@ export declare class LanguageServer {
     dispose(): void;
 }
 export interface Project {
+    /**
+     * A unique number for this project, generated during this current language server session. Mostly used so we can identify which project is doing logging
+     */
+    projectNumber: number;
     firstRunPromise: Promise<any>;
     builder: ProgramBuilder;
     /**
@@ -165,3 +183,6 @@ export interface Project {
 export declare enum CustomCommands {
     TranspileFile = "TranspileFile"
 }
+export declare enum NotificationName {
+    busyStatus = "busyStatus"
+}

package/dist/LanguageServer.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomCommands = exports.LanguageServer = void 0;
+exports.NotificationName = exports.CustomCommands = exports.LanguageServer = void 0;
 require("array-flat-polyfill");
 const fastGlob = require("fast-glob");
 const path = require("path");
@@ -24,6 +24,7 @@ const KeyedThrottler_1 = require("./KeyedThrottler");
 const DiagnosticCollection_1 = require("./DiagnosticCollection");
 const reflection_1 = require("./astUtils/reflection");
 const SemanticTokenUtils_1 = require("./SemanticTokenUtils");
+const BusyStatusTracker_1 = require("./BusyStatusTracker");
 class LanguageServer {
     constructor() {
         this.connection = undefined;
@@ -53,6 +54,12 @@ class LanguageServer {
         this.validateThrottler = new Throttler_1.Throttler(0);
         this.sendDiagnosticsThrottler = new Throttler_1.Throttler(0);
         this.boundValidateAll = this.validateAll.bind(this);
+        this.busyStatusTracker = new BusyStatusTracker_1.BusyStatusTracker();
+        this.busyStatusIndex = -1;
+        /**
+         * A unique project counter to help distinguish log entries in lsp mode
+         */
+        this.projectCounter = 0;
         this.diagnosticCollection = new DiagnosticCollection_1.DiagnosticCollection();
     }
     createConnection() {
@@ -66,6 +73,10 @@ class LanguageServer {
         // Create a connection for the server. The connection uses Node's IPC as a transport.
         // Also include all preview / proposed LSP features.
         this.connection = this.createConnection();
+        // Send the current status of the busyStatusTracker anytime it changes
+        this.busyStatusTracker.on('change', (status) => {
+            this.sendBusyStatus(status);
+        });
         //listen to all of the output log events and pipe them into the debug channel in the extension
         this.loggerSubscription = Logger_1.Logger.subscribe((text) => {
             this.connection.tracer.log(text);
@@ -120,6 +131,15 @@ class LanguageServer {
         // Listen on the connection
         this.connection.listen();
     }
+    sendBusyStatus(status) {
+        this.busyStatusIndex = ++this.busyStatusIndex <= 0 ? 0 : this.busyStatusIndex;
+        this.connection.sendNotification(NotificationName.busyStatus, {
+            status: status,
+            timestamp: Date.now(),
+            index: this.busyStatusIndex,
+            activeRuns: [...this.busyStatusTracker.activeRuns]
+        });
+    }
     /**
      * Called when the client starts initialization
      */
@@ -322,7 +342,6 @@ class LanguageServer {
         if (waitForFirstProject) {
             await this.initialProjectsCreated;
         }
-        let status;
         for (let project of this.getProjects()) {
             try {
                 await project.firstRunPromise;
@@ -335,7 +354,6 @@ class LanguageServer {
                 this.sendCriticalFailure(`BrighterScript language server failed to start: \n${e.message}`);
             }
         }
-        this.connection.sendNotification('build-status', status ? status : 'success');
     }
     /**
      * Event handler for when the program wants to load file contents.
@@ -390,7 +408,12 @@ class LanguageServer {
         //no config file could be found
         return undefined;
     }
-    async createProject(projectPath, workspacePath = projectPath) {
+    /**
+     * @param projectPath path to the project
+     * @param workspacePath path to the workspace in which all project should reside or are referenced by
+     * @param projectNumber an optional project number to assign to the project. Used when reloading projects that should keep the same number
+     */
+    async createProject(projectPath, workspacePath = projectPath, projectNumber) {
         workspacePath !== null && workspacePath !== void 0 ? workspacePath : (workspacePath = projectPath);
         let project = this.projects.find((x) => x.projectPath === projectPath);
         //skip this project if we already have it
@@ -398,6 +421,9 @@ class LanguageServer {
             return;
         }
         let builder = new ProgramBuilder_1.ProgramBuilder();
+        projectNumber !== null && projectNumber !== void 0 ? projectNumber : (projectNumber = this.projectCounter++);
+        builder.logger.prefix = `[prj${projectNumber}]`;
+        builder.logger.log(`Created project #${projectNumber} for: "${projectPath}"`);
         //flush diagnostics every time the program finishes validating
         builder.plugins.add({
             name: 'bsc-language-server',
@@ -419,21 +445,11 @@ class LanguageServer {
             //config file doesn't exist...let `brighterscript` resolve the default way
             configFilePath = undefined;
         }
-        let firstRunPromise = builder.run({
-            cwd: cwd,
-            project: configFilePath,
-            watch: false,
-            createPackage: false,
-            deploy: false,
-            copyToStaging: false,
-            showDiagnosticsInConsole: false
-        });
-        firstRunPromise.catch((err) => {
-            console.error(err);
-        });
+        const firstRunDeferred = new deferred_1.Deferred();
         let newProject = {
+            projectNumber: projectNumber,
             builder: builder,
-            firstRunPromise: firstRunPromise,
+            firstRunPromise: firstRunDeferred.promise,
             projectPath: projectPath,
             workspacePath: workspacePath,
             isFirstRunComplete: false,
@@ -442,19 +458,31 @@ class LanguageServer {
             isStandaloneFileProject: false
         };
         this.projects.push(newProject);
-        await firstRunPromise.then(() => {
+        try {
+            await builder.run({
+                cwd: cwd,
+                project: configFilePath,
+                watch: false,
+                createPackage: false,
+                deploy: false,
+                copyToStaging: false,
+                showDiagnosticsInConsole: false
+            });
             newProject.isFirstRunComplete = true;
             newProject.isFirstRunSuccessful = true;
-        }).catch(() => {
+            firstRunDeferred.resolve();
+        }
+        catch (e) {
+            builder.logger.error(e);
+            firstRunDeferred.reject(e);
             newProject.isFirstRunComplete = true;
             newProject.isFirstRunSuccessful = false;
-        }).then(() => {
-            //if we found a deprecated brsconfig.json, add a diagnostic warning the user
-            if (configFilePath && path.basename(configFilePath) === 'brsconfig.json') {
-                builder.addDiagnostic(configFilePath, Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.brsConfigJsonIsDeprecated()), { range: util_1.util.createRange(0, 0, 0, 0) }));
-                return this.sendDiagnostics();
-            }
-        });
+        }
+        //if we found a deprecated brsconfig.json, add a diagnostic warning the user
+        if (configFilePath && path.basename(configFilePath) === 'brsconfig.json') {
+            builder.addDiagnostic(configFilePath, Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.brsConfigJsonIsDeprecated()), { range: util_1.util.createRange(0, 0, 0, 0) }));
+            return this.sendDiagnostics();
+        }
     }
     async createStandaloneFileProject(srcPath) {
         //skip this workspace if we already have it
@@ -487,6 +515,7 @@ class LanguageServer {
             console.error(err);
         });
         let newProject = {
+            projectNumber: this.projectCounter++,
             builder: builder,
             firstRunPromise: firstRunPromise,
             projectPath: srcPath,
@@ -588,7 +617,7 @@ class LanguageServer {
             if (project.isStandaloneFileProject === false) {
                 this.removeProject(project);
                 //create a new workspace/brs program
-                await this.createProject(project.projectPath, project.workspacePath);
+                await this.createProject(project.projectPath, project.workspacePath, project.projectNumber);
                 //handle temp workspace
             }
             else {
@@ -669,7 +698,6 @@ class LanguageServer {
     async onDidChangeWatchedFiles(params) {
         //ensure programs are initialized
         await this.waitAllProjectFirstRuns();
-        this.connection.sendNotification('build-status', 'building');
         let projects = this.getProjects();
         //convert all file paths to absolute paths
         let changes = params.changes.map(x => {
@@ -738,7 +766,6 @@ class LanguageServer {
             //give every workspace the chance to handle file changes
             await Promise.all(projects.map((project) => this.handleFileChanges(project, changes)));
         }
-        this.connection.sendNotification('build-status', 'success');
     }
     /**
      * This only operates on files that match the specified files globs, so it is safe to throw
@@ -863,7 +890,6 @@ class LanguageServer {
             //throttle file processing. first call is run immediately, and then the last call is processed.
             await this.keyedThrottler.run(filePath, () => {
                 var _a;
-                this.connection.sendNotification('build-status', 'building');
                 let documentText = document.getText();
                 for (const project of this.getProjects()) {
                     //only add or replace existing files. All of the files in the project should
@@ -892,13 +918,15 @@ class LanguageServer {
             await this.synchronizeStandaloneProjects();
             let projects = this.getProjects();
             //validate all programs
-            await Promise.all(projects.map((x) => x.builder.program.validate()));
+            await Promise.all(projects.map((project) => {
+                project.builder.program.validate();
+                return project;
+            }));
         }
         catch (e) {
             this.connection.console.error(e);
             this.sendCriticalFailure(`Critical error validating project: ${e.message}${(_a = e.stack) !== null && _a !== void 0 ? _a : ''}`);
         }
-        this.connection.sendNotification('build-status', 'success');
     }
     async onWorkspaceSymbol(params) {
         await this.waitAllProjectFirstRuns();
@@ -966,15 +994,20 @@ class LanguageServer {
         })), c => c);
         return results.filter((r) => r);
     }
+    onValidateSettled() {
+        return Promise.all([
+            //wait for the validator to start running (or timeout if it never did)
+            this.validateThrottler.onRunOnce(100),
+            //wait for the validator to stop running (or resolve immediately if it's already idle)
+            this.validateThrottler.onIdleOnce(true)
+        ]);
+    }
     async onFullSemanticTokens(params) {
         await this.waitAllProjectFirstRuns();
-        await Promise.all([
-            //wait for the file to settle (in case there are multiple file changes in quick succession)
-            this.keyedThrottler.onIdleOnce(util_1.util.uriToPath(params.textDocument.uri), true),
-            // wait for the validation to finish before providing semantic tokens. program.validate() populates and then caches AstNode.parent properties.
-            // If we don't wait, then fetching semantic tokens can cause some invalid cache
-            this.validateThrottler.onIdleOnce(false)
-        ]);
+        //wait for the file to settle (in case there are multiple file changes in quick succession)
+        await this.keyedThrottler.onIdleOnce(util_1.util.uriToPath(params.textDocument.uri), true);
+        //wait for the validation cycle to settle
+        await this.onValidateSettled();
         const srcPath = util_1.util.uriToPath(params.textDocument.uri);
         for (const project of this.projects) {
             //find the first program that has this file, since it would be incredibly inefficient to generate semantic tokens for the same file multiple times.
@@ -1031,22 +1064,35 @@ __decorate([
     AddStackToErrorMessage
 ], LanguageServer.prototype, "onInitialize", null);
 __decorate([
-    AddStackToErrorMessage
+    TrackBusyStatus
+], LanguageServer.prototype, "getProjectPaths", null);
+__decorate([
+    TrackBusyStatus
+], LanguageServer.prototype, "syncProjects", null);
+__decorate([
+    AddStackToErrorMessage,
+    TrackBusyStatus
 ], LanguageServer.prototype, "onInitialized", null);
 __decorate([
-    AddStackToErrorMessage
+    TrackBusyStatus
+], LanguageServer.prototype, "createProject", null);
+__decorate([
+    AddStackToErrorMessage,
+    TrackBusyStatus
 ], LanguageServer.prototype, "onCompletion", null);
 __decorate([
     AddStackToErrorMessage
 ], LanguageServer.prototype, "onCompletionResolve", null);
 __decorate([
-    AddStackToErrorMessage
+    AddStackToErrorMessage,
+    TrackBusyStatus
 ], LanguageServer.prototype, "onCodeAction", null);
 __decorate([
     AddStackToErrorMessage
 ], LanguageServer.prototype, "onDidChangeConfiguration", null);
 __decorate([
-    AddStackToErrorMessage
+    AddStackToErrorMessage,
+    TrackBusyStatus
 ], LanguageServer.prototype, "onDidChangeWatchedFiles", null);
 __decorate([
     AddStackToErrorMessage
@@ -1055,34 +1101,49 @@ __decorate([
     AddStackToErrorMessage
 ], LanguageServer.prototype, "onDocumentClose", null);
 __decorate([
-    AddStackToErrorMessage
+    AddStackToErrorMessage,
+    TrackBusyStatus
 ], LanguageServer.prototype, "validateTextDocument", null);
 __decorate([
-    AddStackToErrorMessage
+    TrackBusyStatus
+], LanguageServer.prototype, "validateAll", null);
+__decorate([
+    AddStackToErrorMessage,
+    TrackBusyStatus
 ], LanguageServer.prototype, "onWorkspaceSymbol", null);
 __decorate([
-    AddStackToErrorMessage
+    AddStackToErrorMessage,
+    TrackBusyStatus
 ], LanguageServer.prototype, "onDocumentSymbol", null);
 __decorate([
-    AddStackToErrorMessage
+    AddStackToErrorMessage,
+    TrackBusyStatus
 ], LanguageServer.prototype, "onDefinition", null);
 __decorate([
-    AddStackToErrorMessage
+    AddStackToErrorMessage,
+    TrackBusyStatus
 ], LanguageServer.prototype, "onSignatureHelp", null);
 __decorate([
-    AddStackToErrorMessage
+    AddStackToErrorMessage,
+    TrackBusyStatus
 ], LanguageServer.prototype, "onReferences", null);
 __decorate([
-    AddStackToErrorMessage
+    AddStackToErrorMessage,
+    TrackBusyStatus
 ], LanguageServer.prototype, "onFullSemanticTokens", null);
 __decorate([
-    AddStackToErrorMessage
+    AddStackToErrorMessage,
+    TrackBusyStatus
 ], LanguageServer.prototype, "onExecuteCommand", null);
 exports.LanguageServer = LanguageServer;
 var CustomCommands;
 (function (CustomCommands) {
     CustomCommands["TranspileFile"] = "TranspileFile";
 })(CustomCommands = exports.CustomCommands || (exports.CustomCommands = {}));
+var NotificationName;
+(function (NotificationName) {
+    NotificationName["busyStatus"] = "busyStatus";
+})(NotificationName = exports.NotificationName || (exports.NotificationName = {}));
 /**
  * Wraps a method. If there's an error (either sync or via a promise),
  * this appends the error's stack trace at the end of the error message so that the connection will
@@ -1114,4 +1175,16 @@ function AddStackToErrorMessage(target, propertyKey, descriptor) {
         }
     };
 }
+/**
+ * An annotation used to wrap the method in a busyStatus tracking call
+ */
+function TrackBusyStatus(target, propertyKey, descriptor) {
+    let originalMethod = descriptor.value;
+    //wrapping the original method
+    descriptor.value = function value(...args) {
+        return this.busyStatusTracker.run(() => {
+            return originalMethod.apply(this, args);
+        }, originalMethod.name);
+    };
+}
 //# sourceMappingURL=LanguageServer.js.map