brighterscript 1.0.0-alpha.5 → 1.0.0-alpha.51

package/dist/BusyStatusTracker.d.ts

@@ -0,0 +1,61 @@
+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<T = any> {
+    /**
+     * @readonly
+     */
+    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<A, R = A | Promise<A>>(callback: (finalize?: FinalizeBuildStatusRun) => R, label?: string): R;
+    private _run;
+    private emitter;
+    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;
+    /**
+     * 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"
+}
+export {};

package/dist/BusyStatusTracker.js

@@ -0,0 +1,148 @@
+"use strict";
+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
+ */
+class BusyStatusTracker {
+    constructor() {
+        /**
+         * @readonly
+         */
+        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
+     */
+    run(callback, label) {
+        const run = {
+            label: label,
+            startTime: new Date()
+        };
+        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;
+                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);
+                }
+            }
+        };
+        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;
+        }
+    }
+    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, event) {
+        this.emitter.emit(eventName, event);
+    }
+    destroy() {
+        this.emitter.removeAllListeners();
+    }
+    /**
+     * The current status of the busy tracker.
+     * @readonly
+     */
+    get status() {
+        return this.activeRuns.length === 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;AAC7C,yCAAsC;AAStC;;;GAGG;AACH,MAAa,iBAAiB;IAA9B;QACI;;WAEG;QACI,eAAU,GAAsB,EAAE,CAAC;QA6GlC,YAAO,GAAG,IAAI,4BAAY,EAAsB,CAAC;IAuC7D,CAAC;IAlJG;;;;OAIG;IACI,cAAc,CAAC,KAAQ,EAAE,KAAa;QACzC,MAAM,QAAQ,GAAG,IAAI,mBAAQ,EAAE,CAAC;QAEhC,MAAM,OAAO,GAAG;YACZ,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,IAAI,IAAI,EAAE;YACrB,QAAQ,EAAE,QAAQ;YAClB,KAAK,EAAE,KAAK;SACf,CAAC;QAEF,KAAK,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;YACzB,qEAAqE;YACrE,OAAO,QAAQ,CAAC,OAAO,CAAC;QAC5B,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;OAIG;IACI,YAAY,CAAC,KAAQ,EAAE,KAAa;QACvC,MAAM,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,IAAI,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;QAChG,IAAI,gBAAgB,KAAK,CAAC,CAAC,EAAE;YACzB,OAAO;SACV;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;QACtD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;QAC5C,WAAW,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QAC/B,OAAO,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC;IACxC,CAAC;IAED;;;OAGG;IACI,kBAAkB,CAAC,KAAQ;QAC9B,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;YAClD,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACrC,IAAI,SAAS,CAAC,KAAK,KAAK,KAAK,EAAE;gBAC3B,uBAAuB;gBACvB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC7B,0BAA0B;gBAC1B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;aAChC;SACJ;IACL,CAAC;IAED;;OAEG;IACI,GAAG,CAAwB,QAAkD,EAAE,KAAc;QAChG,MAAM,GAAG,GAAG;YACR,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,IAAI,IAAI,EAAE;SACxB,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CAAO,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAEO,IAAI,CAAwB,OAAmB,EAAE,QAAkD,EAAE,KAAc;QACvH,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE9B,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;SACxC;QACD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,UAAU,EAAE,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAEtE,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,MAAM,WAAW,GAAG,GAAG,EAAE;YACrB,IAAI,WAAW,KAAK,KAAK,EAAE;gBACvB,WAAW,GAAG,IAAI,CAAC;gBAEnB,IAAI,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAC3C,IAAI,GAAG,GAAG,CAAC,CAAC,EAAE;oBACV,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;iBAClC;gBAED,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,UAAU,EAAE,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;gBAEtE,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,EAAE;oBAC7B,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;IAMM,IAAI,CAAI,SAAiB;QAC5B,OAAO,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,EAAE;YAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,SAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC3C,GAAG,EAAE,CAAC;gBACN,OAAO,CAAC,IAAW,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAIM,EAAE,CAAC,SAAiB,EAAE,OAA6B;QACtD,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;IAIO,IAAI,CAAC,SAAiB,EAAE,KAAU;QACtC,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,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;IAC5E,CAAC;CACJ;AAxJD,8CAwJC;AAID,IAAY,UAGX;AAHD,WAAY,UAAU;IAClB,2BAAa,CAAA;IACb,2BAAa,CAAA;AACjB,CAAC,EAHW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAGrB"}

package/dist/Cache.d.ts

@@ -1,15 +1,10 @@
 /**
- * Synchronous cache
+ * A cache that will call the factory to create the item if it doesn't exist
  */
-export declare class Cache {
-    private cache;
+export declare class Cache<TKey = any, TValue = any> extends Map<TKey, TValue> {
     /**
      * Get value from the cache if it exists,
      * otherwise call the factory function to create the value, add it to the cache, and return it.
      */
-    getOrAdd<T>(key: string, factory: (key: string) => T): T;
-    /**
-     * Clear the cache
-     */
-    clear(): void;
+    getOrAdd<R extends TValue = TValue>(key: TKey, factory: (key: TKey) => R): R;
 }

package/dist/Cache.js

@@ -2,27 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Cache = void 0;
 /**
- * Synchronous cache
+ * A cache that will call the factory to create the item if it doesn't exist
  */
-class Cache {
-    constructor() {
-        this.cache = {};
-    }
+class Cache extends Map {
     /**
      * Get value from the cache if it exists,
      * otherwise call the factory function to create the value, add it to the cache, and return it.
      */
     getOrAdd(key, factory) {
-        if (this.cache[key] === undefined) {
-            this.cache[key] = factory(key);
+        if (!super.has(key)) {
+            const value = factory(key);
+            super.set(key, value);
+            return value;
+        }
+        else {
+            return super.get(key);
         }
-        return this.cache[key];
-    }
-    /**
-     * Clear the cache
-     */
-    clear() {
-        this.cache = {};
     }
 }
 exports.Cache = Cache;

package/dist/Cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"Cache.js","sourceRoot":"","sources":["../src/Cache.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,MAAa,KAAK;IAAlB;QACY,UAAK,GAAG,EAAyB,CAAC;IAkB9C,CAAC;IAhBG;;;OAGG;IACI,QAAQ,CAAI,GAAW,EAAE,OAA2B;QACvD,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE;YAC/B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;SAClC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAM,CAAC;IAChC,CAAC;IACD;;OAEG;IACI,KAAK;QACR,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IACpB,CAAC;CACJ;AAnBD,sBAmBC"}
+{"version":3,"file":"Cache.js","sourceRoot":"","sources":["../src/Cache.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,MAAa,KAAgC,SAAQ,GAAiB;IAElE;;;OAGG;IACI,QAAQ,CAA4B,GAAS,EAAE,OAAyB;QAC3E,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACjB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;YAC3B,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACtB,OAAO,KAAK,CAAC;SAChB;aAAM;YACH,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,CAAM,CAAC;SAC9B;IACL,CAAC;CACJ;AAfD,sBAeC"}

package/dist/CacheVerifier.d.ts

@@ -0,0 +1,7 @@
+export declare class CacheVerifier {
+    private currentToken;
+    constructor();
+    generateToken(): void;
+    getToken(): string;
+    checkToken(token: string): boolean;
+}

package/dist/CacheVerifier.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CacheVerifier = void 0;
+const uuid_1 = require("uuid");
+class CacheVerifier {
+    constructor() {
+        this.generateToken();
+    }
+    generateToken() {
+        this.currentToken = (0, uuid_1.v4)();
+    }
+    getToken() {
+        return this.currentToken;
+    }
+    checkToken(token) {
+        return token === this.currentToken;
+    }
+}
+exports.CacheVerifier = CacheVerifier;
+//# sourceMappingURL=CacheVerifier.js.map

package/dist/CacheVerifier.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CacheVerifier.js","sourceRoot":"","sources":["../src/CacheVerifier.ts"],"names":[],"mappings":";;;AAAA,+BAAkC;AAElC,MAAa,aAAa;IAItB;QACI,IAAI,CAAC,aAAa,EAAE,CAAC;IACzB,CAAC;IAED,aAAa;QACT,IAAI,CAAC,YAAY,GAAG,IAAA,SAAI,GAAE,CAAC;IAC/B,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED,UAAU,CAAC,KAAa;QACpB,OAAO,KAAK,KAAK,IAAI,CAAC,YAAY,CAAC;IACvC,CAAC;CACJ;AAnBD,sCAmBC"}

package/dist/CodeActionUtil.d.ts

@@ -1,14 +1,34 @@
-import type { CodeActionKind, Diagnostic, Position, Range } from 'vscode-languageserver';
-import { CodeAction } from 'vscode-languageserver';
+import type { Diagnostic, Position, Range } from 'vscode-languageserver';
+import { CodeActionKind, CodeAction } from 'vscode-languageserver';
+import type { BsDiagnostic } from './interfaces';
 export declare class CodeActionUtil {
     createCodeAction(obj: CodeActionShorthand): CodeAction;
+    serializableDiagnostics(diagnostics: BsDiagnostic[] | undefined): Diagnostic[];
 }
+export { CodeActionKind };
 export interface CodeActionShorthand {
     title: string;
-    diagnostics?: Diagnostic[];
+    diagnostics?: BsDiagnostic[];
     kind?: CodeActionKind;
     isPreferred?: boolean;
-    changes: Array<InsertChange | ReplaceChange>;
+    changes: Array<InsertChange | ReplaceChange | DeleteChange>;
+}
+/**
+ * Represents a single named "source fix all" action that a plugin contributes.
+ * Each action becomes a separate entry in VS Code's Source Actions menu.
+ * Plugins are responsible for merging all their changes into the `changes` array.
+ */
+export interface SourceFixAllCodeAction {
+    title: string;
+    /**
+     * The LSP code action kind. Should start with `source.fixAll`.
+     * Use a sub-kind like `source.fixAll.brighterscript.imports` to create
+     * a distinct named entry in the Source Actions menu.
+     * Defaults to `source.fixAll.brighterscript`.
+     */
+    kind?: string;
+    isPreferred?: boolean;
+    changes: Array<InsertChange | ReplaceChange | DeleteChange>;
 }
 export interface InsertChange {
     filePath: string;
@@ -22,4 +42,9 @@ export interface ReplaceChange {
     type: 'replace';
     range: Range;
 }
+export interface DeleteChange {
+    filePath: string;
+    type: 'delete';
+    range: Range;
+}
 export declare const codeActionUtil: CodeActionUtil;

package/dist/CodeActionUtil.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.codeActionUtil = exports.CodeActionUtil = void 0;
+exports.codeActionUtil = exports.CodeActionKind = exports.CodeActionUtil = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
-const vscode_uri_1 = require("vscode-uri");
+Object.defineProperty(exports, "CodeActionKind", { enumerable: true, get: function () { return vscode_languageserver_1.CodeActionKind; } });
+const util_1 = require("./util");
 class CodeActionUtil {
     createCodeAction(obj) {
         const edit = {
             changes: {}
         };
         for (const change of obj.changes) {
-            const uri = vscode_uri_1.URI.file(change.filePath).toString();
+            const uri = util_1.default.pathToUri(change.filePath);
             //create the edit changes array for this uri
             if (!edit.changes[uri]) {
                 edit.changes[uri] = [];
@@ -18,10 +19,26 @@ class CodeActionUtil {
                 edit.changes[uri].push(vscode_languageserver_1.TextEdit.insert(change.position, change.newText));
             }
             else if (change.type === 'replace') {
-                vscode_languageserver_1.TextEdit.replace(change.range, change.newText);
+                edit.changes[uri].push(vscode_languageserver_1.TextEdit.replace(change.range, change.newText));
+            }
+            else if (change.type === 'delete') {
+                edit.changes[uri].push(vscode_languageserver_1.TextEdit.del(change.range));
             }
         }
-        return vscode_languageserver_1.CodeAction.create(obj.title, edit);
+        const action = vscode_languageserver_1.CodeAction.create(obj.title, edit, obj.kind);
+        action.isPreferred = obj.isPreferred;
+        action.diagnostics = this.serializableDiagnostics(obj.diagnostics);
+        return action;
+    }
+    serializableDiagnostics(diagnostics) {
+        return diagnostics === null || diagnostics === void 0 ? void 0 : diagnostics.map(({ location, severity, code, source, message, relatedInformation }) => ({
+            range: location === null || location === void 0 ? void 0 : location.range,
+            severity: severity,
+            source: source,
+            code: code,
+            message: message,
+            relatedInformation: relatedInformation
+        }));
     }
 }
 exports.CodeActionUtil = CodeActionUtil;

package/dist/CodeActionUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"CodeActionUtil.js","sourceRoot":"","sources":["../src/CodeActionUtil.ts"],"names":[],"mappings":";;;AACA,iEAA6D;AAC7D,2CAAiC;AAEjC,MAAa,cAAc;IAEhB,gBAAgB,CAAC,GAAwB;QAC5C,MAAM,IAAI,GAAG;YACT,OAAO,EAAE,EAAE;SACG,CAAC;QACnB,KAAK,MAAM,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE;YAC9B,MAAM,GAAG,GAAG,gBAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;YAEjD,4CAA4C;YAC5C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;aAC1B;YACD,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC1B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAClB,gCAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CACnD,CAAC;aACL;iBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;gBAClC,gCAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;aAClD;SACJ;QACD,OAAO,kCAAU,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC9C,CAAC;CACJ;AAvBD,wCAuBC;AAwBY,QAAA,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC"}
+{"version":3,"file":"CodeActionUtil.js","sourceRoot":"","sources":["../src/CodeActionUtil.ts"],"names":[],"mappings":";;;AACA,iEAA6E;AAiDpE,+FAjDA,sCAAc,OAiDA;AA/CvB,iCAA0B;AAE1B,MAAa,cAAc;IAEhB,gBAAgB,CAAC,GAAwB;QAC5C,MAAM,IAAI,GAAG;YACT,OAAO,EAAE,EAAE;SACG,CAAC;QACnB,KAAK,MAAM,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE;YAC9B,MAAM,GAAG,GAAG,cAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAE5C,4CAA4C;YAC5C,IAAI,CAAC,IAAI,CAAC,OAAQ,CAAC,GAAG,CAAC,EAAE;gBACrB,IAAI,CAAC,OAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;aAC3B;YACD,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC1B,IAAI,CAAC,OAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CACnB,gCAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CACnD,CAAC;aACL;iBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;gBAClC,IAAI,CAAC,OAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CACnB,gCAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CACjD,CAAC;aACL;iBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACjC,IAAI,CAAC,OAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CACnB,gCAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAC7B,CAAC;aACL;SACJ;QACD,MAAM,MAAM,GAAG,kCAAU,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,CAAC,WAAW,GAAG,GAAG,CAAC,WAAW,CAAC;QACrC,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACnE,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,uBAAuB,CAAC,WAAuC;QAClE,OAAO,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAAE,EAAE,CAAC,CAAC;YAC5F,KAAK,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK;YACtB,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,OAAO;YAChB,kBAAkB,EAAE,kBAAkB;SACzC,CAAC,CAAC,CAAC;IACR,CAAC;CACJ;AA3CD,wCA2CC;AAmDY,QAAA,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC"}

package/dist/CommentFlagProcessor.d.ts

@@ -1,5 +1,6 @@
 import type { Range } from 'vscode-languageserver';
-import type { BscFile, BsDiagnostic, CommentFlag, DiagnosticCode } from './interfaces';
+import type { BscFile } from './files/BscFile';
+import type { BsDiagnostic, CommentFlag, DiagnosticCode } from './interfaces';
 export declare class CommentFlagProcessor {
     /**
      * The file this processor applies to
@@ -12,11 +13,7 @@ export declare class CommentFlagProcessor {
     /**
      * Valid diagnostic codes. Codes NOT in this list will be flagged
      */
-    diagnosticCodes: (string | number)[];
-    /**
-     * Diagnostic codes to never filter (these codes will always be flagged)
-     */
-    ignoreDiagnosticCodes: (string | number)[];
+    diagnosticCodes: DiagnosticCode[];
     constructor(
     /**
      * The file this processor applies to
@@ -29,11 +26,7 @@ export declare class CommentFlagProcessor {
     /**
      * Valid diagnostic codes. Codes NOT in this list will be flagged
      */
-    diagnosticCodes?: (string | number)[], 
-    /**
-     * Diagnostic codes to never filter (these codes will always be flagged)
-     */
-    ignoreDiagnosticCodes?: (string | number)[]);
+    diagnosticCodes?: DiagnosticCode[]);
     /**
      * List of comment flags generated during processing
      */
@@ -43,17 +36,29 @@ export declare class CommentFlagProcessor {
      */
     diagnostics: BsDiagnostic[];
     /**
-     * A list of all codes EXCEPT the ones in `ignoreDiagnosticCodes`
+     * Block-level `bs:disable` / `bs:enable` directives, recorded in source order
+     * by `tryAdd` and resolved into `CommentFlag`s by `finalize()`.
      */
-    allCodesExceptIgnores: DiagnosticCode[];
+    private blockDirectives;
     tryAdd(text: string, range: Range): void;
     /**
-     * Small tokenizer for bs:disable comments
+     * Resolve any pending `bs:disable` / `bs:enable` block directives into `CommentFlag`s.
+     * Must be called after the file's comment tokens have been fed through `tryAdd`.
+     */
+    finalize(): void;
+    /**
+     * Resolve a list of `{ code, range }` tokens into validated diagnostic codes.
+     * Pushes diagnostics for any unknown numeric codes. Returns `null` when no codes were specified
+     * (i.e. a bare `bs:disable` / `bs:enable`), and an array otherwise.
+     */
+    private collectCodes;
+    /**
+     * Small tokenizer for `bs:` directive comments.
      */
     private tokenize;
     /**
      * Given a string, extract each item split by whitespace
-     * @param text
+     * @param text the text to tokenize
      */
     private tokenizeByWhitespace;
 }