brighterscript 0.68.4 → 0.69.0

package/CHANGELOG.md

@@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+## [0.69.0](https://github.com/rokucommunity/brighterscript/compare/v0.68.5...v0.69.0) - 2025-02-10
+### Changed
+ - Language Server Rewrite ([#993](https://github.com/rokucommunity/brighterscript/pull/993))
+
+
+
+## [0.68.5](https://github.com/rokucommunity/brighterscript/compare/v0.68.4...v0.68.5) - 2025-02-06
+### Added
+ - Add experimental `validate` flag to ProgramBuilder.run() ([#1409](https://github.com/rokucommunity/brighterscript/pull/1409))
+
+
+
 ## [0.68.4](https://github.com/rokucommunity/brighterscript/compare/v0.68.3...v0.68.4) - 2025-01-22
 ### Changed
  - upgrade to [roku-deploy@3.12.4](https://github.com/rokucommunity/roku-deploy/blob/master/CHANGELOG.md#3124---2025-01-22). Notable changes since 3.12.3:

package/dist/BusyStatusTracker.d.ts

@@ -1,21 +1,50 @@
+import { Deferred } from './deferred';
+interface RunInfo<T> {
+    label: string;
+    startTime: Date;
+    scope?: T;
+    deferred?: Deferred;
+}
 /**
  * Tracks the busy/idle status of various sync or async tasks
  * Reports the overall status to the client
  */
-export declare class BusyStatusTracker {
+export declare class BusyStatusTracker<T = any> {
     /**
      * @readonly
      */
-    activeRuns: Set<{
-        label?: string;
-        startTime?: Date;
-    }>;
+    activeRuns: Array<RunInfo<T>>;
+    /**
+     * Begin a busy task. It's expected you will call `endScopeRun` when the task is complete.
+     * @param scope an object used for reference as to what is doing the work. Can be used to bulk-cancel all runs for a given scope.
+     * @param label  label for the run. This is required for the `endScopedRun` method to know what to end.
+     */
+    beginScopedRun(scope: T, label: string): void;
+    /**
+     * End the earliest run for the given scope and label
+     * @param scope an object used for reference as to what is doing the work. Can be used to bulk-cancel all runs for a given scope.
+     * @param label label for the run
+     */
+    endScopedRun(scope: T, label: string): Promise<void>;
+    /**
+     * End all runs for a given scope. This is typically used when the scope is destroyed, and we want to make sure all runs are cleaned up.
+     * @param scope an object used for reference as to what is doing the work.
+     */
+    endAllRunsForScope(scope: T): void;
     /**
      * Start a new piece of work
      */
-    run<T, R = T | Promise<T>>(callback: (finalize?: FinalizeBuildStatusRun) => R, label?: string): R;
+    run<A, R = A | Promise<A>>(callback: (finalize?: FinalizeBuildStatusRun) => R, label?: string): R;
+    private _run;
     private emitter;
-    on(eventName: 'change', handler: (status: BusyStatus) => void): () => void;
+    once(eventName: 'active-runs-change'): Promise<{
+        activeRuns: Array<RunInfo<T>>;
+    }>;
+    once(eventName: 'change'): Promise<BusyStatus>;
+    on(eventName: 'active-runs-change', handler: (event: {
+        activeRuns: Array<RunInfo<T>>;
+    }) => void): any;
+    on(eventName: 'change', handler: (status: BusyStatus) => void): any;
     private emit;
     destroy(): void;
     /**
@@ -29,3 +58,4 @@ export declare enum BusyStatus {
     busy = "busy",
     idle = "idle"
 }
+export {};

package/dist/BusyStatusTracker.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BusyStatus = exports.BusyStatusTracker = void 0;
 const eventemitter3_1 = require("eventemitter3");
+const deferred_1 = require("./deferred");
 /**
  * Tracks the busy/idle status of various sync or async tasks
  * Reports the overall status to the client
@@ -11,9 +12,57 @@ class BusyStatusTracker {
         /**
          * @readonly
          */
-        this.activeRuns = new Set();
+        this.activeRuns = [];
         this.emitter = new eventemitter3_1.EventEmitter();
     }
+    /**
+     * Begin a busy task. It's expected you will call `endScopeRun` when the task is complete.
+     * @param scope an object used for reference as to what is doing the work. Can be used to bulk-cancel all runs for a given scope.
+     * @param label  label for the run. This is required for the `endScopedRun` method to know what to end.
+     */
+    beginScopedRun(scope, label) {
+        const deferred = new deferred_1.Deferred();
+        const runInfo = {
+            label: label,
+            startTime: new Date(),
+            deferred: deferred,
+            scope: scope
+        };
+        void this._run(runInfo, () => {
+            //don't mark the busy run as completed until the deferred is resolved
+            return deferred.promise;
+        });
+    }
+    /**
+     * End the earliest run for the given scope and label
+     * @param scope an object used for reference as to what is doing the work. Can be used to bulk-cancel all runs for a given scope.
+     * @param label label for the run
+     */
+    endScopedRun(scope, label) {
+        const earliestRunIndex = this.activeRuns.findIndex(x => x.scope === scope && x.label === label);
+        if (earliestRunIndex === -1) {
+            return;
+        }
+        const earliestRun = this.activeRuns[earliestRunIndex];
+        this.activeRuns.splice(earliestRunIndex, 1);
+        earliestRun.deferred.resolve();
+        return earliestRun.deferred.promise;
+    }
+    /**
+     * End all runs for a given scope. This is typically used when the scope is destroyed, and we want to make sure all runs are cleaned up.
+     * @param scope an object used for reference as to what is doing the work.
+     */
+    endAllRunsForScope(scope) {
+        for (let i = this.activeRuns.length - 1; i >= 0; i--) {
+            const activeRun = this.activeRuns[i];
+            if (activeRun.scope === scope) {
+                //delete the active run
+                this.activeRuns.splice(i, 1);
+                //mark the run as resolved
+                activeRun.deferred.resolve();
+            }
+        }
+    }
     /**
      * Start a new piece of work
      */
@@ -22,16 +71,24 @@ class BusyStatusTracker {
             label: label,
             startTime: new Date()
         };
-        this.activeRuns.add(run);
-        if (this.activeRuns.size === 1) {
+        return this._run(run, callback);
+    }
+    _run(runInfo, callback, label) {
+        this.activeRuns.push(runInfo);
+        if (this.activeRuns.length === 1) {
             this.emit('change', BusyStatus.busy);
         }
+        this.emit('active-runs-change', { activeRuns: [...this.activeRuns] });
         let isFinalized = false;
         const finalizeRun = () => {
             if (isFinalized === false) {
                 isFinalized = true;
-                this.activeRuns.delete(run);
-                if (this.activeRuns.size <= 0) {
+                let idx = this.activeRuns.indexOf(runInfo);
+                if (idx > -1) {
+                    this.activeRuns.splice(idx, 1);
+                }
+                this.emit('active-runs-change', { activeRuns: [...this.activeRuns] });
+                if (this.activeRuns.length <= 0) {
                     this.emit('change', BusyStatus.idle);
                 }
             }
@@ -54,14 +111,22 @@ class BusyStatusTracker {
             throw e;
         }
     }
+    once(eventName) {
+        return new Promise((resolve) => {
+            const off = this.on(eventName, (data) => {
+                off();
+                resolve(data);
+            });
+        });
+    }
     on(eventName, handler) {
         this.emitter.on(eventName, handler);
         return () => {
             this.emitter.off(eventName, handler);
         };
     }
-    emit(eventName, value) {
-        this.emitter.emit(eventName, value);
+    emit(eventName, event) {
+        this.emitter.emit(eventName, event);
     }
     destroy() {
         this.emitter.removeAllListeners();
@@ -71,7 +136,7 @@ class BusyStatusTracker {
      * @readonly
      */
     get status() {
-        return this.activeRuns.size === 0 ? BusyStatus.idle : BusyStatus.busy;
+        return this.activeRuns.length === 0 ? BusyStatus.idle : BusyStatus.busy;
     }
 }
 exports.BusyStatusTracker = BusyStatusTracker;

package/dist/BusyStatusTracker.js.map

@@ -1 +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"}
+{"version":3,"file":"BusyStatusTracker.js","sourceRoot":"","sources":["../src/BusyStatusTracker.ts"],"names":[],"mappings":"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"}

package/dist/DiagnosticCollection.d.ts

@@ -1,11 +1,24 @@
-import type { BsDiagnostic } from './interfaces';
-import type { Project } from './LanguageServer';
+import type { LspDiagnostic } from './lsp/LspProject';
 export declare class DiagnosticCollection {
     private previousDiagnosticsByFile;
-    getPatch(projects: Project[]): {
+    /**
+     * Get a patch of any changed diagnostics since last time. This takes a single project and diagnostics, but evaluates
+     * the patch based on all previously seen projects. It's supposed to be a rolling patch.
+     * This will include _ALL_ diagnostics for a file if any diagnostics have changed for that file, due to how the language server expects diagnostics to be sent.
+     */
+    getPatch(projectId: number, diagnostics: LspDiagnostic[]): {
         [x: string]: KeyedDiagnostic[];
     };
-    private getDiagnosticsByFileFromProjects;
+    /**
+     * Get all the previous diagnostics, remove any that were exclusive to the current project, then mix in the project's new diagnostics.
+     * @param projectId the id of the project that should have its diagnostics refreshed
+     * @param thisProjectDiagnostics diagnostics for the project
+     */
+    private getDiagnosticsByFile;
+    /**
+     * Clone the previousDiagnosticsByFile, retaining the array of project references on each diagnostic
+     */
+    private clonePreviousDiagnosticsByFile;
     /**
      * Get a patch for all the files that have been removed since last time
      */
@@ -23,7 +36,8 @@ export declare class DiagnosticCollection {
      */
     private getAddedPatch;
 }
-interface KeyedDiagnostic extends BsDiagnostic {
+interface KeyedDiagnostic extends LspDiagnostic {
     key: string;
+    projectIds: Set<number>;
 }
 export {};

package/dist/DiagnosticCollection.js

@@ -1,34 +1,59 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DiagnosticCollection = void 0;
+const vscode_uri_1 = require("vscode-uri");
 const util_1 = require("./util");
+const thenby_1 = require("thenby");
 class DiagnosticCollection {
     constructor() {
         this.previousDiagnosticsByFile = {};
     }
-    getPatch(projects) {
-        const diagnosticsByFile = this.getDiagnosticsByFileFromProjects(projects);
+    /**
+     * Get a patch of any changed diagnostics since last time. This takes a single project and diagnostics, but evaluates
+     * the patch based on all previously seen projects. It's supposed to be a rolling patch.
+     * This will include _ALL_ diagnostics for a file if any diagnostics have changed for that file, due to how the language server expects diagnostics to be sent.
+     */
+    getPatch(projectId, diagnostics) {
+        const diagnosticsByFile = this.getDiagnosticsByFile(projectId, diagnostics);
         const patch = Object.assign(Object.assign(Object.assign({}, this.getRemovedPatch(diagnosticsByFile)), this.getModifiedPatch(diagnosticsByFile)), this.getAddedPatch(diagnosticsByFile));
         //save the new list of diagnostics
         this.previousDiagnosticsByFile = diagnosticsByFile;
         return patch;
     }
-    getDiagnosticsByFileFromProjects(projects) {
+    /**
+     * Get all the previous diagnostics, remove any that were exclusive to the current project, then mix in the project's new diagnostics.
+     * @param projectId the id of the project that should have its diagnostics refreshed
+     * @param thisProjectDiagnostics diagnostics for the project
+     */
+    getDiagnosticsByFile(projectId, thisProjectDiagnostics) {
         var _a, _b;
-        const result = {};
-        //get all diagnostics for all projects
-        let diagnostics = Array.prototype.concat.apply([], projects.map((x) => x.builder.getDiagnostics()));
-        const keys = {};
+        const result = this.clonePreviousDiagnosticsByFile();
+        const diagnosticsByKey = new Map();
+        //delete all diagnostics linked to this project
+        for (const srcPath in result) {
+            const diagnostics = result[srcPath];
+            for (let i = diagnostics.length - 1; i >= 0; i--) {
+                const diagnostic = diagnostics[i];
+                //remember this diagnostic key for use when deduplicating down below
+                diagnosticsByKey.set(diagnostic.key, diagnostic);
+                //unlink the diagnostic from this project
+                diagnostic.projectIds.delete(projectId);
+                //delete this diagnostic if it's no longer linked to any projects
+                if (diagnostic.projectIds.size === 0) {
+                    diagnostics.splice(i, 1);
+                    diagnosticsByKey.delete(diagnostic.key);
+                }
+            }
+        }
         //build the full current set of diagnostics by file
-        for (let diagnostic of diagnostics) {
-            const srcPath = (_a = diagnostic.file.srcPath) !== null && _a !== void 0 ? _a : diagnostic.file.srcPath;
+        for (let diagnostic of thisProjectDiagnostics) {
+            const srcPath = vscode_uri_1.URI.parse(diagnostic.uri).fsPath;
             //ensure the file entry exists
             if (!result[srcPath]) {
                 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);
+            const range = (_a = diagnostic.range) !== null && _a !== void 0 ? _a : util_1.util.createRange(0, 0, 0, 0);
             diagnostic.key =
                 srcPath.toLowerCase() + '-' +
                     diagnostic.code + '-' +
@@ -37,21 +62,46 @@ class DiagnosticCollection {
                     range.end.line + '-' +
                     range.end.character +
                     diagnostic.message;
+            (_b = diagnostic.projectIds) !== null && _b !== void 0 ? _b : (diagnostic.projectIds = new Set([projectId]));
             //don't include duplicates
-            if (!keys[diagnostic.key]) {
-                keys[diagnostic.key] = true;
-                diagnosticMap.push(diagnostic);
+            if (!diagnosticsByKey.has(diagnostic.key)) {
+                diagnosticsByKey.set(diagnostic.key, diagnostic);
+                const diagnosticsForFile = result[srcPath];
+                diagnosticsForFile.push(diagnostic);
             }
+            //link this project to the diagnostic
+            diagnosticsByKey.get(diagnostic.key).projectIds.add(projectId);
+        }
+        //sort the list so it's easier to compare later
+        for (let key in result) {
+            result[key].sort((0, thenby_1.firstBy)(x => x.key));
         }
         return result;
     }
+    /**
+     * Clone the previousDiagnosticsByFile, retaining the array of project references on each diagnostic
+     */
+    clonePreviousDiagnosticsByFile() {
+        let clone = {};
+        for (let key in this.previousDiagnosticsByFile) {
+            clone[key] = [];
+            for (const diagnostic of this.previousDiagnosticsByFile[key]) {
+                clone[key].push(Object.assign(Object.assign({}, diagnostic), { 
+                    //make a copy of the projects array (but keep the project references intact)
+                    projectIds: new Set([...diagnostic.projectIds]) }));
+            }
+        }
+        return clone;
+    }
     /**
      * Get a patch for all the files that have been removed since last time
      */
     getRemovedPatch(currentDiagnosticsByFile) {
+        var _a, _b;
         const result = {};
         for (const filePath in this.previousDiagnosticsByFile) {
-            if (!currentDiagnosticsByFile[filePath]) {
+            //if there are no current diagnostics for this file, add an empty array to the result for that file path
+            if (((_b = (_a = currentDiagnosticsByFile[filePath]) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) === 0) {
                 result[filePath] = [];
             }
         }
@@ -90,9 +140,10 @@ class DiagnosticCollection {
      * Get diagnostics for all new files not seen since last time
      */
     getAddedPatch(currentDiagnosticsByFile) {
+        var _a, _b;
         const result = {};
         for (const filePath in currentDiagnosticsByFile) {
-            if (!this.previousDiagnosticsByFile[filePath]) {
+            if (((_b = (_a = this.previousDiagnosticsByFile[filePath]) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) === 0) {
                 result[filePath] = currentDiagnosticsByFile[filePath];
             }
         }

package/dist/DiagnosticCollection.js.map

@@ -1 +1 @@
-{"version":3,"file":"DiagnosticCollection.js","sourceRoot":"","sources":["../src/DiagnosticCollection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DiagnosticCollection.js","sourceRoot":"","sources":["../src/DiagnosticCollection.ts"],"names":[],"mappings":"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"}