brighterscript 1.0.0-alpha.5 → 1.0.0-alpha.50

package/dist/common/Sequencer.js

@@ -0,0 +1,233 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Sequencer = void 0;
+const util_1 = require("../util");
+const eventemitter3_1 = require("eventemitter3");
+const parseMilliseconds = require("parse-ms");
+const perf_hooks_1 = require("perf_hooks");
+/**
+ * Supports running a series of actions in sequence, either synchronously or asynchronously
+ * @private
+ */
+class Sequencer {
+    constructor(options) {
+        this.options = options;
+        // eslint-disable-next-line @typescript-eslint/ban-types
+        this.actions = [];
+        this.emitter = new eventemitter3_1.EventEmitter();
+        /**
+         * An object that collects timing information for our actions
+         */
+        this.metrics = new Map();
+    }
+    get minSyncDuration() {
+        var _a, _b;
+        return (_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.minSyncDuration) !== null && _b !== void 0 ? _b : 150;
+    }
+    forEach(label, itemsOrFactory, func) {
+        //register a single action for now, we will fetch the full list and register their actions later
+        const primaryAction = {
+            args: [],
+            label: label,
+            func: (data) => {
+                const items = typeof itemsOrFactory === 'function' ? itemsOrFactory() : itemsOrFactory;
+                const actions = [];
+                let i = 0;
+                for (const item of items) {
+                    actions.push({
+                        label: label + `[${i++}]`,
+                        groupLabel: label,
+                        args: [item],
+                        func: func
+                    });
+                }
+                let primaryActionIndex = this.actions.indexOf(primaryAction);
+                //insert all of these item actions immediately after this action
+                this.actions.splice(primaryActionIndex + 1, 0, ...actions);
+            }
+        };
+        this.actions.push(primaryAction);
+        return this;
+    }
+    onCancel(callback) {
+        this.emitter.on('cancel', callback);
+        return this;
+    }
+    onComplete(callback) {
+        this.emitter.on('complete', callback);
+        return this;
+    }
+    onSuccess(callback) {
+        this.emitter.on('success', callback);
+        return this;
+    }
+    once(label, func) {
+        this.actions.push({
+            args: [],
+            func: func,
+            label: label
+        });
+        return this;
+    }
+    async run() {
+        var _a, _b, _c, _d;
+        try {
+            let start = Date.now();
+            for (const action of this.actions) {
+                //register a very short timeout between every action so we don't hog the CPU
+                if (Date.now() - start > this.minSyncDuration) {
+                    await util_1.util.sleep(1);
+                    start = Date.now();
+                }
+                //if the cancellation token has asked us to cancel, then stop processing now
+                if ((_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.cancellationToken) === null || _b === void 0 ? void 0 : _b.isCancellationRequested) {
+                    return this.handleCancel();
+                }
+                await this.runActionAsync(action);
+                //if the cancellation token has asked us to cancel, then stop processing now
+                if ((_d = (_c = this.options) === null || _c === void 0 ? void 0 : _c.cancellationToken) === null || _d === void 0 ? void 0 : _d.isCancellationRequested) {
+                    return this.handleCancel();
+                }
+            }
+            this.emitter.emit('success');
+        }
+        catch (e) {
+            this.handleCancel();
+            throw e;
+        }
+        finally {
+            this.emitter.emit('complete');
+            this.dispose();
+        }
+    }
+    runSync() {
+        var _a, _b;
+        try {
+            for (const action of this.actions) {
+                //if the cancellation token has asked us to cancel, then stop processing now
+                if ((_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.cancellationToken) === null || _b === void 0 ? void 0 : _b.isCancellationRequested) {
+                    return this.handleCancel();
+                }
+                const result = this.runActionSync(action);
+                if (typeof (result === null || result === void 0 ? void 0 : result.then) === 'function') {
+                    throw new Error(`Action returned a promise which is unsupported when running 'runSync'`);
+                }
+            }
+            this.emitter.emit('success');
+        }
+        catch (e) {
+            this.handleCancel();
+            throw e;
+        }
+        finally {
+            this.emitter.emit('complete');
+            this.dispose();
+        }
+    }
+    async runActionAsync(action) {
+        //record the start time for this action
+        let perfBefore = perf_hooks_1.performance.now();
+        try {
+            return await Promise.resolve(action.func(...action.args));
+        }
+        finally {
+            let perfAfter = perf_hooks_1.performance.now();
+            this.incrementMetric(action.label, perfAfter - perfBefore, 1, !!action.groupLabel);
+            if (action.groupLabel) {
+                this.incrementMetric(action.groupLabel, perfAfter - perfBefore, 1);
+            }
+        }
+    }
+    runActionSync(action) {
+        //record the start time for this action
+        let perfBefore = perf_hooks_1.performance.now();
+        try {
+            return action.func(...action.args);
+        }
+        finally {
+            let perfAfter = perf_hooks_1.performance.now();
+            this.incrementMetric(action.label, perfAfter - perfBefore, 1, !!action.groupLabel);
+            if (action.groupLabel) {
+                this.incrementMetric(action.groupLabel, perfAfter - perfBefore, 1);
+            }
+        }
+    }
+    /**
+     * Get all the metrics in a text-based format (useful for logging)
+     */
+    formatMetrics(options) {
+        let results = [];
+        let total = 0;
+        for (const [label, metric] of this.metrics) {
+            //skip loop iterations if options say they should be skipped
+            if (metric.isLoopIteration && (options === null || options === void 0 ? void 0 : options.includeLoopIterations) !== true) {
+                continue;
+            }
+            //sum all the non-loop iterations (i.e. the one-off runs or grouped loop runs).
+            //this represents the total time spend running these tasks
+            if (!metric.isLoopIteration) {
+                total += metric.duration;
+            }
+            results.push({
+                label: label,
+                durationText: this.getDurationText(metric.duration),
+                callText: `${metric.callCount} calls`
+            });
+        }
+        let maxLabelLength = Math.max(...results.map(x => x.label.length));
+        let maxCallTextLength = Math.max(...results.map(x => x.callText.length));
+        let maxDurationLength = Math.max(...results.map(x => x.durationText.length));
+        results.push({
+            label: 'Total',
+            durationText: this.getDurationText(total),
+            callText: ''
+        });
+        return ((options === null || options === void 0 ? void 0 : options.header) ? options.header + '\n' : '') +
+            results.map(x => {
+                var _a, _b, _c;
+                return [
+                    '    ' + ((_a = x.label) !== null && _a !== void 0 ? _a : '').padEnd(maxLabelLength + 2, '-') +
+                        (' ' + ((_b = x.durationText) !== null && _b !== void 0 ? _b : '')).padStart(maxDurationLength + 2, '-') + ', ' +
+                        ((_c = x.callText) !== null && _c !== void 0 ? _c : '').padStart(maxCallTextLength, ' ')
+                ].join(', ');
+            }).join('\n');
+    }
+    getDurationText(duration) {
+        let parts = parseMilliseconds(duration);
+        let fractionalMilliseconds = parseInt(duration.toFixed(3).toString().split('.')[1]);
+        let result = `${parts.minutes}m${parts.seconds.toString().padStart(2, '0')}s${parts.milliseconds.toString().padStart(3, '0')}.${fractionalMilliseconds.toString().padStart(3, '0')}ms`;
+        //remove leading zeros for minutes and seconds
+        result = result.replace(/^0+m/, '').replace(/^0+s/, '');
+        return result;
+    }
+    /**
+     * Bump the metric for the given key by the given duration and call count
+     * @param label the label of the action to have its metric incremented
+     * @param duration the amount of new duration to add to the existing duration
+     * @param callCount the amount of new calls to add to the existing call count
+     */
+    incrementMetric(label, duration, callCount, isLoopIteration = false) {
+        let metric = this.metrics.get(label);
+        if (!metric) {
+            metric = {
+                duration: 0,
+                callCount: 0,
+                isLoopIteration: false
+            };
+            this.metrics.set(label, metric);
+        }
+        metric.duration += duration;
+        metric.callCount += callCount;
+        metric.isLoopIteration = isLoopIteration;
+    }
+    handleCancel() {
+        var _a;
+        console.log(`Cancelling sequence ${(_a = this.options) === null || _a === void 0 ? void 0 : _a.name}`);
+        this.emitter.emit('cancel');
+    }
+    dispose() {
+        this.emitter.removeAllListeners();
+    }
+}
+exports.Sequencer = Sequencer;
+//# sourceMappingURL=Sequencer.js.map

package/dist/common/Sequencer.js.map

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

package/dist/common/Sequencer.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/common/Sequencer.spec.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vscode_languageserver_protocol_1 = require("vscode-languageserver-protocol");
+const Sequencer_1 = require("./Sequencer");
+const chai_config_spec_1 = require("../chai-config.spec");
+describe('Sequencer', () => {
+    it('cancels when asked', () => {
+        const cancellationTokenSource = new vscode_languageserver_protocol_1.CancellationTokenSource();
+        const values = [];
+        new Sequencer_1.Sequencer({
+            name: 'test',
+            cancellationToken: cancellationTokenSource.token,
+            minSyncDuration: 100
+        }).forEach('run', [1, 2, 3], (i) => {
+            values.push(i);
+            if (i === 2) {
+                cancellationTokenSource.cancel();
+            }
+        }).runSync();
+        (0, chai_config_spec_1.expect)(values).to.eql([1, 2]);
+    });
+    it('throws when returning a promise from runSync', () => {
+        let error;
+        try {
+            new Sequencer_1.Sequencer().once('run', () => {
+                return Promise.resolve();
+            }).runSync();
+        }
+        catch (e) {
+            error = e;
+        }
+        (0, chai_config_spec_1.expect)(error === null || error === void 0 ? void 0 : error.message).to.eql(`Action returned a promise which is unsupported when running 'runSync'`);
+    });
+    it('waits for async actions to complete', async () => {
+        const values = [];
+        await new Sequencer_1.Sequencer().forEach('run', [1, 2, 3], async (i) => {
+            await new Promise((resolve) => {
+                setTimeout(resolve, 10);
+            });
+            values.push(i);
+        }).run();
+        (0, chai_config_spec_1.expect)(values).to.eql([1, 2, 3]);
+    });
+    it('runSync() calls cancel before throwing', () => {
+        let cancelCalled = false;
+        try {
+            new Sequencer_1.Sequencer().once('run', () => {
+                throw new Error('crash');
+            }).onCancel(() => {
+                cancelCalled = true;
+            }).runSync();
+        }
+        catch (e) {
+            //this is expected
+            (0, chai_config_spec_1.expect)(e.message).to.eql('crash');
+        }
+        (0, chai_config_spec_1.expect)(cancelCalled).to.be.true;
+    });
+    it('run() calls cancel before throwing', async () => {
+        let cancelCalled = false;
+        try {
+            await new Sequencer_1.Sequencer().once('run', () => {
+                throw new Error('crash');
+            }).onCancel(() => {
+                cancelCalled = true;
+            }).run();
+        }
+        catch (e) {
+            //this is expected
+            (0, chai_config_spec_1.expect)(e.message).to.eql('crash');
+        }
+        (0, chai_config_spec_1.expect)(cancelCalled).to.be.true;
+    });
+});
+//# sourceMappingURL=Sequencer.spec.js.map

package/dist/common/Sequencer.spec.js.map

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

package/dist/deferred.d.ts

@@ -1,4 +1,4 @@
-export declare class Deferred<T = void> {
+export declare class Deferred<T = void, TReject = any> {
     constructor();
     get promise(): Promise<T>;
     private _promise;
@@ -20,11 +20,13 @@ export declare class Deferred<T = void> {
     /**
      * Resolve the promise
      */
-    resolve(value: T): void;
+    resolve(value?: T): void;
     private _resolve;
+    tryResolve(value?: T): void;
     /**
      * Reject the promise
      */
-    reject(value: T): void;
+    reject(value: TReject): void;
     private _reject;
+    tryReject(reason?: TReject): void;
 }

package/dist/deferred.js

@@ -43,6 +43,11 @@ class Deferred {
         this._isResolved = true;
         this._resolve(value);
     }
+    tryResolve(value) {
+        if (!this.isCompleted) {
+            this.resolve(value);
+        }
+    }
     /**
      * Reject the promise
      */
@@ -54,6 +59,11 @@ class Deferred {
         this._isRejected = true;
         this._reject(value);
     }
+    tryReject(reason) {
+        if (!this.isCompleted) {
+            this.reject(reason);
+        }
+    }
 }
 exports.Deferred = Deferred;
 //# sourceMappingURL=deferred.js.map

package/dist/deferred.js.map

@@ -1 +1 @@
-{"version":3,"file":"deferred.js","sourceRoot":"","sources":["../src/deferred.ts"],"names":[],"mappings":";;;AAAA,MAAa,QAAQ;IACjB;QAiBQ,iBAAY,GAAG,KAAK,CAAC;QAQrB,gBAAW,GAAG,KAAK,CAAC;QAQpB,gBAAW,GAAG,KAAK,CAAC;QAhCxB,IAAI,CAAC,QAAQ,GAAG,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC/C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YACxB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QAC1B,CAAC,CAAC,CAAC;IACP,CAAC;IACD,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAGD;;OAEG;IACH,IAAW,WAAW;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAGD;;OAEG;IACH,IAAW,UAAU;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAGD;;OAEG;IACH,IAAW,UAAU;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAGD;;OAEG;IACI,OAAO,CAAC,KAAQ;QACnB,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACzC;QACD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAGD;;OAEG;IACI,MAAM,CAAC,KAAQ;QAClB,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACzC;QACD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;CAEJ;AA7DD,4BA6DC"}
+{"version":3,"file":"deferred.js","sourceRoot":"","sources":["../src/deferred.ts"],"names":[],"mappings":";;;AAAA,MAAa,QAAQ;IACjB;QAiBQ,iBAAY,GAAG,KAAK,CAAC;QAQrB,gBAAW,GAAG,KAAK,CAAC;QAQpB,gBAAW,GAAG,KAAK,CAAC;QAhCxB,IAAI,CAAC,QAAQ,GAAG,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC/C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YACxB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QAC1B,CAAC,CAAC,CAAC;IACP,CAAC;IACD,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAGD;;OAEG;IACH,IAAW,WAAW;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAGD;;OAEG;IACH,IAAW,UAAU;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAGD;;OAEG;IACH,IAAW,UAAU;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAGD;;OAEG;IACI,OAAO,CAAC,KAAS;QACpB,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACzC;QACD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAGM,UAAU,CAAC,KAAS;QACvB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACnB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;SACvB;IACL,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAc;QACxB,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACzC;QACD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;IAGM,SAAS,CAAC,MAAgB;QAC7B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACnB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SACvB;IACL,CAAC;CACJ;AAzED,4BAyEC"}

package/dist/diagnosticUtils.d.ts

@@ -1,7 +1,9 @@
 import type { Chalk } from 'chalk';
 import type { BsConfig } from './BsConfig';
 import { DiagnosticSeverity } from 'vscode-languageserver';
-import type { BsDiagnostic } from '.';
+import type { BsDiagnostic } from './interfaces';
+import type { Range } from 'vscode-languageserver';
+export declare const MAX_RELATED_INFOS_COUNT = 3;
 /**
  * Prepare print diagnostic formatting options
  */
@@ -16,8 +18,13 @@ export declare function getPrintDiagnosticOptions(options: BsConfig): {
 /**
  * Format output of one diagnostic
  */
-export declare function printDiagnostic(options: ReturnType<typeof getPrintDiagnosticOptions>, severity: DiagnosticSeverity, filePath: string, lines: string[], diagnostic: BsDiagnostic): void;
+export declare function printDiagnostic(options: ReturnType<typeof getPrintDiagnosticOptions>, severity: DiagnosticSeverity, filePath: string | undefined, lines: string[], diagnostic: BsDiagnostic, relatedInformation?: Array<{
+    range: Range;
+    filePath: string;
+    message: string;
+}>): void;
+export declare function getDiagnosticLine(diagnostic: BsDiagnostic, diagnosticLine: string, colorFunction: Chalk): string;
 /**
  * Given a diagnostic, compute the range for the squiggly
  */
-export declare function getDiagnosticSquigglyText(diagnostic: BsDiagnostic, line: string): string;
+export declare function getDiagnosticSquigglyText(line: string | undefined, startCharacter: number | undefined, endCharacter: number | undefined): string;

package/dist/diagnosticUtils.js

@@ -1,15 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDiagnosticSquigglyText = exports.printDiagnostic = exports.getPrintDiagnosticOptions = void 0;
+exports.getDiagnosticSquigglyText = exports.getDiagnosticLine = exports.printDiagnostic = exports.getPrintDiagnosticOptions = exports.MAX_RELATED_INFOS_COUNT = void 0;
 const chalk_1 = require("chalk");
 const vscode_languageserver_1 = require("vscode-languageserver");
+exports.MAX_RELATED_INFOS_COUNT = 3;
 /**
  * Prepare print diagnostic formatting options
  */
 function getPrintDiagnosticOptions(options) {
+    var _a;
     let cwd = (options === null || options === void 0 ? void 0 : options.cwd) ? options.cwd : process.cwd();
     let emitFullPaths = (options === null || options === void 0 ? void 0 : options.emitFullPaths) === true;
-    let diagnosticLevel = (options === null || options === void 0 ? void 0 : options.diagnosticLevel) || 'warn';
+    let diagnosticLevel = (_a = options === null || options === void 0 ? void 0 : options.diagnosticLevel) !== null && _a !== void 0 ? _a : 'warn';
     let diagnosticSeverityMap = {};
     diagnosticSeverityMap.info = vscode_languageserver_1.DiagnosticSeverity.Information;
     diagnosticSeverityMap.hint = vscode_languageserver_1.DiagnosticSeverity.Hint;
@@ -44,73 +46,110 @@ exports.getPrintDiagnosticOptions = getPrintDiagnosticOptions;
 /**
  * Format output of one diagnostic
  */
-function printDiagnostic(options, severity, filePath, lines, diagnostic) {
-    var _a, _b, _c, _d;
+function printDiagnostic(options, severity, filePath, lines, diagnostic, relatedInformation) {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     let { includeDiagnostic, severityTextMap, typeColor } = options;
     if (!includeDiagnostic[severity]) {
         return;
     }
     let severityText = severityTextMap[severity];
     console.log('');
+    const printableDiagnosticCode = diagnostic.code ? diagnostic.code.toString() : 'BS' + ((_a = diagnostic.legacyCode) !== null && _a !== void 0 ? _a : '');
     console.log(chalk_1.default.cyan(filePath !== null && filePath !== void 0 ? filePath : '<unknown file>') +
         ':' +
-        chalk_1.default.yellow(diagnostic.range
-            ? (diagnostic.range.start.line + 1) + ':' + (diagnostic.range.start.character + 1)
+        chalk_1.default.yellow(((_b = diagnostic.location) === null || _b === void 0 ? void 0 : _b.range)
+            ? (diagnostic.location.range.start.line + 1) + ':' + (diagnostic.location.range.start.character + 1)
             : 'line?:col?') +
         ' - ' +
         typeColor[severity](severityText) +
         ' ' +
-        chalk_1.default.grey('BS' + diagnostic.code) +
+        chalk_1.default.grey(printableDiagnosticCode) +
         ': ' +
         chalk_1.default.white(diagnostic.message));
     console.log('');
     //Get the line referenced by the diagnostic. if we couldn't find a line,
     // default to an empty string so it doesn't crash the error printing below
-    let diagnosticLine = (_d = lines[(_c = (_b = (_a = diagnostic.range) === null || _a === void 0 ? void 0 : _a.start) === null || _b === void 0 ? void 0 : _b.line) !== null && _c !== void 0 ? _c : -1]) !== null && _d !== void 0 ? _d : '';
-    let squigglyText = getDiagnosticSquigglyText(diagnostic, diagnosticLine);
-    //only print the line information if we have some
-    if (diagnostic.range && diagnosticLine) {
-        let lineNumberText = chalk_1.default.bgWhite(' ' + chalk_1.default.black((diagnostic.range.start.line + 1).toString()) + ' ') + ' ';
-        let blankLineNumberText = chalk_1.default.bgWhite(' ' + chalk_1.default.bgWhite((diagnostic.range.start.line + 1).toString()) + ' ') + ' ';
-        console.log(lineNumberText + diagnosticLine);
-        console.log(blankLineNumberText + typeColor[severity](squigglyText));
+    let diagnosticLine = (_g = lines[(_f = (_e = (_d = (_c = diagnostic.location) === null || _c === void 0 ? void 0 : _c.range) === null || _d === void 0 ? void 0 : _d.start) === null || _e === void 0 ? void 0 : _e.line) !== null && _f !== void 0 ? _f : -1]) !== null && _g !== void 0 ? _g : '';
+    console.log(getDiagnosticLine(diagnostic, diagnosticLine, typeColor[severity]));
+    //print related information if present (only first few rows)
+    const relatedInfoList = relatedInformation !== null && relatedInformation !== void 0 ? relatedInformation : [];
+    let indent = '    ';
+    for (let i = 0; i < relatedInfoList.length; i++) {
+        let relatedInfo = relatedInfoList[i];
+        //only show the first MAX_RELATED_INFOS_COUNT relatedInfo links
+        if (i < exports.MAX_RELATED_INFOS_COUNT) {
+            console.log('');
+            console.log(indent, chalk_1.default.cyan((_h = relatedInfo.filePath) !== null && _h !== void 0 ? _h : '<unknown file>') +
+                ':' +
+                chalk_1.default.yellow(relatedInfo.range
+                    ? (relatedInfo.range.start.line + 1) + ':' + (relatedInfo.range.start.character + 1)
+                    : 'line?:col?'));
+            console.log(indent, relatedInfo.message);
+        }
+        else {
+            console.log('\n', indent, `...and ${relatedInfoList.length - i + 1} more`);
+            break;
+        }
     }
     console.log('');
 }
 exports.printDiagnostic = printDiagnostic;
+function getDiagnosticLine(diagnostic, diagnosticLine, colorFunction) {
+    var _a;
+    let result = '';
+    //only print the line information if we have some
+    if (((_a = diagnostic.location) === null || _a === void 0 ? void 0 : _a.range) && diagnosticLine) {
+        const lineNumberText = chalk_1.default.bgWhite(' ' + chalk_1.default.black((diagnostic.location.range.start.line + 1).toString()) + ' ') + ' ';
+        const blankLineNumberText = chalk_1.default.bgWhite(' ' + chalk_1.default.white(' '.repeat((diagnostic.location.range.start.line + 1).toString().length)) + ' ') + ' ';
+        //remove tabs in favor of spaces to make diagnostic printing more consistent
+        let leadingText = diagnosticLine.slice(0, diagnostic.location.range.start.character);
+        let leadingTextNormalized = leadingText.replace(/\t/g, '    ');
+        let actualText = diagnosticLine.slice(diagnostic.location.range.start.character, diagnostic.location.range.end.character);
+        let actualTextNormalized = actualText.replace(/\t/g, '    ');
+        let startIndex = leadingTextNormalized.length;
+        let endIndex = leadingTextNormalized.length + actualTextNormalized.length;
+        let diagnosticLineNormalized = diagnosticLine.replace(/\t/g, '    ');
+        const squigglyText = getDiagnosticSquigglyText(diagnosticLineNormalized, startIndex, endIndex);
+        result +=
+            lineNumberText + diagnosticLineNormalized + '\n' +
+                blankLineNumberText + colorFunction(squigglyText);
+    }
+    return result;
+}
+exports.getDiagnosticLine = getDiagnosticLine;
 /**
  * Given a diagnostic, compute the range for the squiggly
  */
-function getDiagnosticSquigglyText(diagnostic, line) {
-    var _a, _b;
+function getDiagnosticSquigglyText(line, startCharacter, endCharacter) {
+    var _a;
     let squiggle;
     //fill the entire line
     if (
     //there is no range
-    !diagnostic.range ||
+    typeof startCharacter !== 'number' || typeof endCharacter !== 'number' ||
         //there is no line
         !line ||
         //both positions point to same location
-        diagnostic.range.start.character === diagnostic.range.end.character ||
+        startCharacter === endCharacter ||
         //the diagnostic starts after the end of the line
-        diagnostic.range.start.character >= line.length) {
+        startCharacter >= line.length) {
         squiggle = ''.padStart((_a = line === null || line === void 0 ? void 0 : line.length) !== null && _a !== void 0 ? _a : 0, '~');
     }
     else {
-        let endIndex = Math.max((_b = diagnostic.range) === null || _b === void 0 ? void 0 : _b.end.character, line.length);
+        let endIndex = Math.max(endCharacter, line.length);
         endIndex = endIndex > 0 ? endIndex : 0;
         if ((line === null || line === void 0 ? void 0 : line.length) < endIndex) {
             endIndex = line.length;
         }
-        let leadingWhitespaceLength = diagnostic.range.start.character;
+        let leadingWhitespaceLength = startCharacter;
         let squiggleLength;
-        if (diagnostic.range.end.character === Number.MAX_VALUE) {
+        if (endCharacter === Number.MAX_VALUE) {
             squiggleLength = line.length - leadingWhitespaceLength;
         }
         else {
-            squiggleLength = diagnostic.range.end.character - diagnostic.range.start.character;
+            squiggleLength = endCharacter - startCharacter;
         }
-        let trailingWhitespaceLength = endIndex - diagnostic.range.end.character;
+        let trailingWhitespaceLength = endIndex - endCharacter;
         //opening whitespace
         squiggle =
             ''.padStart(leadingWhitespaceLength, ' ') +

package/dist/diagnosticUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"diagnosticUtils.js","sourceRoot":"","sources":["../src/diagnosticUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"diagnosticUtils.js","sourceRoot":"","sources":["../src/diagnosticUtils.ts"],"names":[],"mappings":";;;AACA,iCAA0B;AAE1B,iEAA2D;AAI9C,QAAA,uBAAuB,GAAG,CAAC,CAAC;AAEzC;;GAEG;AACH,SAAgB,yBAAyB,CAAC,OAAiB;;IACvD,IAAI,GAAG,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,EAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;IAErD,IAAI,aAAa,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,MAAK,IAAI,CAAC;IAEpD,IAAI,eAAe,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,mCAAI,MAAM,CAAC;IAEzD,IAAI,qBAAqB,GAAG,EAAwC,CAAC;IACrE,qBAAqB,CAAC,IAAI,GAAG,0CAAkB,CAAC,WAAW,CAAC;IAC5D,qBAAqB,CAAC,IAAI,GAAG,0CAAkB,CAAC,IAAI,CAAC;IACrD,qBAAqB,CAAC,IAAI,GAAG,0CAAkB,CAAC,OAAO,CAAC;IACxD,qBAAqB,CAAC,KAAK,GAAG,0CAAkB,CAAC,KAAK,CAAC;IAEvD,IAAI,aAAa,GAAG,qBAAqB,CAAC,eAAe,CAAC,IAAI,0CAAkB,CAAC,OAAO,CAAC;IACzF,IAAI,KAAK,GAAG,CAAC,0CAAkB,CAAC,WAAW,EAAE,0CAAkB,CAAC,IAAI,EAAE,0CAAkB,CAAC,OAAO,EAAE,0CAAkB,CAAC,KAAK,CAAC,CAAC;IAC5H,IAAI,iBAAiB,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;QACpF,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;QAClB,OAAO,GAAG,CAAC;IACf,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAI,SAAS,GAAG,EAA2B,CAAC;IAC5C,SAAS,CAAC,0CAAkB,CAAC,WAAW,CAAC,GAAG,eAAK,CAAC,IAAI,CAAC;IACvD,SAAS,CAAC,0CAAkB,CAAC,IAAI,CAAC,GAAG,eAAK,CAAC,KAAK,CAAC;IACjD,SAAS,CAAC,0CAAkB,CAAC,OAAO,CAAC,GAAG,eAAK,CAAC,MAAM,CAAC;IACrD,SAAS,CAAC,0CAAkB,CAAC,KAAK,CAAC,GAAG,eAAK,CAAC,GAAG,CAAC;IAEhD,IAAI,eAAe,GAAG,EAAE,CAAC;IACzB,eAAe,CAAC,0CAAkB,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC;IACzD,eAAe,CAAC,0CAAkB,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;IAClD,eAAe,CAAC,0CAAkB,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;IACxD,eAAe,CAAC,0CAAkB,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC;IAEpD,OAAO;QACH,GAAG,EAAE,GAAG;QACR,aAAa,EAAE,aAAa;QAC5B,aAAa,EAAE,aAAa;QAC5B,iBAAiB,EAAE,iBAAiB;QACpC,SAAS,EAAE,SAAS;QACpB,eAAe,EAAE,eAAe;KACnC,CAAC;AACN,CAAC;AAxCD,8DAwCC;AAED;;GAEG;AACH,SAAgB,eAAe,CAC3B,OAAqD,EACrD,QAA4B,EAC5B,QAA4B,EAC5B,KAAe,EACf,UAAwB,EACxB,kBAA+E;;IAE/E,IAAI,EAAE,iBAAiB,EAAE,eAAe,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAEhE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE;QAC9B,OAAO;KACV;IAED,IAAI,YAAY,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IAE7C,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,MAAM,uBAAuB,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,MAAC,UAA2B,CAAC,UAAU,mCAAI,EAAE,CAAC,CAAC;IAEtI,OAAO,CAAC,GAAG,CACP,eAAK,CAAC,IAAI,CAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,gBAAgB,CAAC;QACxC,GAAG;QACH,eAAK,CAAC,MAAM,CACR,CAAA,MAAA,UAAU,CAAC,QAAQ,0CAAE,KAAK;YACtB,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC;YACpG,CAAC,CAAC,YAAY,CACrB;QACD,KAAK;QACL,SAAS,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC;QACjC,GAAG;QACH,eAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC;QACnC,IAAI;QACJ,eAAK,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAClC,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEhB,wEAAwE;IACxE,0EAA0E;IAC1E,IAAI,cAAc,GAAG,MAAA,KAAK,CAAC,MAAA,MAAA,MAAA,MAAA,UAAU,CAAC,QAAQ,0CAAE,KAAK,0CAAE,KAAK,0CAAE,IAAI,mCAAI,CAAC,CAAC,CAAC,mCAAI,EAAE,CAAC;IAChF,OAAO,CAAC,GAAG,CACP,iBAAiB,CAAC,UAAU,EAAE,cAAc,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,CACrE,CAAC;IAEF,4DAA4D;IAC5D,MAAM,eAAe,GAAG,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,GAAI,EAAE,CAAC;IACjD,IAAI,MAAM,GAAG,MAAM,CAAC;IACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC7C,IAAI,WAAW,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;QACrC,+DAA+D;QAC/D,IAAI,CAAC,GAAG,+BAAuB,EAAE;YAC7B,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChB,OAAO,CAAC,GAAG,CACP,MAAM,EACN,eAAK,CAAC,IAAI,CAAC,MAAA,WAAW,CAAC,QAAQ,mCAAI,gBAAgB,CAAC;gBACpD,GAAG;gBACH,eAAK,CAAC,MAAM,CACR,WAAW,CAAC,KAAK;oBACb,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC;oBACpF,CAAC,CAAC,YAAY,CACrB,CACJ,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;SAC5C;aAAM;YACH,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,eAAe,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC3E,MAAM;SACT;KACJ;IACD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AACpB,CAAC;AApED,0CAoEC;AAED,SAAgB,iBAAiB,CAAC,UAAwB,EAAE,cAAsB,EAAE,aAAoB;;IACpG,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,iDAAiD;IACjD,IAAI,CAAA,MAAA,UAAU,CAAC,QAAQ,0CAAE,KAAK,KAAI,cAAc,EAAE;QAC9C,MAAM,cAAc,GAAG,eAAK,CAAC,OAAO,CAAC,GAAG,GAAG,eAAK,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;QAC3H,MAAM,mBAAmB,GAAG,eAAK,CAAC,OAAO,CAAC,GAAG,GAAG,eAAK,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;QAEnJ,4EAA4E;QAC5E,IAAI,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACrF,IAAI,qBAAqB,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC/D,IAAI,UAAU,GAAG,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC1H,IAAI,oBAAoB,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC7D,IAAI,UAAU,GAAG,qBAAqB,CAAC,MAAM,CAAC;QAC9C,IAAI,QAAQ,GAAG,qBAAqB,CAAC,MAAM,GAAG,oBAAoB,CAAC,MAAM,CAAC;QAE1E,IAAI,wBAAwB,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAErE,MAAM,YAAY,GAAG,yBAAyB,CAAC,wBAAwB,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QAC/F,MAAM;YACF,cAAc,GAAG,wBAAwB,GAAG,IAAI;gBAChD,mBAAmB,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;KACzD;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAxBD,8CAwBC;AAED;;GAEG;AACH,SAAgB,yBAAyB,CAAC,IAAwB,EAAE,cAAkC,EAAE,YAAgC;;IACpI,IAAI,QAAgB,CAAC;IACrB,sBAAsB;IACtB;IACI,mBAAmB;IACnB,OAAO,cAAc,KAAK,QAAQ,IAAI,OAAO,YAAY,KAAK,QAAQ;QACtE,kBAAkB;QAClB,CAAC,IAAI;QACL,uCAAuC;QACvC,cAAc,KAAK,YAAY;QAC/B,iDAAiD;QACjD,cAAc,IAAI,IAAI,CAAC,MAAM,EAC/B;QACE,QAAQ,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,mCAAI,CAAC,EAAE,GAAG,CAAC,CAAC;KAClD;SAAM;QAEH,IAAI,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACnD,QAAQ,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,IAAG,QAAQ,EAAE;YACzB,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC;SAC1B;QAED,IAAI,uBAAuB,GAAG,cAAc,CAAC;QAC7C,IAAI,cAAsB,CAAC;QAC3B,IAAI,YAAY,KAAK,MAAM,CAAC,SAAS,EAAE;YACnC,cAAc,GAAG,IAAI,CAAC,MAAM,GAAG,uBAAuB,CAAC;SAC1D;aAAM;YACH,cAAc,GAAG,YAAY,GAAG,cAAc,CAAC;SAClD;QACD,IAAI,wBAAwB,GAAG,QAAQ,GAAG,YAAY,CAAC;QAEvD,oBAAoB;QACpB,QAAQ;YACJ,EAAE,CAAC,QAAQ,CAAC,uBAAuB,EAAE,GAAG,CAAC;gBACzC,UAAU;gBACV,EAAE,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC;gBAChC,qBAAqB;gBACrB,EAAE,CAAC,QAAQ,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;QAE/C,+EAA+E;QAC/E,IAAI,QAAQ,CAAC,MAAM,GAAG,QAAQ,EAAE;YAC5B,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;SAC1C;KACJ;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC;AA7CD,8DA6CC"}

package/dist/examples/plugins/removePrint.d.ts

@@ -1,2 +1,2 @@
-import type { CompilerPlugin } from '../../interfaces';
-export default function plugin(): CompilerPlugin;
+import type { Plugin } from '../../interfaces';
+export default function plugin(): Plugin;

package/dist/examples/plugins/removePrint.js

@@ -2,22 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const reflection_1 = require("../../astUtils/reflection");
 const visitors_1 = require("../../astUtils/visitors");
-const Statement_1 = require("../../parser/Statement");
 function plugin() {
     return {
         name: 'removePrint',
-        // note: it is normally not recommended to modify the AST too much at this stage,
-        // because if the plugin runs in a language-server context it could break intellisense
-        afterFileParse: ({ file }) => {
-            if (!reflection_1.isBrsFile(file)) {
-                return;
-            }
-            // visit functions bodies and replace `PrintStatement` nodes with `EmptyStatement`
-            for (const func of file.parser.references.functionExpressions) {
-                func.body.walk(visitors_1.createVisitor({
-                    PrintStatement: (statement) => new Statement_1.EmptyStatement()
+        beforePrepareFile: (event) => {
+            if ((0, reflection_1.isBrsFile)(event.file)) {
+                // visit functions bodies and replace `PrintStatement` nodes with `EmptyStatement`
+                event.file.ast.walk((0, visitors_1.createVisitor)({
+                    PrintStatement: (statement) => {
+                        event.editor.overrideTranspileResult(statement, '');
+                    }
                 }), {
-                    walkMode: visitors_1.WalkMode.visitStatements
+                    walkMode: visitors_1.WalkMode.visitExpressionsRecursive
                 });
             }
         }