brighterscript 1.0.0-alpha.43 → 1.0.0-alpha.45

package/dist/DiagnosticCollection.js

@@ -1,60 +1,107 @@
 "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) {
-        var _a, _b, _c;
-        const result = {};
-        //get all diagnostics for all projects
-        let diagnostics = Array.prototype.concat.apply([], projects.map((x) => x.builder.getDiagnostics()));
-        const keys = {};
-        //build the full current set of diagnostics by file
-        for (let diagnostic of diagnostics) {
-            const fileUri = (_a = diagnostic === null || diagnostic === void 0 ? void 0 : diagnostic.location) === null || _a === void 0 ? void 0 : _a.uri;
-            if (!fileUri) {
-                continue;
+    /**
+     * 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 = 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 thisProjectDiagnostics) {
+            const srcPath = vscode_uri_1.URI.parse(diagnostic.uri).fsPath;
             //ensure the file entry exists
-            if (!result[fileUri]) {
-                result[fileUri] = [];
+            if (!result[srcPath]) {
+                result[srcPath] = [];
             }
-            const diagnosticMap = result[fileUri];
             //fall back to a default range if missing
-            const range = (_c = (_b = diagnostic === null || diagnostic === void 0 ? void 0 : diagnostic.location) === null || _b === void 0 ? void 0 : _b.range) !== null && _c !== void 0 ? _c : 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 =
-                fileUri.toLowerCase() + '-' +
+                srcPath.toLowerCase() + '-' +
                     diagnostic.code + '-' +
                     range.start.line + '-' +
                     range.start.character + '-' +
                     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] = [];
             }
         }
@@ -93,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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"}

package/dist/DiagnosticFilterer.d.ts

@@ -10,13 +10,23 @@ interface NormalizedFilter {
 export declare class DiagnosticFilterer {
     private byFile;
     private fileDestSrcUriMap;
-    private filters;
+    private _filters;
     private rootDir;
+    options: BsConfig | undefined;
     constructor();
+    get filters(): NormalizedFilter[];
     /**
      * Filter a list of diagnostics based on the provided filters
      */
     filter(options: BsConfig, diagnostics: BsDiagnostic[], program?: Program): BsDiagnostic[];
+    /**
+     * Should this file be completely ignored?
+     * If the file diagnostics are ignored, we do not need to validate this file
+     */
+    isFileFiltered(file: {
+        srcPath: string;
+        destPath: string;
+    }): boolean;
     /**
      * Iterate over all remaining diagnostics from the byFile map.
      * Also removes duplicates
@@ -26,9 +36,12 @@ export declare class DiagnosticFilterer {
      * group the diagnostics by file
      */
     private groupByFile;
+    private matchFileSrcUris;
+    private matchFileDestUris;
     private filterAllFiles;
     private filterFile;
     getDiagnosticFilters(config: BsConfig): NormalizedFilter[];
+    private getDiagnosticFiltersV0;
     private getNormalizedFilter;
 }
 export {};

package/dist/DiagnosticFilterer.js

@@ -10,12 +10,22 @@ class DiagnosticFilterer {
         this.byFile = {};
         this.fileDestSrcUriMap = {};
     }
+    get filters() {
+        if (!this.options) {
+            return null;
+        }
+        if (!this._filters) {
+            this._filters = this.getDiagnosticFilters(this.options);
+        }
+        return this._filters;
+    }
     /**
      * Filter a list of diagnostics based on the provided filters
      */
     filter(options, diagnostics, program) {
-        this.filters = this.getDiagnosticFilters(options);
-        this.rootDir = options.rootDir;
+        this.options = options;
+        delete this._filters;
+        this.rootDir = this.options.rootDir;
         this.groupByFile(diagnostics, program);
         for (let filter of this.filters) {
             this.filterAllFiles(filter);
@@ -24,10 +34,45 @@ class DiagnosticFilterer {
         //clean up
         this.byFile = {};
         this.fileDestSrcUriMap = {};
-        delete this.rootDir;
-        delete this.filters;
         return result;
     }
+    /**
+     * Should this file be completely ignored?
+     * If the file diagnostics are ignored, we do not need to validate this file
+     */
+    isFileFiltered(file) {
+        var _a, _b, _c;
+        if (!this.options || !this.filters) {
+            return false;
+        }
+        this.rootDir = this.options.rootDir;
+        let isMatch = false;
+        //filter each matched file
+        for (let filter of this.filters) {
+            if (((_a = filter.codes) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+                continue;
+            }
+            let srcMatch = false;
+            if (filter.src) {
+                const srcUri = util_1.default.pathToUri(file.srcPath);
+                const srcFsPath = vscode_uri_1.URI.parse(srcUri).fsPath;
+                srcMatch = !!(filter.src && ((_b = this.matchFileSrcUris(filter, [srcFsPath])) === null || _b === void 0 ? void 0 : _b.length) > 0);
+            }
+            let destMatch = false;
+            if (filter.dest) {
+                destMatch = !!(filter.dest && ((_c = this.matchFileDestUris(filter, [file.destPath])) === null || _c === void 0 ? void 0 : _c.length) > 0);
+            }
+            if (!filter.isNegative) {
+                isMatch = isMatch || srcMatch || destMatch;
+            }
+            else {
+                if (srcMatch || destMatch) {
+                    isMatch = false;
+                }
+            }
+        }
+        return isMatch;
+    }
     /**
      * Iterate over all remaining diagnostics from the byFile map.
      * Also removes duplicates
@@ -77,24 +122,32 @@ class DiagnosticFilterer {
             }
         }
     }
+    matchFileSrcUris(filter, fileUris) {
+        //prepend rootDir to src if the filter is not a relative path
+        let src = (0, util_1.standardizePath)(path.isAbsolute(filter.src) ? filter.src : `${this.rootDir}/${filter.src}`);
+        let matchedFileUris = minimatch.match(fileUris, src, {
+            nocase: true
+        }).map(src => util_1.default.pathToUri(src).toLowerCase());
+        return matchedFileUris;
+    }
+    matchFileDestUris(filter, fileUris) {
+        let matchedFileUris = minimatch.match(fileUris, filter.dest, {
+            nocase: true
+        });
+        return matchedFileUris;
+    }
     filterAllFiles(filter) {
         let matchedFileUris;
         if (filter.src) {
             //if there's a src, match against all files
-            //prepend rootDir to src if the filter is not a relative path
-            let src = (0, util_1.standardizePath)(path.isAbsolute(filter.src) ? filter.src : `${this.rootDir}/${filter.src}`);
             const byFileSrcs = Object.keys(this.byFile).map(uri => vscode_uri_1.URI.parse(uri).fsPath);
-            matchedFileUris = minimatch.match(byFileSrcs, src, {
-                nocase: true
-            }).map(src => util_1.default.pathToUri(src).toLowerCase());
+            matchedFileUris = this.matchFileSrcUris(filter, byFileSrcs);
         }
         else if (filter.dest) {
             // applies to file dest location
             // search against the set of file destinations
             const byFileDests = Object.keys(this.fileDestSrcUriMap);
-            matchedFileUris = minimatch.match(byFileDests, filter.dest, {
-                nocase: true
-            }).map((destPath) => {
+            matchedFileUris = this.matchFileDestUris(filter, byFileDests).map((destPath) => {
                 var _a;
                 return (_a = this.fileDestSrcUriMap[destPath]) === null || _a === void 0 ? void 0 : _a.toLowerCase();
             });
@@ -136,6 +189,9 @@ class DiagnosticFilterer {
     }
     getDiagnosticFilters(config) {
         var _a, _b;
+        if (config.diagnosticFiltersV0Compatibility) {
+            return this.getDiagnosticFiltersV0(config);
+        }
         let globalIgnoreCodes = [...(_a = config.ignoreErrorCodes) !== null && _a !== void 0 ? _a : []];
         let diagnosticFilters = [...(_b = config.diagnosticFilters) !== null && _b !== void 0 ? _b : []];
         let result = [];
@@ -194,6 +250,68 @@ class DiagnosticFilterer {
         }
         return result;
     }
+    getDiagnosticFiltersV0(config) {
+        var _a, _b;
+        let globalIgnoreCodes = [...(_a = config.ignoreErrorCodes) !== null && _a !== void 0 ? _a : []];
+        let diagnosticFilters = [...(_b = config.diagnosticFilters) !== null && _b !== void 0 ? _b : []];
+        let result = [];
+        //include a filter for all global ignore codes
+        //this comes first, because negative patterns will override ignoreErrorCodes
+        if (globalIgnoreCodes.length > 0) {
+            result.push({
+                codes: globalIgnoreCodes,
+                isNegative: false
+            });
+        }
+        for (let filter of diagnosticFilters) {
+            if (typeof filter === 'number') {
+                result.push({
+                    codes: [filter],
+                    isNegative: false
+                });
+                continue;
+            }
+            if (typeof filter === 'string') {
+                const isNegative = filter.startsWith('!');
+                const trimmedFilter = isNegative ? filter.slice(1) : filter;
+                result.push({
+                    src: trimmedFilter,
+                    isNegative: isNegative
+                });
+                continue;
+            }
+            //filter out bad inputs
+            if (!filter || typeof filter !== 'object') {
+                continue;
+            }
+            //code-only filter
+            if ('codes' in filter && !('src' in filter) && Array.isArray(filter.codes)) {
+                result.push({
+                    codes: filter.codes,
+                    isNegative: false
+                });
+                continue;
+            }
+            if ('src' in filter && typeof filter.src === 'string') {
+                const isNegative = filter.src.startsWith('!');
+                const trimmedFilter = isNegative ? filter.src.slice(1) : filter.src;
+                if ('codes' in filter) {
+                    result.push({
+                        src: trimmedFilter,
+                        codes: filter.codes,
+                        isNegative: isNegative
+                    });
+                }
+                else {
+                    result.push({
+                        src: trimmedFilter,
+                        isNegative: isNegative
+                    });
+                }
+            }
+        }
+        return result;
+    }
     getNormalizedFilter(fileGlob, filter, locationKey = 'src') {
         const isNegative = fileGlob.startsWith('!');
         const trimmedFilter = isNegative ? fileGlob.slice(1) : fileGlob;

package/dist/DiagnosticFilterer.js.map

@@ -1 +1 @@
-{"version":3,"file":"DiagnosticFilterer.js","sourceRoot":"","sources":["../src/DiagnosticFilterer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DiagnosticFilterer.js","sourceRoot":"","sources":["../src/DiagnosticFilterer.ts"],"names":[],"mappings":";;;AACA,6BAA6B;AAC7B,uCAAuC;AAEvC,iCAAoD;AACpD,2CAAiC;AAejC,MAAa,kBAAkB;IAS3B;QACI,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;IAChC,CAAC;IAED,IAAI,OAAO;QACP,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,OAAO,IAAI,CAAC;SACf;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAChB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC3D;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAGD;;OAEG;IACI,MAAM,CAAC,OAAiB,EAAE,WAA2B,EAAE,OAAiB;QAC3E,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,OAAO,IAAI,CAAC,QAAQ,CAAC;QAErB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QAEpC,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAEvC,KAAK,IAAI,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE;YAC7B,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;SAC/B;QACD,IAAI,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAEnC,UAAU;QACV,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;QAE5B,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;;OAGG;IACI,cAAc,CAAC,IAA2C;;QAC7D,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YAChC,OAAO,KAAK,CAAC;SAChB;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QACpC,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,0BAA0B;QAC1B,KAAK,IAAI,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE;YAC7B,IAAI,CAAA,MAAA,MAAM,CAAC,KAAK,0CAAE,MAAM,IAAG,CAAC,EAAE;gBAC1B,SAAS;aACZ;YACD,IAAI,QAAQ,GAAG,KAAK,CAAC;YACrB,IAAI,MAAM,CAAC,GAAG,EAAE;gBACZ,MAAM,MAAM,GAAG,cAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC5C,MAAM,SAAS,GAAG,gBAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;gBAC3C,QAAQ,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAA,MAAA,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,0CAAE,MAAM,IAAG,CAAC,CAAC,CAAC;aACvF;YACD,IAAI,SAAS,GAAG,KAAK,CAAC;YACtB,IAAI,MAAM,CAAC,IAAI,EAAE;gBACb,SAAS,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,IAAI,CAAA,MAAA,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,0CAAE,MAAM,IAAG,CAAC,CAAC,CAAC;aAC9F;YAED,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;gBACpB,OAAO,GAAG,OAAO,IAAI,QAAQ,IAAI,SAAS,CAAC;aAC9C;iBAAM;gBACH,IAAI,QAAQ,IAAI,SAAS,EAAE;oBACvB,OAAO,GAAG,KAAK,CAAC;iBACnB;aACJ;SACJ;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED;;;OAGG;IACK,cAAc;QAClB,mCAAmC;QACnC,IAAI,gBAAgB,GAAG,EAAoB,CAAC;QAC5C,KAAK,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,EAAE;YACzB,IAAI,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACvC,KAAK,IAAI,UAAU,IAAI,eAAe,EAAE;gBACpC,iDAAiD;gBACjD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE;oBAC/E,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;iBAChD;aACJ;SACJ;QACD,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAED;;OAEG;IACK,WAAW,CAAC,WAA2B,EAAE,OAAiB;;QAC9D,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;QAC5B,KAAK,IAAI,UAAU,IAAI,WAAW,EAAE;YAChC,MAAM,OAAO,GAAG,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,0CAAE,GAAG,mCAAI,aAAa,CAAC;YAC3D,mCAAmC;YACnC,IAAI,CAAC,OAAO,EAAE;gBACV,SAAS;aACZ;YACD,MAAM,YAAY,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;YAC3C,0DAA0D;YAC1D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;gBAC5B,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;aAClC;YACD,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;gBAC3B,UAAU,EAAE,UAAU;gBACtB,YAAY,EAAE,KAAK;aACtB,CAAC,CAAC;YAEH,IAAI,OAAO,EAAE;gBACT,MAAM,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,MAAA,UAAU,CAAC,QAAQ,0CAAE,GAAG,CAAC,CAAC;gBACpE,IAAI,iBAAiB,EAAE;oBACnB,MAAM,aAAa,GAAG,iBAAiB,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;oBAC/D,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,GAAG,MAAA,UAAU,CAAC,QAAQ,0CAAE,GAAG,CAAC;iBACpE;aACJ;SACJ;IACL,CAAC;IAGO,gBAAgB,CAAC,MAAwB,EAAE,QAAkB;QACjE,6DAA6D;QAC7D,IAAI,GAAG,GAAG,IAAA,sBAAC,EACP,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE,CAC7E,CAAC;QAEF,IAAI,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE;YACjD,MAAM,EAAE,IAAI;SACf,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,cAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAEjD,OAAO,eAAe,CAAC;IAC3B,CAAC;IAEO,iBAAiB,CAAC,MAAwB,EAAE,QAAkB;QAClE,IAAI,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,EAAE;YACzD,MAAM,EAAE,IAAI;SACf,CAAC,CAAC;QACH,OAAO,eAAe,CAAC;IAC3B,CAAC;IAGO,cAAc,CAAC,MAAwB;QAC3C,IAAI,eAAyB,CAAC;QAE9B,IAAI,MAAM,CAAC,GAAG,EAAE;YACZ,2CAA2C;YAC3C,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,gBAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;YAC9E,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;SAC/D;aAAM,IAAI,MAAM,CAAC,IAAI,EAAE;YACpB,gCAAgC;YAChC,8CAA8C;YAC9C,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACxD,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;;gBAC3E,OAAO,MAAA,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,0CAAE,WAAW,EAAE,CAAC;YAC3D,CAAC,CAAC,CAAC;SACN;aAAM;YACH,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC9C;QAED,0BAA0B;QAC1B,KAAK,IAAI,OAAO,IAAI,eAAe,EAAE;YACjC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SACpC;IACL,CAAC;IAEO,UAAU,CAAC,MAAwB,EAAE,OAAe;QACxD,IAAI,CAAC,OAAO,EAAE;YACV,OAAO;SACV;QACD,yDAAyD;QACzD,6DAA6D;QAC7D,MAAM,aAAa,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC;QACzC,MAAM,YAAY,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;QAC3C,wEAAwE;QACxE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YACf,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;gBAC3C,UAAU,CAAC,YAAY,GAAG,aAAa,CAAC;YAC5C,CAAC,CAAC,CAAC;YAEH,0DAA0D;SAC7D;aAAM;YACH,IAAI,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAChD,KAAK,MAAM,UAAU,IAAI,eAAe,EAAE;gBACtC,IAAI,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,IAAK,CAAC;oBAClD,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU;wBAC7B,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC;4BACpD,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE;oBAC9E,UAAU,CAAC,YAAY,GAAG,aAAa,CAAC;iBAC3C;aACJ;SACJ;IACL,CAAC;IAEM,oBAAoB,CAAC,MAAgB;;QACxC,IAAI,MAAM,CAAC,gCAAgC,EAAE;YACzC,OAAO,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;SAC9C;QAED,IAAI,iBAAiB,GAAwB,CAAC,GAAG,MAAA,MAAM,CAAC,gBAAgB,mCAAI,EAAE,CAAC,CAAC;QAChF,IAAI,iBAAiB,GAAG,CAAC,GAAG,MAAA,MAAM,CAAC,iBAAiB,mCAAI,EAAE,CAAC,CAAC;QAE5D,IAAI,MAAM,GAAuB,EAAE,CAAC;QAEpC,8CAA8C;QAC9C,4EAA4E;QAC5E,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;YAC9B,MAAM,CAAC,IAAI,CAAC;gBACR,KAAK,EAAE,iBAAiB;gBACxB,UAAU,EAAE,KAAK;aACpB,CAAC,CAAC;SACN;QAED,KAAK,IAAI,MAAM,IAAI,iBAAiB,EAAE;YAClC,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;gBAC1D,MAAM,CAAC,IAAI,CAAC;oBACR,KAAK,EAAE,CAAC,MAAM,CAAC;oBACf,UAAU,EAAE,KAAK;iBACpB,CAAC,CAAC;gBACH,SAAS;aACZ;YAED,uBAAuB;YACvB,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;gBACvC,SAAS;aACZ;YAED,kBAAkB;YAClB,IAAI,OAAO,IAAI,MAAM,IAAI,CAAC,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBAC1E,MAAM,CAAC,IAAI,CAAC;oBACR,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,UAAU,EAAE,KAAK;iBACpB,CAAC,CAAC;gBACH,SAAS;aACZ;YAED,IAAI,OAAO,IAAI,MAAM,EAAE;gBACnB,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,EAAE;oBAClC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;oBAC5D,SAAS;iBACZ;gBAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;oBAC7B,KAAK,MAAM,cAAc,IAAI,MAAM,CAAC,KAAK,EAAE;wBACvC,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;4BACpC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC;4BAC9D,SAAS;yBACZ;wBACD,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;4BACpC,IAAI,KAAK,IAAI,cAAc,EAAE;gCACzB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;gCAClE,SAAS;6BACZ;4BACD,IAAI,MAAM,IAAI,cAAc,EAAE;gCAC1B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;gCAC3E,SAAS;6BACZ;yBACJ;qBACJ;iBACJ;aACJ;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,sBAAsB,CAAC,MAAgB;;QAC3C,IAAI,iBAAiB,GAAwB,CAAC,GAAG,MAAA,MAAM,CAAC,gBAAgB,mCAAI,EAAE,CAAC,CAAC;QAChF,IAAI,iBAAiB,GAAG,CAAC,GAAG,MAAA,MAAM,CAAC,iBAAiB,mCAAI,EAAE,CAAC,CAAC;QAE5D,IAAI,MAAM,GAAuB,EAAE,CAAC;QAEpC,8CAA8C;QAC9C,4EAA4E;QAC5E,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;YAC9B,MAAM,CAAC,IAAI,CAAC;gBACR,KAAK,EAAE,iBAAiB;gBACxB,UAAU,EAAE,KAAK;aACpB,CAAC,CAAC;SACN;QAED,KAAK,IAAI,MAAM,IAAI,iBAAwB,EAAE;YACzC,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;gBAC5B,MAAM,CAAC,IAAI,CAAC;oBACR,KAAK,EAAE,CAAC,MAAM,CAAC;oBACf,UAAU,EAAE,KAAK;iBACpB,CAAC,CAAC;gBACH,SAAS;aACZ;YAED,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;gBAC5B,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBAC1C,MAAM,aAAa,GAAG,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;gBAE5D,MAAM,CAAC,IAAI,CAAC;oBACR,GAAG,EAAE,aAAa;oBAClB,UAAU,EAAE,UAAU;iBACzB,CAAC,CAAC;gBACH,SAAS;aACZ;YAED,uBAAuB;YACvB,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;gBACvC,SAAS;aACZ;YAED,kBAAkB;YAClB,IAAI,OAAO,IAAI,MAAM,IAAI,CAAC,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBACxE,MAAM,CAAC,IAAI,CAAC;oBACR,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,UAAU,EAAE,KAAK;iBACpB,CAAC,CAAC;gBACH,SAAS;aACZ;YAED,IAAI,KAAK,IAAI,MAAM,IAAI,OAAO,MAAM,CAAC,GAAG,KAAK,QAAQ,EAAE;gBACnD,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBAC9C,MAAM,aAAa,GAAG,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;gBAEpE,IAAI,OAAO,IAAI,MAAM,EAAE;oBACnB,MAAM,CAAC,IAAI,CAAC;wBACR,GAAG,EAAE,aAAa;wBAClB,KAAK,EAAE,MAAM,CAAC,KAAK;wBACnB,UAAU,EAAE,UAAU;qBACzB,CAAC,CAAC;iBACN;qBAAM;oBACH,MAAM,CAAC,IAAI,CAAC;wBACR,GAAG,EAAE,aAAa;wBAClB,UAAU,EAAE,UAAU;qBACzB,CAAC,CAAC;iBACN;aACJ;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAGO,mBAAmB,CAAC,QAAgB,EAAE,MAA2D,EAAE,cAA8B,KAAK;QAC1I,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,aAAa,GAAG,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QAChE,IAAI,WAAW,KAAK,KAAK,EAAE;YACvB,IAAI,OAAO,IAAI,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBAClD,OAAO;oBACH,GAAG,EAAE,aAAa;oBAClB,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,UAAU,EAAE,UAAU;iBACzB,CAAC;aACL;iBAAM;gBACH,OAAO;oBACH,GAAG,EAAE,aAAa;oBAClB,UAAU,EAAE,UAAU;iBACzB,CAAC;aACL;SACJ;aAAM;YACH,OAAO;YACP,IAAI,OAAO,IAAI,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBAClD,OAAO;oBACH,IAAI,EAAE,aAAa;oBACnB,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,UAAU,EAAE,UAAU;iBACzB,CAAC;aACL;iBAAM;gBACH,OAAO;oBACH,IAAI,EAAE,aAAa;oBACnB,UAAU,EAAE,UAAU;iBACzB,CAAC;aACL;SACJ;IAEL,CAAC;CACJ;AAlYD,gDAkYC"}

package/dist/DiagnosticManager.d.ts

@@ -4,6 +4,7 @@ import type { Scope } from './Scope';
 import type { FinalizedBsConfig } from './BsConfig';
 import type { Logger } from './logging';
 import type { Program } from './Program';
+import type { BrsFile } from './files/BrsFile';
 /**
  * Manages all diagnostics for a program.
  * Diagnostics can be added specific to a certain file/range and optionally scope or an AST node
@@ -21,6 +22,10 @@ export declare class DiagnosticManager {
     logger: Logger;
     options: FinalizedBsConfig;
     program: Program;
+    private fileUriMap;
+    private tagMap;
+    private scopeMap;
+    private segmentMap;
     /**
      * Registers a diagnostic (or multiple diagnostics) for a program.
      * Diagnostics can optionally be associated with a context
@@ -28,12 +33,13 @@ export declare class DiagnosticManager {
     register(diagnostic: BsDiagnostic, context?: DiagnosticContext): any;
     register(diagnostics: Array<BsDiagnostic>, context?: DiagnosticContext): any;
     register(diagnostics: Array<DiagnosticContextPair>): any;
+    private addToMaps;
     /**
      * Returns a list of all diagnostics, filtered by the in-file comment filters, filtered by BsConfig diagnostics and adjusted based on BsConfig
      * If the same diagnostic is included in multiple contexts, they are included in a single diagnostic's relatedInformation
      */
     getDiagnostics(): BsDiagnostic[];
-    private getNonSuppresedDiagnostics;
+    private getNonSuppressedDiagnostics;
     /**
      * Determine whether this diagnostic should be supressed or not, based on brs comment-flags
      */
@@ -44,13 +50,17 @@ export declare class DiagnosticManager {
     clearForScope(scope: Scope): void;
     clearForSegment(segment: AstNode): void;
     clearForTag(tag: string): void;
+    private getSearchIntersection;
     /**
      * Clears all diagnostics that match all aspects of the filter provided
      * Matches equality of tag, scope, file, segment filters. Leave filter option undefined to not filter on option
      */
     clearByFilter(filter: DiagnosticContextFilter): void;
+    private deleteContextsFromDiagnostic;
+    private removeDiagnosticIfNoContexts;
     private getDiagnosticKey;
     private mergeRelatedInformation;
+    shouldFilterFile(file: BrsFile): boolean;
 }
 interface DiagnosticContextFilter {
     tag?: string;