brighterscript 1.0.0-alpha.50 → 1.0.0-alpha.51

package/README.md

@@ -103,6 +103,9 @@ BrighterScript adds several new features to the BrightScript language such as na
     <a href="https://www.haystack.tv/">
       <img height="38" src="https://user-images.githubusercontent.com/2544493/192610056-d1b5a382-edf4-47b9-a6a5-d2d3ee9094cb.png">
     </a>&nbsp;&nbsp;&nbsp;
+    <a href="https://www.tksssoftware.com/">
+      <img height="38" alt="TKSS Software Inc" src="https://github.com/user-attachments/assets/332d692f-7386-495d-b29d-c2ed7d3d2e2f" />
+    </a>&nbsp;&nbsp;&nbsp;
 </p>
 <br/>
 

package/bsconfig.schema.json

@@ -8,6 +8,53 @@
             "password"
         ]
     },
+    "definitions": {
+        "diagnosticReporterValue": {
+            "oneOf": [
+                {
+                    "type": "string",
+                    "description": "Either a preset name ('detailed' or 'github-actions') or a custom template string containing at least one known placeholder."
+                },
+                {
+                    "type": "object",
+                    "required": ["type"],
+                    "properties": {
+                        "type": {
+                            "type": "string",
+                            "enum": ["detailed"]
+                        }
+                    },
+                    "additionalProperties": false
+                },
+                {
+                    "type": "object",
+                    "required": ["type"],
+                    "properties": {
+                        "type": {
+                            "type": "string",
+                            "enum": ["github-actions"]
+                        }
+                    },
+                    "additionalProperties": false
+                },
+                {
+                    "type": "object",
+                    "required": ["type", "format"],
+                    "properties": {
+                        "type": {
+                            "type": "string",
+                            "enum": ["custom"]
+                        },
+                        "format": {
+                            "type": "string",
+                            "description": "Template string. Supported placeholders: {file}, {line}, {col}, {endLine}, {endCol}, {severity}, {severityCode}, {code}, {message}, {source}."
+                        }
+                    },
+                    "additionalProperties": false
+                }
+            ]
+        }
+    },
     "properties": {
         "extends": {
             "description": "Relative or absolute path to another bsconfig.json file that this file should use as a base and then override. Prefix with a question mark (?) to prevent throwing an exception if the file does not exist.",
@@ -103,6 +150,11 @@
             "type": "boolean",
             "default": false
         },
+        "relativeSourceMaps": {
+            "description": "If true, source file paths in generated sourcemaps will be relative to the map file location instead of absolute. This makes sourcemaps portable across different machines and environments.",
+            "type": "boolean",
+            "default": false
+        },
         "copyToStaging": {
             "description": "If true, the files are copied to staging. This setting is ignored when deploy is enabled or if createPackage is enabled",
             "deprecated": true,
@@ -327,6 +379,21 @@
                 "error"
             ]
         },
+        "diagnosticReporters": {
+            "description": "Specify how diagnostics are reported to the console. Accepts a single value or an array; each diagnostic is rendered once per entry. Each value is either a preset name ('detailed', 'github-actions'), a custom template string containing at least one known placeholder ({file}, {line}, {col}, {endLine}, {endCol}, {severity}, {severityCode}, {code}, {message}, {source}), or an object with explicit `type`. Defaults to 'detailed'.",
+            "default": "detailed",
+            "oneOf": [
+                {
+                    "$ref": "#/definitions/diagnosticReporterValue"
+                },
+                {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/diagnosticReporterValue"
+                    }
+                }
+            ]
+        },
         "allowBrighterScriptInBrightScript": {
             "description": "Allow brighterscript features (classes, interfaces, etc...) to be included in BrightScript (`.brs`) files, and force those files to be transpiled.",
             "type": "boolean",
@@ -336,6 +403,14 @@
             "description": "Legacy RokuOS versions required at least one argument in callfunc() invocations. Previous brighterscript versions handled this by inserting invalid as an argument when no other args are present. This is not necessary in modern RokuOS versions.",
             "type": "boolean",
             "default": false
+        },
+        "minFirmwareVersion": {
+            "description": "The minimum Roku firmware version required to run this project. When set, BrightScript (.brs) files will be validated to ensure they only use language features available in that firmware version or earlier. BrighterScript (.bs) files are always allowed to use all features since they are transpiled. Should be a semver-compatible string (e.g. \"11.0.0\").",
+            "type": "string",
+            "examples": [
+                "11.0.0",
+                "12.0.0"
+            ]
         }
     }
 }

package/dist/BsConfig.d.ts

@@ -101,6 +101,28 @@ export interface BsConfig {
      * Specify what diagnostic types should be printed to the console. Defaults to 'warn'
      */
     diagnosticLevel?: 'info' | 'hint' | 'warn' | 'error';
+    /**
+     * Specify how diagnostics should be reported to the console.
+     * Accepts a single value or an array. When given an array, each diagnostic is rendered
+     * once per entry (so you can, for example, get both detailed terminal output and
+     * github-actions PR annotations from a single run).
+     *
+     * Each value may be a preset name ('detailed', 'github-actions'), a custom template string
+     * (any string containing a `{` placeholder), or an object with explicit `type`.
+     *
+     * Custom templates support the following placeholders, replaced per diagnostic:
+     *   {file}, {line}, {col}, {endLine}, {endCol}, {severity}, {code}, {message}, {source}
+     *
+     * Examples:
+     *   "detailed"
+     *   "github-actions"
+     *   "{file}:{line}:{col} {severity} {code}: {message}"
+     *   { type: "custom", format: "{file}:{line}: {message}" }
+     *   ["detailed", "github-actions"]
+     *
+     * @default "detailed"
+     */
+    diagnosticReporters?: DiagnosticReporter | DiagnosticReporter[];
     /**
      * A list of scripts or modules to add extra diagnostics or transform the AST
      */
@@ -126,10 +148,16 @@ export interface BsConfig {
      */
     logLevel?: LogLevel | 'error' | 'warn' | 'log' | 'info' | 'debug' | 'trace' | 'off';
     /**
-     * Override the path to source files in source maps. Use this if you have a preprocess step and want
-     * to ensure the source maps point to the original location.
-     * This will only alter source maps for files within rootDir. Any files found outside of rootDir will not
-     * have their source maps changed. This option also affects the `SOURCE_FILE_PATH` and `SOURCE_LOCATION` source literals.
+     * Overrides where source files appear to live, in both sourcemaps and the `SOURCE_FILE_PATH` /
+     * `SOURCE_LOCATION` runtime literals. Only applies to files within `rootDir`.
+     *
+     * When `relativeSourceMaps` is false (default): the `rootDir` portion of each source path is
+     * replaced with `sourceRoot` directly in `sources[]`. The map's `sourceRoot` field is not written.
+     *
+     * When `relativeSourceMaps` is true: the map's `sourceRoot` field is set to this value, and
+     * `sources[]` entries are relative to `sourceRoot` (per the sourcemap spec).
+     *
+     * In both modes, `SOURCE_FILE_PATH` and `SOURCE_LOCATION` reflect the `sourceRoot`-substituted path.
      */
     sourceRoot?: string;
     /**
@@ -142,6 +170,20 @@ export interface BsConfig {
      * @default true
      */
     sourceMap?: boolean;
+    /**
+     * If true, file paths in sourcemap `sources[]` will be written as relative paths instead of absolute.
+     * Only has an effect when `sourceMap` is true.
+     *
+     * When false (default): `sources[]` contains absolute paths. If `sourceRoot` is set, the `rootDir`
+     * portion is replaced with `sourceRoot` in-place; the map's `sourceRoot` field is never written.
+     *
+     * When true: `sources[]` entries are relative to the map file's directory, making sourcemaps
+     * portable across machines. If `sourceRoot` is also set, the map's `sourceRoot` field is written
+     * and `sources[]` entries are instead relative to `sourceRoot` (per the sourcemap spec — consumers
+     * reconstruct the full path as `path.resolve(sourceRoot, sources[0])`).
+     * @default false
+     */
+    relativeSourceMaps?: boolean;
     /**
      * Excludes empty files from being included in the output. Some Brighterscript files
      * are left empty or with only comments after transpilation to Brightscript.
@@ -164,7 +206,50 @@ export interface BsConfig {
      */
     bslibDestinationDir?: string;
     legacyCallfuncHandling?: boolean;
+    /**
+     * The minimum Roku firmware version required to run this project.
+     * When set, BrightScript (.brs) files are always validated against the version restriction.
+     * BrighterScript (.bs) files are only validated for features that BrighterScript does not
+     * transpile — for example, optional chaining is emitted as-is, so it is subject to the
+     * restriction. Features that BrighterScript fully transpiles (such as classes) are not
+     * restricted, since the transpiled output is compatible with older firmware.
+     * Should be a semver-compatible string (e.g. "11.0.0").
+     */
+    minFirmwareVersion?: string;
+    /**
+     * When set to false, validation is skipped entirely. This can speed up builds when diagnostics
+     * are not needed (e.g. when using the VSCode extension which already surfaces diagnostics in the
+     * editor). Note that skipping validation may cause transpilation to fail or produce incorrect
+     * output if the project contains errors that would normally be caught during validation.
+     * @default true
+     */
+    validate?: boolean;
 }
-declare type OptionalBsConfigFields = '_ancestors' | 'sourceRoot' | 'project' | 'manifest' | 'noProject' | 'extends' | 'require' | 'outDir' | 'diagnosticLevel' | 'rootDir' | 'stagingDir' | 'stagingFolderPath';
+/**
+ * Discriminated union describing how diagnostics are rendered to the console.
+ * - String shorthand: a preset name ('detailed' | 'github-actions') or a template string
+ *   (any string containing a `{` is treated as a custom template).
+ * - Object form: explicit `type` so config files can stay strictly typed.
+ */
+export declare type DiagnosticReporter = 'detailed' | 'github-actions' | (string & {}) | {
+    type: 'detailed';
+} | {
+    type: 'github-actions';
+} | {
+    type: 'custom';
+    format: string;
+};
+/**
+ * Object form of `DiagnosticReporter` after string shorthand has been resolved.
+ */
+export declare type NormalizedDiagnosticReporter = {
+    type: 'detailed';
+} | {
+    type: 'github-actions';
+} | {
+    type: 'custom';
+    format: string;
+};
+declare type OptionalBsConfigFields = '_ancestors' | 'sourceRoot' | 'project' | 'manifest' | 'noProject' | 'extends' | 'require' | 'outDir' | 'diagnosticLevel' | 'rootDir' | 'stagingDir' | 'stagingFolderPath' | 'minFirmwareVersion' | 'diagnosticReporters';
 export declare type FinalizedBsConfig = Omit<Required<BsConfig>, OptionalBsConfigFields> & Pick<BsConfig, OptionalBsConfigFields>;
 export {};

package/dist/CodeActionUtil.d.ts

@@ -13,6 +13,23 @@ export interface CodeActionShorthand {
     isPreferred?: boolean;
     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;
     newText: string;

package/dist/CodeActionUtil.js.map

@@ -1 +1 @@
-{"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;AAiCY,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

@@ -14,10 +14,6 @@ export declare class CommentFlagProcessor {
      * Valid diagnostic codes. Codes NOT in this list will be flagged
      */
     diagnosticCodes: DiagnosticCode[];
-    /**
-     * Diagnostic codes to never filter (these codes will always be flagged)
-     */
-    ignoreDiagnosticCodes: DiagnosticCode[];
     constructor(
     /**
      * The file this processor applies to
@@ -30,11 +26,7 @@ export declare class CommentFlagProcessor {
     /**
      * Valid diagnostic codes. Codes NOT in this list will be flagged
      */
-    diagnosticCodes?: DiagnosticCode[], 
-    /**
-     * Diagnostic codes to never filter (these codes will always be flagged)
-     */
-    ignoreDiagnosticCodes?: DiagnosticCode[]);
+    diagnosticCodes?: DiagnosticCode[]);
     /**
      * List of comment flags generated during processing
      */
@@ -44,12 +36,24 @@ 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;
     /**

package/dist/CommentFlagProcessor.js

@@ -16,15 +16,10 @@ class CommentFlagProcessor {
     /**
      * Valid diagnostic codes. Codes NOT in this list will be flagged
      */
-    diagnosticCodes = [], 
-    /**
-     * Diagnostic codes to never filter (these codes will always be flagged)
-     */
-    ignoreDiagnosticCodes = []) {
+    diagnosticCodes = []) {
         this.file = file;
         this.commentStarters = commentStarters;
         this.diagnosticCodes = diagnosticCodes;
-        this.ignoreDiagnosticCodes = ignoreDiagnosticCodes;
         /**
          * List of comment flags generated during processing
          */
@@ -33,73 +28,149 @@ class CommentFlagProcessor {
          * List of diagnostics generated during processing
          */
         this.diagnostics = [];
-        this.allCodesExceptIgnores = this.diagnosticCodes.filter(x => !this.ignoreDiagnosticCodes.includes(x));
+        /**
+         * Block-level `bs:disable` / `bs:enable` directives, recorded in source order
+         * by `tryAdd` and resolved into `CommentFlag`s by `finalize()`.
+         */
+        this.blockDirectives = [];
     }
     tryAdd(text, range) {
-        var _a, _b;
         const tokenized = this.tokenize(text, range);
         if (!tokenized) {
             return;
         }
-        let affectedRange;
-        if (tokenized.disableType === 'line') {
-            affectedRange = util_1.util.createRange(range.start.line, 0, range.start.line, range.start.character);
-        }
-        else {
-            // tokenized.disableType must be 'next-line'
-            affectedRange = util_1.util.createRange(range.start.line + 1, 0, range.start.line + 1, Number.MAX_SAFE_INTEGER);
+        //queue block directives with their raw code tokens; finalize() validates and resolves them
+        if (tokenized.directive === 'disable' || tokenized.directive === 'enable') {
+            this.blockDirectives.push({
+                kind: tokenized.directive,
+                rawCodes: tokenized.codes,
+                range: range
+            });
+            return;
         }
-        let commentFlag = null;
-        //statement to disable EVERYTHING
+        //line-level directives emit a flag inline
+        const affectedRange = tokenized.directive === 'line'
+            ? util_1.util.createRange(range.start.line, 0, range.start.line, range.start.character)
+            : util_1.util.createRange(range.start.line + 1, 0, range.start.line + 1, Number.MAX_SAFE_INTEGER);
         if (tokenized.codes.length === 0) {
-            commentFlag = {
+            //bare `bs:disable-line` / `bs:disable-next-line` suppresses everything
+            this.commentFlags.push({
                 file: this.file,
-                //null means all codes
                 codes: null,
                 range: range,
                 affectedRange: affectedRange
-            };
-            //disable specific diagnostic codes
+            });
+            return;
         }
-        else {
-            let codes = [];
-            for (let codeToken of tokenized.codes) {
-                let codeInt = parseInt(codeToken.code);
-                //is a plugin-contributed or non-numeric code
-                if (isNaN(codeInt)) {
-                    codes.push((_b = (_a = codeToken.code) === null || _a === void 0 ? void 0 : _a.toString()) === null || _b === void 0 ? void 0 : _b.toLowerCase());
-                    //validate numeric codes against the list of known bsc codes
-                }
-                else if (this.diagnosticCodes.includes(codeInt)) {
-                    codes.push(codeInt);
-                    //add a warning for unknown codes
+        const codes = this.collectCodes(tokenized.codes);
+        if (codes && codes.length > 0) {
+            this.commentFlags.push({
+                file: this.file,
+                codes: codes,
+                range: range,
+                affectedRange: affectedRange
+            });
+        }
+    }
+    /**
+     * 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() {
+        if (this.blockDirectives.length === 0) {
+            return;
+        }
+        //state across the file: which codes are suppressed within the current block
+        let allSuppressed = false;
+        const carveOuts = new Set();
+        for (let i = 0; i < this.blockDirectives.length; i++) {
+            const directive = this.blockDirectives[i];
+            const codes = this.collectCodes(directive.rawCodes);
+            //apply this directive to the running state
+            if (codes === null) {
+                //bare `bs:disable` / `bs:enable` resets state
+                allSuppressed = directive.kind === 'disable';
+                carveOuts.clear();
+            }
+            else if (directive.kind === 'disable') {
+                //in disable-all mode, "disable: X" cancels a prior carve-out for X
+                //in enable-all mode, "disable: X" adds X to the suppressed set
+                for (const code of codes) {
+                    if (allSuppressed) {
+                        carveOuts.delete(code);
+                    }
+                    else {
+                        carveOuts.add(code);
+                    }
                 }
-                else {
-                    this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.unknownDiagnosticCode(codeInt)), { location: util_1.util.createLocationFromFileRange(this.file, codeToken.range) }));
+            }
+            else {
+                //'enable' with specific codes does the opposite of the disable branch above
+                for (const code of codes) {
+                    if (allSuppressed) {
+                        carveOuts.add(code);
+                    }
+                    else {
+                        carveOuts.delete(code);
+                    }
                 }
             }
-            if (codes.length > 0) {
-                commentFlag = {
+            //affectedRange runs from the line after this directive to just before the next block directive (or EOF)
+            const next = this.blockDirectives[i + 1];
+            const startLine = directive.range.start.line + 1;
+            const endLine = next ? next.range.start.line - 1 : Number.MAX_SAFE_INTEGER;
+            if (endLine < startLine) {
+                continue;
+            }
+            const affectedRange = util_1.util.createRange(startLine, 0, endLine, Number.MAX_SAFE_INTEGER);
+            //emit a flag only when the current state actually suppresses something
+            if (allSuppressed) {
+                this.commentFlags.push({
                     file: this.file,
-                    codes: codes,
-                    range: range,
+                    codes: null,
+                    enableCodes: carveOuts.size > 0 ? [...carveOuts] : undefined,
+                    range: directive.range,
                     affectedRange: affectedRange
-                };
+                });
+            }
+            else if (carveOuts.size > 0) {
+                this.commentFlags.push({
+                    file: this.file,
+                    codes: [...carveOuts],
+                    range: directive.range,
+                    affectedRange: affectedRange
+                });
             }
         }
-        if (commentFlag) {
-            this.commentFlags.push(commentFlag);
-            //add an ignore for everything in this comment except for Unknown_diagnostic_code_1014
-            this.commentFlags.push({
-                affectedRange: commentFlag.range,
-                range: commentFlag.range,
-                codes: this.allCodesExceptIgnores,
-                file: this.file
-            });
+    }
+    /**
+     * 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.
+     */
+    collectCodes(rawCodes) {
+        var _a, _b;
+        if (rawCodes.length === 0) {
+            return null;
         }
+        const codes = [];
+        for (const codeToken of rawCodes) {
+            const codeInt = parseInt(codeToken.code);
+            if (isNaN(codeInt)) {
+                //plugin-contributed or non-numeric code
+                codes.push((_b = (_a = codeToken.code) === null || _a === void 0 ? void 0 : _a.toString()) === null || _b === void 0 ? void 0 : _b.toLowerCase());
+            }
+            else if (this.diagnosticCodes.includes(codeInt)) {
+                codes.push(codeInt);
+            }
+            else {
+                this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.unknownDiagnosticCode(codeInt)), { location: util_1.util.createLocationFromFileRange(this.file, codeToken.range) }));
+            }
+        }
+        return codes;
     }
     /**
-     * Small tokenizer for bs:disable comments
+     * Small tokenizer for `bs:` directive comments.
      */
     tokenize(text, range) {
         let lowerText = text.toLowerCase();
@@ -113,20 +184,31 @@ class CommentFlagProcessor {
                 break;
             }
         }
-        let disableType;
-        //trim leading/trailing whitespace
-        let len = lowerText.length;
+        //trim leading whitespace
+        const len = lowerText.length;
         lowerText = lowerText.trimLeft();
         offset += len - lowerText.length;
+        //match longest-prefix first so `bs:disable-line` doesn't get parsed as `bs:disable`
+        let directive;
         if (lowerText.startsWith('bs:disable-line')) {
             lowerText = lowerText.substring('bs:disable-line'.length);
             offset += 'bs:disable-line'.length;
-            disableType = 'line';
+            directive = 'line';
         }
         else if (lowerText.startsWith('bs:disable-next-line')) {
             lowerText = lowerText.substring('bs:disable-next-line'.length);
             offset += 'bs:disable-next-line'.length;
-            disableType = 'next-line';
+            directive = 'next-line';
+        }
+        else if (lowerText.startsWith('bs:disable')) {
+            lowerText = lowerText.substring('bs:disable'.length);
+            offset += 'bs:disable'.length;
+            directive = 'disable';
+        }
+        else if (lowerText.startsWith('bs:enable')) {
+            lowerText = lowerText.substring('bs:enable'.length);
+            offset += 'bs:enable'.length;
+            directive = 'enable';
         }
         else {
             return null;
@@ -136,9 +218,9 @@ class CommentFlagProcessor {
             lowerText = lowerText.substring(1);
             offset += 1;
         }
-        let items = this.tokenizeByWhitespace(lowerText);
-        let codes = [];
-        for (let item of items) {
+        const items = this.tokenizeByWhitespace(lowerText);
+        const codes = [];
+        for (const item of items) {
             codes.push({
                 code: item.text,
                 range: util_1.util.createRange(range.start.line, range.start.character + offset + item.startIndex, range.start.line, range.start.character + offset + item.startIndex + item.text.length)
@@ -146,7 +228,7 @@ class CommentFlagProcessor {
         }
         return {
             commentTokenText: commentTokenText,
-            disableType: disableType,
+            directive: directive,
             codes: codes
         };
     }

package/dist/CommentFlagProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommentFlagProcessor.js","sourceRoot":"","sources":["../src/CommentFlagProcessor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CommentFlagProcessor.js","sourceRoot":"","sources":["../src/CommentFlagProcessor.ts"],"names":[],"mappings":";;;AACA,6DAA0D;AAG1D,iCAA8B;AAE9B,MAAa,oBAAoB;IAC7B;IACI;;OAEG;IACI,IAAa;IACpB;;OAEG;IACI,kBAAkB,EAAc;IACvC;;OAEG;IACI,kBAAkB,EAAsB;QARxC,SAAI,GAAJ,IAAI,CAAS;QAIb,oBAAe,GAAf,eAAe,CAAiB;QAIhC,oBAAe,GAAf,eAAe,CAAyB;QAInD;;WAEG;QACI,iBAAY,GAAG,EAAmB,CAAC;QAE1C;;WAEG;QACI,gBAAW,GAAG,EAAoB,CAAC;QAE1C;;;WAGG;QACK,oBAAe,GAAG,EAAsB,CAAC;IAhBjD,CAAC;IAkBM,MAAM,CAAC,IAAY,EAAE,KAAY;QACpC,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC7C,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO;SACV;QAED,2FAA2F;QAC3F,IAAI,SAAS,CAAC,SAAS,KAAK,SAAS,IAAI,SAAS,CAAC,SAAS,KAAK,QAAQ,EAAE;YACvE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;gBACtB,IAAI,EAAE,SAAS,CAAC,SAAS;gBACzB,QAAQ,EAAE,SAAS,CAAC,KAAK;gBACzB,KAAK,EAAE,KAAK;aACf,CAAC,CAAC;YACH,OAAO;SACV;QAED,0CAA0C;QAC1C,MAAM,aAAa,GAAG,SAAS,CAAC,SAAS,KAAK,MAAM;YAChD,CAAC,CAAC,WAAI,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC;YAChF,CAAC,CAAC,WAAI,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAE/F,IAAI,SAAS,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,uEAAuE;YACvE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;gBACnB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI;gBACX,KAAK,EAAE,KAAK;gBACZ,aAAa,EAAE,aAAa;aAC/B,CAAC,CAAC;YACH,OAAO;SACV;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACjD,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;gBACnB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,KAAK;gBACZ,aAAa,EAAE,aAAa;aAC/B,CAAC,CAAC;SACN;IACL,CAAC;IAED;;;OAGG;IACI,QAAQ;QACX,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;YACnC,OAAO;SACV;QAED,4EAA4E;QAC5E,IAAI,aAAa,GAAG,KAAK,CAAC;QAC1B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;QAE5C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAClD,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAEpD,2CAA2C;YAC3C,IAAI,KAAK,KAAK,IAAI,EAAE;gBAChB,8CAA8C;gBAC9C,aAAa,GAAG,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC;gBAC7C,SAAS,CAAC,KAAK,EAAE,CAAC;aACrB;iBAAM,IAAI,SAAS,CAAC,IAAI,KAAK,SAAS,EAAE;gBACrC,mEAAmE;gBACnE,+DAA+D;gBAC/D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;oBACtB,IAAI,aAAa,EAAE;wBACf,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;qBAC1B;yBAAM;wBACH,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;qBACvB;iBACJ;aACJ;iBAAM;gBACH,4EAA4E;gBAC5E,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;oBACtB,IAAI,aAAa,EAAE;wBACf,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;qBACvB;yBAAM;wBACH,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;qBAC1B;iBACJ;aACJ;YAED,wGAAwG;YACxG,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACzC,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC;YACjD,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC;YAC3E,IAAI,OAAO,GAAG,SAAS,EAAE;gBACrB,SAAS;aACZ;YACD,MAAM,aAAa,GAAG,WAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAC;YAEvF,uEAAuE;YACvE,IAAI,aAAa,EAAE;gBACf,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;oBACnB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,KAAK,EAAE,IAAI;oBACX,WAAW,EAAE,SAAS,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;oBAC5D,KAAK,EAAE,SAAS,CAAC,KAAK;oBACtB,aAAa,EAAE,aAAa;iBAC/B,CAAC,CAAC;aACN;iBAAM,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC,EAAE;gBAC3B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;oBACnB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,KAAK,EAAE,CAAC,GAAG,SAAS,CAAC;oBACrB,KAAK,EAAE,SAAS,CAAC,KAAK;oBACtB,aAAa,EAAE,aAAa;iBAC/B,CAAC,CAAC;aACN;SACJ;IACL,CAAC;IAED;;;;OAIG;IACK,YAAY,CAAC,QAA+C;;QAChE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YACvB,OAAO,IAAI,CAAC;SACf;QACD,MAAM,KAAK,GAAG,EAAsB,CAAC;QACrC,KAAK,MAAM,SAAS,IAAI,QAAQ,EAAE;YAC9B,MAAM,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE;gBAChB,wCAAwC;gBACxC,KAAK,CAAC,IAAI,CAAC,MAAA,MAAA,SAAS,CAAC,IAAI,0CAAE,QAAQ,EAAE,0CAAE,WAAW,EAAE,CAAC,CAAC;aACzD;iBAAM,IAAI,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBAC/C,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACvB;iBAAM;gBACH,IAAI,CAAC,WAAW,CAAC,IAAI,iCACd,uCAAkB,CAAC,qBAAqB,CAAC,OAAO,CAAC,KACpD,QAAQ,EAAE,WAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,IACxE,CAAC;aACN;SACJ;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;OAEG;IACK,QAAQ,CAAC,IAAY,EAAE,KAAY;QACvC,IAAI,SAAS,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACnC,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,IAAI,gBAAgB,GAAkB,IAAI,CAAC;QAE3C,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,eAAe,EAAE;YACxC,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;gBAC1B,gBAAgB,GAAG,OAAO,CAAC;gBAC3B,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;gBACxB,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;gBACzD,MAAM;aACT;SACJ;QAED,yBAAyB;QACzB,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC;QAC7B,SAAS,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC;QAEjC,oFAAoF;QACpF,IAAI,SAAsD,CAAC;QAC3D,IAAI,SAAS,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;YACzC,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAC1D,MAAM,IAAI,iBAAiB,CAAC,MAAM,CAAC;YACnC,SAAS,GAAG,MAAM,CAAC;SACtB;aAAM,IAAI,SAAS,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE;YACrD,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;YAC/D,MAAM,IAAI,sBAAsB,CAAC,MAAM,CAAC;YACxC,SAAS,GAAG,WAAW,CAAC;SAC3B;aAAM,IAAI,SAAS,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;YAC3C,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YACrD,MAAM,IAAI,YAAY,CAAC,MAAM,CAAC;YAC9B,SAAS,GAAG,SAAS,CAAC;SACzB;aAAM,IAAI,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;YAC1C,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YACpD,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC;YAC7B,SAAS,GAAG,QAAQ,CAAC;SACxB;aAAM;YACH,OAAO,IAAI,CAAC;SACf;QAED,mBAAmB;QACnB,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YAC3B,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,IAAI,CAAC,CAAC;SACf;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;QACnD,MAAM,KAAK,GAAG,EAA2C,CAAC;QAC1D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACtB,KAAK,CAAC,IAAI,CAAC;gBACP,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,WAAI,CAAC,WAAW,CACnB,KAAK,CAAC,KAAK,CAAC,IAAI,EAChB,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,MAAM,GAAG,IAAI,CAAC,UAAU,EAChD,KAAK,CAAC,KAAK,CAAC,IAAI,EAChB,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,MAAM,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CACtE;aACJ,CAAC,CAAC;SACN;QAED,OAAO;YACH,gBAAgB,EAAE,gBAAgB;YAClC,SAAS,EAAE,SAAS;YACpB,KAAK,EAAE,KAAK;SACf,CAAC;IACN,CAAC;IAED;;;OAGG;IACK,oBAAoB,CAAC,IAAY;QACrC,IAAI,MAAM,GAAG,EAAkB,CAAC;QAChC,IAAI,YAAY,GAAiB,IAAI,CAAC;QAEtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAClC,IAAI,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACnB,sBAAsB;YACtB,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,IAAI,EAAE;gBAC/B,IAAI,YAAY,EAAE;oBACd,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;oBAC1B,YAAY,GAAG,IAAI,CAAC;iBACvB;gBAED,uBAAuB;aAC1B;iBAAM;gBACH,IAAI,CAAC,YAAY,EAAE;oBACf,YAAY,GAAG;wBACX,UAAU,EAAE,CAAC;wBACb,IAAI,EAAE,EAAE;qBACX,CAAC;iBACL;gBACD,YAAY,CAAC,IAAI,IAAI,IAAI,CAAC;aAC7B;SACJ;QACD,IAAI,YAAY,EAAE;YACd,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAC7B;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAvRD,oDAuRC"}