From f9db8710795edf5e5765b7b5a24dd78eb5963df1 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sun, 22 Mar 2026 00:41:18 -0400
Subject: [PATCH 01/19] Add template-lint-disable pragma for template regions

Implements a `template-lint-disable` comment directive that suppresses
lint errors on the next line in template regions of gjs/gts/hbs files.
This works like `eslint-disable-next-line` but uses the template-lint
naming convention familiar to ember-template-lint users.

Supported comment formats:
  {{! template-lint-disable }}
  {{!-- template-lint-disable rule-name --}}
  <!-- template-lint-disable rule-name -->

Rule names can be specified as either eslint rule IDs (e.g. `no-undef`)
or with `ember/template-` prefix (e.g. `ember/template-no-bare-strings`).
When no rule is specified, all rules are suppressed on the next line.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 lib/index.js                                  |   4 +-
 lib/processors/template-lint-disable.js       | 114 ++++++++++++++
 .../rules-preprocessor/gjs-gts-parser-test.js | 149 ++++++++++++++++++
 3 files changed, 265 insertions(+), 2 deletions(-)
 create mode 100644 lib/processors/template-lint-disable.js

diff --git a/lib/index.js b/lib/index.js
index bfb49a4471..7bb1b2110e 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const requireIndex = require('requireindex');
-const noop = require('ember-eslint-parser/noop');
+const templateLintDisableProcessor = require('./processors/template-lint-disable');
 const pkg = require('../package.json'); // eslint-disable-line import/extensions
 
 module.exports = {
@@ -16,6 +16,6 @@ module.exports = {
   },
   processors: {
     // https://eslint.org/docs/developer-guide/working-with-plugins#file-extension-named-processor
-    noop,
+    noop: templateLintDisableProcessor,
   },
 };
diff --git a/lib/processors/template-lint-disable.js b/lib/processors/template-lint-disable.js
new file mode 100644
index 0000000000..630e8b4d37
--- /dev/null
+++ b/lib/processors/template-lint-disable.js
@@ -0,0 +1,114 @@
+'use strict';
+
+const noop = require('ember-eslint-parser/noop');
+
+/**
+ * Regex patterns for template-lint-disable comments:
+ *   {{! template-lint-disable rule1 rule2 }}
+ *   {{!-- template-lint-disable rule1 rule2 --}}
+ *   <!-- template-lint-disable rule1 rule2 -->
+ */
+const TEMPLATE_LINT_DISABLE_REGEX =
+  /(?:{{!-*\s*template-lint-disable\s*([\s\S]*?)-*}}|<!--\s*template-lint-disable\s*([\s\S]*?)-->)/g;
+
+// Store disable directives per file
+const fileDisableDirectives = new Map();
+
+/**
+ * Parse template-lint-disable comments from source text and store
+ * which lines/rules should be suppressed.
+ *
+ * template-lint-disable means "disable next line" (like eslint-disable-next-line).
+ */
+function parseDisableDirectives(text) {
+  const directives = [];
+  const lines = text.split('\n');
+
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    TEMPLATE_LINT_DISABLE_REGEX.lastIndex = 0;
+    let match;
+
+    while ((match = TEMPLATE_LINT_DISABLE_REGEX.exec(line)) !== null) {
+      const rulesPart = (match[1] || match[2] || '').trim();
+      // Strip trailing -- from mustache block comments
+      const cleaned = rulesPart.replace(/-+$/, '').trim();
+
+      const rules = cleaned
+        ? cleaned.split(/[\s,]+/).filter(Boolean)
+        : []; // empty = disable all
+
+      directives.push({
+        // comment is on line i+1 (1-indexed), next line is i+2
+        line: i + 2,
+        rules,
+      });
+    }
+  }
+
+  return directives;
+}
+
+/**
+ * Map a rule name from template-lint format to eslint-plugin-ember format.
+ * e.g. "no-bare-strings" -> "ember/template-no-bare-strings"
+ *
+ * Also accepts already-qualified names like "ember/template-no-bare-strings".
+ */
+function matchesRule(ruleId, disableRuleName) {
+  if (ruleId === disableRuleName) {
+    return true;
+  }
+  // Map template-lint name to eslint-plugin-ember name
+  if (ruleId === `ember/template-${disableRuleName}`) {
+    return true;
+  }
+  return false;
+}
+
+function shouldSuppressMessage(message, directives) {
+  for (const directive of directives) {
+    if (message.line !== directive.line) {
+      continue;
+    }
+    // No rules specified = suppress all
+    if (directive.rules.length === 0) {
+      return true;
+    }
+    // Check if any specified rule matches this message's rule
+    if (directive.rules.some((rule) => matchesRule(message.ruleId, rule))) {
+      return true;
+    }
+  }
+  return false;
+}
+
+module.exports = {
+  registerParsedFile: noop.registerParsedFile,
+
+  preprocess(text, fileName) {
+    const directives = parseDisableDirectives(text);
+    if (directives.length > 0) {
+      fileDisableDirectives.set(fileName, directives);
+    } else {
+      fileDisableDirectives.delete(fileName);
+    }
+    // Return text as-is (single code block)
+    return [text];
+  },
+
+  postprocess(messages, fileName) {
+    // First, apply noop's postprocess logic (config validation)
+    const msgs = noop.postprocess(messages, fileName);
+
+    const directives = fileDisableDirectives.get(fileName);
+    if (!directives) {
+      return msgs;
+    }
+
+    fileDisableDirectives.delete(fileName);
+    return msgs.filter((message) => !shouldSuppressMessage(message, directives));
+  },
+
+  supportsAutofix: true,
+};
diff --git a/tests/lib/rules-preprocessor/gjs-gts-parser-test.js b/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
index cda7c36a34..eed175eca4 100644
--- a/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
+++ b/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
@@ -886,3 +886,152 @@ describe('multiple tokens in same file', () => {
     expect(resultErrors[2].message).toBe("Use 'String#startsWith' method instead.");
   });
 });
+
+describe('supports template-lint-disable directive', () => {
+  it('disables all rules on the next line with mustache comment', async () => {
+    const eslint = initESLint();
+    const code = `
+    <template>
+      <div>
+        {{! template-lint-disable }}
+        {{test}}
+      </div>
+    </template>
+    `;
+    const results = await eslint.lintText(code, { filePath: 'my-component.gjs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    // {{test}} would normally trigger no-undef, but should be suppressed
+    expect(resultErrors).toHaveLength(0);
+  });
+
+  it('disables all rules on the next line with mustache block comment', async () => {
+    const eslint = initESLint();
+    const code = `
+    <template>
+      <div>
+        {{!-- template-lint-disable --}}
+        {{test}}
+      </div>
+    </template>
+    `;
+    const results = await eslint.lintText(code, { filePath: 'my-component.gjs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    expect(resultErrors).toHaveLength(0);
+  });
+
+  it('disables all rules on the next line with HTML comment', async () => {
+    const eslint = initESLint();
+    const code = `
+    <template>
+      <div>
+        <!-- template-lint-disable -->
+        {{test}}
+      </div>
+    </template>
+    `;
+    const results = await eslint.lintText(code, { filePath: 'my-component.gjs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    expect(resultErrors).toHaveLength(0);
+  });
+
+  it('disables a specific rule by eslint rule name', async () => {
+    const eslint = initESLint();
+    const code = `
+    <template>
+      <div>
+        {{! template-lint-disable no-undef }}
+        {{test}}
+        {{other}}
+      </div>
+    </template>
+    `;
+    const results = await eslint.lintText(code, { filePath: 'my-component.gjs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    // {{test}} on line after disable should be suppressed
+    // {{other}} on the line after that should NOT be suppressed
+    expect(resultErrors).toHaveLength(1);
+    expect(resultErrors[0].message).toBe("'other' is not defined.");
+  });
+
+  it('only disables the next line, not subsequent lines', async () => {
+    const eslint = initESLint();
+    const code = `
+    <template>
+      <div>
+        {{! template-lint-disable }}
+        {{test}}
+        {{other}}
+      </div>
+    </template>
+    `;
+    const results = await eslint.lintText(code, { filePath: 'my-component.gjs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    // {{test}} suppressed, {{other}} NOT suppressed
+    expect(resultErrors).toHaveLength(1);
+    expect(resultErrors[0].message).toBe("'other' is not defined.");
+  });
+
+  it('does not suppress unrelated rules when a specific rule is named', async () => {
+    const eslint = initESLint();
+    const code = `
+    <template>
+      <div>
+        {{! template-lint-disable ember/template-no-bare-strings }}
+        {{test}}
+      </div>
+    </template>
+    `;
+    const results = await eslint.lintText(code, { filePath: 'my-component.gjs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    // no-undef should still fire since we only disabled template-no-bare-strings
+    expect(resultErrors).toHaveLength(1);
+    expect(resultErrors[0].ruleId).toBe('no-undef');
+  });
+
+  it('supports template-lint rule name format (maps to ember/ prefix)', async () => {
+    const eslint = initESLint();
+    const code = `
+    <template>
+      <div>
+        {{! template-lint-disable no-undef }}
+        {{test}}
+      </div>
+    </template>
+    `;
+    const results = await eslint.lintText(code, { filePath: 'my-component.gjs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    expect(resultErrors).toHaveLength(0);
+  });
+
+  it('supports multiple rule names', async () => {
+    const eslint = initESLint();
+    const code = `
+    <template>
+      <div>
+        {{! template-lint-disable no-undef quotes }}
+        {{test}}
+      </div>
+    </template>
+    `;
+    const results = await eslint.lintText(code, { filePath: 'my-component.gjs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    expect(resultErrors).toHaveLength(0);
+  });
+
+  it('works with multiple disable comments in the same file', async () => {
+    const eslint = initESLint();
+    const code = `
+    <template>
+      <div>
+        {{! template-lint-disable }}
+        {{test}}
+        {{! template-lint-disable }}
+        {{other}}
+      </div>
+    </template>
+    `;
+    const results = await eslint.lintText(code, { filePath: 'my-component.gjs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    expect(resultErrors).toHaveLength(0);
+  });
+});

From cfc13ae7d3571b7a069f59ff6f44f69196589a03 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sun, 22 Mar 2026 00:49:03 -0400
Subject: [PATCH 02/19] Remove HTML comment support for template-lint-disable

Only mustache comments ({{! ... }} and {{!-- ... --}}) are supported
for the template-lint-disable directive.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 lib/processors/template-lint-disable.js           |  7 +++----
 .../lib/rules-preprocessor/gjs-gts-parser-test.js | 15 ---------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/lib/processors/template-lint-disable.js b/lib/processors/template-lint-disable.js
index 630e8b4d37..b52686ed87 100644
--- a/lib/processors/template-lint-disable.js
+++ b/lib/processors/template-lint-disable.js
@@ -3,13 +3,12 @@
 const noop = require('ember-eslint-parser/noop');
 
 /**
- * Regex patterns for template-lint-disable comments:
+ * Regex pattern for template-lint-disable mustache comments:
  *   {{! template-lint-disable rule1 rule2 }}
  *   {{!-- template-lint-disable rule1 rule2 --}}
- *   <!-- template-lint-disable rule1 rule2 -->
  */
 const TEMPLATE_LINT_DISABLE_REGEX =
-  /(?:{{!-*\s*template-lint-disable\s*([\s\S]*?)-*}}|<!--\s*template-lint-disable\s*([\s\S]*?)-->)/g;
+  /{{!-*\s*template-lint-disable\s*([\s\S]*?)-*}}/g;
 
 // Store disable directives per file
 const fileDisableDirectives = new Map();
@@ -30,7 +29,7 @@ function parseDisableDirectives(text) {
     let match;
 
     while ((match = TEMPLATE_LINT_DISABLE_REGEX.exec(line)) !== null) {
-      const rulesPart = (match[1] || match[2] || '').trim();
+      const rulesPart = (match[1] || '').trim();
       // Strip trailing -- from mustache block comments
       const cleaned = rulesPart.replace(/-+$/, '').trim();
 
diff --git a/tests/lib/rules-preprocessor/gjs-gts-parser-test.js b/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
index eed175eca4..2bbe811ad0 100644
--- a/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
+++ b/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
@@ -919,21 +919,6 @@ describe('supports template-lint-disable directive', () => {
     expect(resultErrors).toHaveLength(0);
   });
 
-  it('disables all rules on the next line with HTML comment', async () => {
-    const eslint = initESLint();
-    const code = `
-    <template>
-      <div>
-        <!-- template-lint-disable -->
-        {{test}}
-      </div>
-    </template>
-    `;
-    const results = await eslint.lintText(code, { filePath: 'my-component.gjs' });
-    const resultErrors = results.flatMap((result) => result.messages);
-    expect(resultErrors).toHaveLength(0);
-  });
-
   it('disables a specific rule by eslint rule name', async () => {
     const eslint = initESLint();
     const code = `

From 176831f7d9d8b0c0ff80ec0938ab3be7c9a838e1 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sun, 22 Mar 2026 00:53:12 -0400
Subject: [PATCH 03/19] Add hbs file support for template-lint-disable and
 tests

Apply the processor to hbs files in base configs so template-lint-disable
works in standalone .hbs templates, not just gjs/gts files. Also handle
template AST edge case where TextNodes start on the comment line.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 lib/config-legacy/base.js                     |   5 +
 lib/config/base.js                            |   8 ++
 lib/processors/template-lint-disable.js       |  10 +-
 lib/recommended.mjs                           |  17 +++
 .../rules-preprocessor/gjs-gts-parser-test.js | 122 ++++++++++++++++++
 5 files changed, 159 insertions(+), 3 deletions(-)

diff --git a/lib/config-legacy/base.js b/lib/config-legacy/base.js
index d27a5e8806..1dabbaf462 100644
--- a/lib/config-legacy/base.js
+++ b/lib/config-legacy/base.js
@@ -23,5 +23,10 @@ module.exports = {
       parser: 'ember-eslint-parser',
       processor: 'ember/noop',
     },
+    {
+      files: ['**/*.hbs'],
+      parser: 'ember-eslint-parser/hbs',
+      processor: 'ember/noop',
+    },
   ],
 };
diff --git a/lib/config/base.js b/lib/config/base.js
index c6bdf52381..b7f5f7f0c1 100644
--- a/lib/config/base.js
+++ b/lib/config/base.js
@@ -1,5 +1,6 @@
 const plugin = require('../index');
 const emberEslintParser = require('ember-eslint-parser');
+const emberEslintParserHbs = require('ember-eslint-parser/hbs');
 
 module.exports = [
   {
@@ -17,4 +18,11 @@ module.exports = [
     },
     processor: 'ember/noop',
   },
+  {
+    files: ['**/*.hbs'],
+    languageOptions: {
+      parser: emberEslintParserHbs,
+    },
+    processor: 'ember/noop',
+  },
 ];
diff --git a/lib/processors/template-lint-disable.js b/lib/processors/template-lint-disable.js
index b52686ed87..84b57996c5 100644
--- a/lib/processors/template-lint-disable.js
+++ b/lib/processors/template-lint-disable.js
@@ -37,9 +37,13 @@ function parseDisableDirectives(text) {
         ? cleaned.split(/[\s,]+/).filter(Boolean)
         : []; // empty = disable all
 
+      // Comment is on line i+1 (1-indexed), next line is i+2.
+      // In template ASTs, TextNodes can start on the same line as the comment
+      // (e.g. the newline after {{! template-lint-disable }} is part of the
+      // following TextNode), so we suppress both the comment line and the next.
       directives.push({
-        // comment is on line i+1 (1-indexed), next line is i+2
-        line: i + 2,
+        commentLine: i + 1,
+        nextLine: i + 2,
         rules,
       });
     }
@@ -67,7 +71,7 @@ function matchesRule(ruleId, disableRuleName) {
 
 function shouldSuppressMessage(message, directives) {
   for (const directive of directives) {
-    if (message.line !== directive.line) {
+    if (message.line !== directive.commentLine && message.line !== directive.nextLine) {
       continue;
     }
     // No rules specified = suppress all
diff --git a/lib/recommended.mjs b/lib/recommended.mjs
index 5daaf29ae4..029c15c953 100644
--- a/lib/recommended.mjs
+++ b/lib/recommended.mjs
@@ -3,9 +3,11 @@ import baseRules from './recommended-rules.js';
 import gjsRules from './recommended-rules-gjs.js';
 import gtsRules from './recommended-rules-gts.js';
 import emberParser from 'ember-eslint-parser';
+import emberParserHbs from 'ember-eslint-parser/hbs';
 
 export const plugin = emberPlugin;
 export const parser = emberParser;
+export const hbsParser = emberParserHbs;
 
 export const base = {
   name: 'ember:base',
@@ -53,14 +55,29 @@ export const gts = {
   },
 };
 
+export const hbs = {
+  name: 'ember:hbs',
+  plugins: { ember: emberPlugin },
+  files: ['**/*.hbs'],
+  languageOptions: {
+    parser: emberParserHbs,
+  },
+  processor: 'ember/noop',
+  rules: {
+    ...base.rules,
+  },
+};
+
 export default {
   // Helpful utility exports
   plugin,
   parser,
+  hbsParser,
   // Recommended config sets
   configs: {
     base,
     gjs,
     gts,
+    hbs,
   },
 };
diff --git a/tests/lib/rules-preprocessor/gjs-gts-parser-test.js b/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
index 2bbe811ad0..6ce852db27 100644
--- a/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
+++ b/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
@@ -13,6 +13,7 @@ const { writeFileSync, readFileSync } = require('node:fs');
 const { join } = require('node:path');
 
 const gjsGtsParser = require.resolve('ember-eslint-parser');
+const hbsParser = require.resolve('ember-eslint-parser/hbs');
 
 /**
  * Helper function which creates ESLint instance with enabled/disabled autofix feature.
@@ -1020,3 +1021,124 @@ describe('supports template-lint-disable directive', () => {
     expect(resultErrors).toHaveLength(0);
   });
 });
+
+describe('supports template-lint-disable directive in hbs files', () => {
+  function initHbsESLint() {
+    return new ESLint({
+      ignore: false,
+      useEslintrc: false,
+      plugins: { ember: plugin },
+      overrideConfig: {
+        root: true,
+        parserOptions: {
+          ecmaVersion: 2022,
+          sourceType: 'module',
+        },
+        plugins: ['ember'],
+        overrides: [
+          {
+            files: ['**/*.hbs'],
+            parser: hbsParser,
+            processor: 'ember/noop',
+            rules: {
+              'ember/template-no-bare-strings': 'error',
+            },
+          },
+        ],
+      },
+    });
+  }
+
+  it('disables all rules on the next line with mustache comment', async () => {
+    const eslint = initHbsESLint();
+    const code = `<div>
+  {{! template-lint-disable }}
+  Hello world
+</div>`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    expect(resultErrors).toHaveLength(0);
+  });
+
+  it('disables all rules on the next line with mustache block comment', async () => {
+    const eslint = initHbsESLint();
+    const code = `<div>
+  {{!-- template-lint-disable --}}
+  Hello world
+</div>`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    expect(resultErrors).toHaveLength(0);
+  });
+
+  it('only disables the next line, not subsequent lines', async () => {
+    const eslint = initHbsESLint();
+    const code = `{{! template-lint-disable }}
+<div>Hello world</div>
+<div>Bare string here too</div>`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    // Line 2 "Hello world" suppressed, but line 3 "Bare string here too" should still error
+    expect(resultErrors).toHaveLength(1);
+    expect(resultErrors[0].line).toBe(3);
+  });
+
+  it('disables a specific rule by name', async () => {
+    const eslint = initHbsESLint();
+    const code = `<div>
+  {{! template-lint-disable ember/template-no-bare-strings }}
+  Hello world
+</div>`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    expect(resultErrors).toHaveLength(0);
+  });
+
+  it('supports template-lint rule name format (maps to ember/ prefix)', async () => {
+    const eslint = initHbsESLint();
+    const code = `<div>
+  {{! template-lint-disable no-bare-strings }}
+  Hello world
+</div>`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    expect(resultErrors).toHaveLength(0);
+  });
+
+  it('does not suppress unrelated rules when a specific rule is named', async () => {
+    const eslint = initHbsESLint();
+    const code = `<div>
+  {{! template-lint-disable ember/template-no-html-comments }}
+  Hello world
+</div>`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    // no-bare-strings should still fire since we only disabled no-html-comments
+    expect(resultErrors).toHaveLength(1);
+    expect(resultErrors[0].ruleId).toBe('ember/template-no-bare-strings');
+  });
+
+  it('works with multiple disable comments in the same file', async () => {
+    const eslint = initHbsESLint();
+    const code = `<div>
+  {{! template-lint-disable }}
+  Hello world
+  {{! template-lint-disable }}
+  Another bare string
+</div>`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    expect(resultErrors).toHaveLength(0);
+  });
+
+  it('bare strings without disable comment still trigger errors', async () => {
+    const eslint = initHbsESLint();
+    const code = `<div>
+  Hello world
+</div>`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    expect(resultErrors).toHaveLength(1);
+    expect(resultErrors[0].ruleId).toBe('ember/template-no-bare-strings');
+  });
+});

From ed812261ede60ca0c85a004823ae6a5e3430edb7 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sun, 22 Mar 2026 01:02:56 -0400
Subject: [PATCH 04/19] Fix polynomial regex (ReDoS) flagged by CodeQL

Split the single regex with overlapping quantifiers into two separate
patterns for mustache comments and mustache block comments. Each uses
a specific character class ([\w\s,/-]*) that cannot cause polynomial
backtracking. Also removes the -+$ cleanup regex since the block
comment pattern now captures only the rules content without trailing
dashes.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 lib/processors/template-lint-disable.js | 43 ++++++++++++++-----------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/lib/processors/template-lint-disable.js b/lib/processors/template-lint-disable.js
index 84b57996c5..04c6fc0fd7 100644
--- a/lib/processors/template-lint-disable.js
+++ b/lib/processors/template-lint-disable.js
@@ -3,12 +3,15 @@
 const noop = require('ember-eslint-parser/noop');
 
 /**
- * Regex pattern for template-lint-disable mustache comments:
+ * Regex patterns for template-lint-disable mustache comments.
+ * Two separate patterns to avoid polynomial backtracking (ReDoS):
  *   {{! template-lint-disable rule1 rule2 }}
  *   {{!-- template-lint-disable rule1 rule2 --}}
  */
-const TEMPLATE_LINT_DISABLE_REGEX =
-  /{{!-*\s*template-lint-disable\s*([\s\S]*?)-*}}/g;
+const MUSTACHE_COMMENT_REGEX =
+  /{{!\s+template-lint-disable([\w\s,/-]*)}}/g;
+const MUSTACHE_BLOCK_COMMENT_REGEX =
+  /{{!--\s*template-lint-disable([\w\s,/-]*)--}}/g;
 
 // Store disable directives per file
 const fileDisableDirectives = new Map();
@@ -19,35 +22,37 @@ const fileDisableDirectives = new Map();
  *
  * template-lint-disable means "disable next line" (like eslint-disable-next-line).
  */
-function parseDisableDirectives(text) {
-  const directives = [];
-  const lines = text.split('\n');
-
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-    TEMPLATE_LINT_DISABLE_REGEX.lastIndex = 0;
+function collectMatches(line, lineIndex, directives) {
+  for (const regex of [MUSTACHE_COMMENT_REGEX, MUSTACHE_BLOCK_COMMENT_REGEX]) {
+    regex.lastIndex = 0;
     let match;
 
-    while ((match = TEMPLATE_LINT_DISABLE_REGEX.exec(line)) !== null) {
+    while ((match = regex.exec(line)) !== null) {
       const rulesPart = (match[1] || '').trim();
-      // Strip trailing -- from mustache block comments
-      const cleaned = rulesPart.replace(/-+$/, '').trim();
-
-      const rules = cleaned
-        ? cleaned.split(/[\s,]+/).filter(Boolean)
+      const rules = rulesPart
+        ? rulesPart.split(/[\s,]+/).filter(Boolean)
         : []; // empty = disable all
 
-      // Comment is on line i+1 (1-indexed), next line is i+2.
+      // Comment is on line lineIndex+1 (1-indexed), next line is lineIndex+2.
       // In template ASTs, TextNodes can start on the same line as the comment
       // (e.g. the newline after {{! template-lint-disable }} is part of the
       // following TextNode), so we suppress both the comment line and the next.
       directives.push({
-        commentLine: i + 1,
-        nextLine: i + 2,
+        commentLine: lineIndex + 1,
+        nextLine: lineIndex + 2,
         rules,
       });
     }
   }
+}
+
+function parseDisableDirectives(text) {
+  const directives = [];
+  const lines = text.split('\n');
+
+  for (let i = 0; i < lines.length; i++) {
+    collectMatches(lines[i], i, directives);
+  }
 
   return directives;
 }

From 51ff450a7689f13e7ffc5a6046d5d8820d8fdac9 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sun, 22 Mar 2026 01:14:19 -0400
Subject: [PATCH 05/19] Fix self-lint errors

- Reorder regex char class per unicorn/better-regex
- Use for-of loop per unicorn/no-for-loop
- Move initHbsESLint to outer scope per unicorn/consistent-function-scoping
- Disable import/no-unresolved for ember-eslint-parser/hbs (valid export)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 lib/config/base.js                            |  2 +-
 lib/processors/template-lint-disable.js       |  8 +--
 .../rules-preprocessor/gjs-gts-parser-test.js | 50 +++++++++----------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/lib/config/base.js b/lib/config/base.js
index b7f5f7f0c1..70524e2a74 100644
--- a/lib/config/base.js
+++ b/lib/config/base.js
@@ -1,6 +1,6 @@
 const plugin = require('../index');
 const emberEslintParser = require('ember-eslint-parser');
-const emberEslintParserHbs = require('ember-eslint-parser/hbs');
+const emberEslintParserHbs = require('ember-eslint-parser/hbs'); // eslint-disable-line import/no-unresolved
 
 module.exports = [
   {
diff --git a/lib/processors/template-lint-disable.js b/lib/processors/template-lint-disable.js
index 04c6fc0fd7..5cc9eacc27 100644
--- a/lib/processors/template-lint-disable.js
+++ b/lib/processors/template-lint-disable.js
@@ -9,9 +9,9 @@ const noop = require('ember-eslint-parser/noop');
  *   {{!-- template-lint-disable rule1 rule2 --}}
  */
 const MUSTACHE_COMMENT_REGEX =
-  /{{!\s+template-lint-disable([\w\s,/-]*)}}/g;
+  /{{!\s+template-lint-disable([\s\w,/-]*)}}/g;
 const MUSTACHE_BLOCK_COMMENT_REGEX =
-  /{{!--\s*template-lint-disable([\w\s,/-]*)--}}/g;
+  /{{!--\s*template-lint-disable([\s\w,/-]*)--}}/g;
 
 // Store disable directives per file
 const fileDisableDirectives = new Map();
@@ -50,8 +50,8 @@ function parseDisableDirectives(text) {
   const directives = [];
   const lines = text.split('\n');
 
-  for (let i = 0; i < lines.length; i++) {
-    collectMatches(lines[i], i, directives);
+  for (const [i, line] of lines.entries()) {
+    collectMatches(line, i, directives);
   }
 
   return directives;
diff --git a/tests/lib/rules-preprocessor/gjs-gts-parser-test.js b/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
index 6ce852db27..b9965a7c9a 100644
--- a/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
+++ b/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
@@ -1022,33 +1022,33 @@ describe('supports template-lint-disable directive', () => {
   });
 });
 
-describe('supports template-lint-disable directive in hbs files', () => {
-  function initHbsESLint() {
-    return new ESLint({
-      ignore: false,
-      useEslintrc: false,
-      plugins: { ember: plugin },
-      overrideConfig: {
-        root: true,
-        parserOptions: {
-          ecmaVersion: 2022,
-          sourceType: 'module',
-        },
-        plugins: ['ember'],
-        overrides: [
-          {
-            files: ['**/*.hbs'],
-            parser: hbsParser,
-            processor: 'ember/noop',
-            rules: {
-              'ember/template-no-bare-strings': 'error',
-            },
-          },
-        ],
+function initHbsESLint() {
+  return new ESLint({
+    ignore: false,
+    useEslintrc: false,
+    plugins: { ember: plugin },
+    overrideConfig: {
+      root: true,
+      parserOptions: {
+        ecmaVersion: 2022,
+        sourceType: 'module',
       },
-    });
-  }
+      plugins: ['ember'],
+      overrides: [
+        {
+          files: ['**/*.hbs'],
+          parser: hbsParser,
+          processor: 'ember/noop',
+          rules: {
+            'ember/template-no-bare-strings': 'error',
+          },
+        },
+      ],
+    },
+  });
+}
 
+describe('supports template-lint-disable directive in hbs files', () => {
   it('disables all rules on the next line with mustache comment', async () => {
     const eslint = initHbsESLint();
     const code = `<div>

From 83cbfa300da8126b9e48b34b50e1c5e710a33441 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sun, 22 Mar 2026 01:20:58 -0400
Subject: [PATCH 06/19] Address PR review feedback

- Revert recommended.mjs to original (cannot change recommended config)
- Keep noop processor unchanged; export template-lint-disable as a
  separate processor (ember/template-lint-disable) to avoid breaking
  existing gjs/gts users
- Wire hbs files to use the new processor by default in base configs
  (hbs had no prior config, so this is additive)
- Move hbs tests to a separate hbs-parser-test.js file
- Update gjs template-lint-disable tests to explicitly use the new
  processor via initESLintWithTemplateLintDisable()

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 lib/config-legacy/base.js                     |   2 +-
 lib/config/base.js                            |   2 +-
 lib/index.js                                  |   4 +-
 lib/recommended.mjs                           |  17 --
 .../rules-preprocessor/gjs-gts-parser-test.js | 163 ++++--------------
 .../lib/rules-preprocessor/hbs-parser-test.js | 127 ++++++++++++++
 6 files changed, 166 insertions(+), 149 deletions(-)
 create mode 100644 tests/lib/rules-preprocessor/hbs-parser-test.js

diff --git a/lib/config-legacy/base.js b/lib/config-legacy/base.js
index 1dabbaf462..26472a9bdc 100644
--- a/lib/config-legacy/base.js
+++ b/lib/config-legacy/base.js
@@ -26,7 +26,7 @@ module.exports = {
     {
       files: ['**/*.hbs'],
       parser: 'ember-eslint-parser/hbs',
-      processor: 'ember/noop',
+      processor: 'ember/template-lint-disable',
     },
   ],
 };
diff --git a/lib/config/base.js b/lib/config/base.js
index 70524e2a74..143077f700 100644
--- a/lib/config/base.js
+++ b/lib/config/base.js
@@ -23,6 +23,6 @@ module.exports = [
     languageOptions: {
       parser: emberEslintParserHbs,
     },
-    processor: 'ember/noop',
+    processor: 'ember/template-lint-disable',
   },
 ];
diff --git a/lib/index.js b/lib/index.js
index 7bb1b2110e..638e4d840b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const requireIndex = require('requireindex');
+const noop = require('ember-eslint-parser/noop');
 const templateLintDisableProcessor = require('./processors/template-lint-disable');
 const pkg = require('../package.json'); // eslint-disable-line import/extensions
 
@@ -16,6 +17,7 @@ module.exports = {
   },
   processors: {
     // https://eslint.org/docs/developer-guide/working-with-plugins#file-extension-named-processor
-    noop: templateLintDisableProcessor,
+    noop,
+    'template-lint-disable': templateLintDisableProcessor,
   },
 };
diff --git a/lib/recommended.mjs b/lib/recommended.mjs
index 029c15c953..5daaf29ae4 100644
--- a/lib/recommended.mjs
+++ b/lib/recommended.mjs
@@ -3,11 +3,9 @@ import baseRules from './recommended-rules.js';
 import gjsRules from './recommended-rules-gjs.js';
 import gtsRules from './recommended-rules-gts.js';
 import emberParser from 'ember-eslint-parser';
-import emberParserHbs from 'ember-eslint-parser/hbs';
 
 export const plugin = emberPlugin;
 export const parser = emberParser;
-export const hbsParser = emberParserHbs;
 
 export const base = {
   name: 'ember:base',
@@ -55,29 +53,14 @@ export const gts = {
   },
 };
 
-export const hbs = {
-  name: 'ember:hbs',
-  plugins: { ember: emberPlugin },
-  files: ['**/*.hbs'],
-  languageOptions: {
-    parser: emberParserHbs,
-  },
-  processor: 'ember/noop',
-  rules: {
-    ...base.rules,
-  },
-};
-
 export default {
   // Helpful utility exports
   plugin,
   parser,
-  hbsParser,
   // Recommended config sets
   configs: {
     base,
     gjs,
     gts,
-    hbs,
   },
 };
diff --git a/tests/lib/rules-preprocessor/gjs-gts-parser-test.js b/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
index b9965a7c9a..a1ccfcc2cf 100644
--- a/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
+++ b/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
@@ -13,7 +13,6 @@ const { writeFileSync, readFileSync } = require('node:fs');
 const { join } = require('node:path');
 
 const gjsGtsParser = require.resolve('ember-eslint-parser');
-const hbsParser = require.resolve('ember-eslint-parser/hbs');
 
 /**
  * Helper function which creates ESLint instance with enabled/disabled autofix feature.
@@ -888,9 +887,35 @@ describe('multiple tokens in same file', () => {
   });
 });
 
+function initESLintWithTemplateLintDisable() {
+  return new ESLint({
+    ignore: false,
+    useEslintrc: false,
+    plugins: { ember: plugin },
+    overrideConfig: {
+      root: true,
+      env: {
+        browser: true,
+      },
+      parserOptions: {
+        ecmaVersion: 2022,
+        sourceType: 'module',
+      },
+      parser: gjsGtsParser,
+      plugins: ['ember'],
+      processor: 'ember/template-lint-disable',
+      rules: {
+        'no-undef': 'error',
+        'no-unused-vars': 'error',
+        quotes: ['error', 'single'],
+      },
+    },
+  });
+}
+
 describe('supports template-lint-disable directive', () => {
   it('disables all rules on the next line with mustache comment', async () => {
-    const eslint = initESLint();
+    const eslint = initESLintWithTemplateLintDisable();
     const code = `
     <template>
       <div>
@@ -906,7 +931,7 @@ describe('supports template-lint-disable directive', () => {
   });
 
   it('disables all rules on the next line with mustache block comment', async () => {
-    const eslint = initESLint();
+    const eslint = initESLintWithTemplateLintDisable();
     const code = `
     <template>
       <div>
@@ -921,7 +946,7 @@ describe('supports template-lint-disable directive', () => {
   });
 
   it('disables a specific rule by eslint rule name', async () => {
-    const eslint = initESLint();
+    const eslint = initESLintWithTemplateLintDisable();
     const code = `
     <template>
       <div>
@@ -940,7 +965,7 @@ describe('supports template-lint-disable directive', () => {
   });
 
   it('only disables the next line, not subsequent lines', async () => {
-    const eslint = initESLint();
+    const eslint = initESLintWithTemplateLintDisable();
     const code = `
     <template>
       <div>
@@ -958,7 +983,7 @@ describe('supports template-lint-disable directive', () => {
   });
 
   it('does not suppress unrelated rules when a specific rule is named', async () => {
-    const eslint = initESLint();
+    const eslint = initESLintWithTemplateLintDisable();
     const code = `
     <template>
       <div>
@@ -975,7 +1000,7 @@ describe('supports template-lint-disable directive', () => {
   });
 
   it('supports template-lint rule name format (maps to ember/ prefix)', async () => {
-    const eslint = initESLint();
+    const eslint = initESLintWithTemplateLintDisable();
     const code = `
     <template>
       <div>
@@ -990,7 +1015,7 @@ describe('supports template-lint-disable directive', () => {
   });
 
   it('supports multiple rule names', async () => {
-    const eslint = initESLint();
+    const eslint = initESLintWithTemplateLintDisable();
     const code = `
     <template>
       <div>
@@ -1005,7 +1030,7 @@ describe('supports template-lint-disable directive', () => {
   });
 
   it('works with multiple disable comments in the same file', async () => {
-    const eslint = initESLint();
+    const eslint = initESLintWithTemplateLintDisable();
     const code = `
     <template>
       <div>
@@ -1022,123 +1047,3 @@ describe('supports template-lint-disable directive', () => {
   });
 });
 
-function initHbsESLint() {
-  return new ESLint({
-    ignore: false,
-    useEslintrc: false,
-    plugins: { ember: plugin },
-    overrideConfig: {
-      root: true,
-      parserOptions: {
-        ecmaVersion: 2022,
-        sourceType: 'module',
-      },
-      plugins: ['ember'],
-      overrides: [
-        {
-          files: ['**/*.hbs'],
-          parser: hbsParser,
-          processor: 'ember/noop',
-          rules: {
-            'ember/template-no-bare-strings': 'error',
-          },
-        },
-      ],
-    },
-  });
-}
-
-describe('supports template-lint-disable directive in hbs files', () => {
-  it('disables all rules on the next line with mustache comment', async () => {
-    const eslint = initHbsESLint();
-    const code = `<div>
-  {{! template-lint-disable }}
-  Hello world
-</div>`;
-    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
-    const resultErrors = results.flatMap((result) => result.messages);
-    expect(resultErrors).toHaveLength(0);
-  });
-
-  it('disables all rules on the next line with mustache block comment', async () => {
-    const eslint = initHbsESLint();
-    const code = `<div>
-  {{!-- template-lint-disable --}}
-  Hello world
-</div>`;
-    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
-    const resultErrors = results.flatMap((result) => result.messages);
-    expect(resultErrors).toHaveLength(0);
-  });
-
-  it('only disables the next line, not subsequent lines', async () => {
-    const eslint = initHbsESLint();
-    const code = `{{! template-lint-disable }}
-<div>Hello world</div>
-<div>Bare string here too</div>`;
-    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
-    const resultErrors = results.flatMap((result) => result.messages);
-    // Line 2 "Hello world" suppressed, but line 3 "Bare string here too" should still error
-    expect(resultErrors).toHaveLength(1);
-    expect(resultErrors[0].line).toBe(3);
-  });
-
-  it('disables a specific rule by name', async () => {
-    const eslint = initHbsESLint();
-    const code = `<div>
-  {{! template-lint-disable ember/template-no-bare-strings }}
-  Hello world
-</div>`;
-    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
-    const resultErrors = results.flatMap((result) => result.messages);
-    expect(resultErrors).toHaveLength(0);
-  });
-
-  it('supports template-lint rule name format (maps to ember/ prefix)', async () => {
-    const eslint = initHbsESLint();
-    const code = `<div>
-  {{! template-lint-disable no-bare-strings }}
-  Hello world
-</div>`;
-    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
-    const resultErrors = results.flatMap((result) => result.messages);
-    expect(resultErrors).toHaveLength(0);
-  });
-
-  it('does not suppress unrelated rules when a specific rule is named', async () => {
-    const eslint = initHbsESLint();
-    const code = `<div>
-  {{! template-lint-disable ember/template-no-html-comments }}
-  Hello world
-</div>`;
-    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
-    const resultErrors = results.flatMap((result) => result.messages);
-    // no-bare-strings should still fire since we only disabled no-html-comments
-    expect(resultErrors).toHaveLength(1);
-    expect(resultErrors[0].ruleId).toBe('ember/template-no-bare-strings');
-  });
-
-  it('works with multiple disable comments in the same file', async () => {
-    const eslint = initHbsESLint();
-    const code = `<div>
-  {{! template-lint-disable }}
-  Hello world
-  {{! template-lint-disable }}
-  Another bare string
-</div>`;
-    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
-    const resultErrors = results.flatMap((result) => result.messages);
-    expect(resultErrors).toHaveLength(0);
-  });
-
-  it('bare strings without disable comment still trigger errors', async () => {
-    const eslint = initHbsESLint();
-    const code = `<div>
-  Hello world
-</div>`;
-    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
-    const resultErrors = results.flatMap((result) => result.messages);
-    expect(resultErrors).toHaveLength(1);
-    expect(resultErrors[0].ruleId).toBe('ember/template-no-bare-strings');
-  });
-});
diff --git a/tests/lib/rules-preprocessor/hbs-parser-test.js b/tests/lib/rules-preprocessor/hbs-parser-test.js
new file mode 100644
index 0000000000..597686d26f
--- /dev/null
+++ b/tests/lib/rules-preprocessor/hbs-parser-test.js
@@ -0,0 +1,127 @@
+'use strict';
+
+const { ESLint } = require('eslint');
+const plugin = require('../../../lib');
+
+const hbsParser = require.resolve('ember-eslint-parser/hbs');
+
+function initHbsESLint() {
+  return new ESLint({
+    ignore: false,
+    useEslintrc: false,
+    plugins: { ember: plugin },
+    overrideConfig: {
+      root: true,
+      parserOptions: {
+        ecmaVersion: 2022,
+        sourceType: 'module',
+      },
+      plugins: ['ember'],
+      overrides: [
+        {
+          files: ['**/*.hbs'],
+          parser: hbsParser,
+          processor: 'ember/template-lint-disable',
+          rules: {
+            'ember/template-no-bare-strings': 'error',
+          },
+        },
+      ],
+    },
+  });
+}
+
+describe('supports template-lint-disable directive in hbs files', () => {
+  it('disables all rules on the next line with mustache comment', async () => {
+    const eslint = initHbsESLint();
+    const code = `<div>
+  {{! template-lint-disable }}
+  Hello world
+</div>`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    expect(resultErrors).toHaveLength(0);
+  });
+
+  it('disables all rules on the next line with mustache block comment', async () => {
+    const eslint = initHbsESLint();
+    const code = `<div>
+  {{!-- template-lint-disable --}}
+  Hello world
+</div>`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    expect(resultErrors).toHaveLength(0);
+  });
+
+  it('only disables the next line, not subsequent lines', async () => {
+    const eslint = initHbsESLint();
+    const code = `{{! template-lint-disable }}
+<div>Hello world</div>
+<div>Bare string here too</div>`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    // Line 2 "Hello world" suppressed, but line 3 "Bare string here too" should still error
+    expect(resultErrors).toHaveLength(1);
+    expect(resultErrors[0].line).toBe(3);
+  });
+
+  it('disables a specific rule by name', async () => {
+    const eslint = initHbsESLint();
+    const code = `<div>
+  {{! template-lint-disable ember/template-no-bare-strings }}
+  Hello world
+</div>`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    expect(resultErrors).toHaveLength(0);
+  });
+
+  it('supports template-lint rule name format (maps to ember/ prefix)', async () => {
+    const eslint = initHbsESLint();
+    const code = `<div>
+  {{! template-lint-disable no-bare-strings }}
+  Hello world
+</div>`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    expect(resultErrors).toHaveLength(0);
+  });
+
+  it('does not suppress unrelated rules when a specific rule is named', async () => {
+    const eslint = initHbsESLint();
+    const code = `<div>
+  {{! template-lint-disable ember/template-no-html-comments }}
+  Hello world
+</div>`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    // no-bare-strings should still fire since we only disabled no-html-comments
+    expect(resultErrors).toHaveLength(1);
+    expect(resultErrors[0].ruleId).toBe('ember/template-no-bare-strings');
+  });
+
+  it('works with multiple disable comments in the same file', async () => {
+    const eslint = initHbsESLint();
+    const code = `<div>
+  {{! template-lint-disable }}
+  Hello world
+  {{! template-lint-disable }}
+  Another bare string
+</div>`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    expect(resultErrors).toHaveLength(0);
+  });
+
+  it('bare strings without disable comment still trigger errors', async () => {
+    const eslint = initHbsESLint();
+    const code = `<div>
+  Hello world
+</div>`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    expect(resultErrors).toHaveLength(1);
+    expect(resultErrors[0].ruleId).toBe('ember/template-no-bare-strings');
+  });
+});

From f48d3e6547e384c97605309df3870f4b513d1d0d Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sun, 22 Mar 2026 01:22:30 -0400
Subject: [PATCH 07/19] Revert config-legacy/base.js to original

Cannot change existing configs; the template-lint-disable processor
is available for users to opt into via their own config.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 lib/config-legacy/base.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/config-legacy/base.js b/lib/config-legacy/base.js
index 26472a9bdc..d27a5e8806 100644
--- a/lib/config-legacy/base.js
+++ b/lib/config-legacy/base.js
@@ -23,10 +23,5 @@ module.exports = {
       parser: 'ember-eslint-parser',
       processor: 'ember/noop',
     },
-    {
-      files: ['**/*.hbs'],
-      parser: 'ember-eslint-parser/hbs',
-      processor: 'ember/template-lint-disable',
-    },
   ],
 };

From c981dfa87bd41ed898c315bd15977f4570a02d5e Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sun, 22 Mar 2026 01:23:08 -0400
Subject: [PATCH 08/19] Revert config/base.js to original

No config changes in this PR; the template-lint-disable processor
is exported for users to opt into in their own config.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 lib/config/base.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/lib/config/base.js b/lib/config/base.js
index 143077f700..c6bdf52381 100644
--- a/lib/config/base.js
+++ b/lib/config/base.js
@@ -1,6 +1,5 @@
 const plugin = require('../index');
 const emberEslintParser = require('ember-eslint-parser');
-const emberEslintParserHbs = require('ember-eslint-parser/hbs'); // eslint-disable-line import/no-unresolved
 
 module.exports = [
   {
@@ -18,11 +17,4 @@ module.exports = [
     },
     processor: 'ember/noop',
   },
-  {
-    files: ['**/*.hbs'],
-    languageOptions: {
-      parser: emberEslintParserHbs,
-    },
-    processor: 'ember/template-lint-disable',
-  },
 ];

From 2df802f752623de88ecd17328c7fd4d882e8c7a9 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sun, 22 Mar 2026 09:50:07 -0400
Subject: [PATCH 09/19] Fix prettier formatting

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 lib/processors/template-lint-disable.js             | 10 +++-------
 tests/lib/rules-preprocessor/gjs-gts-parser-test.js |  1 -
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/processors/template-lint-disable.js b/lib/processors/template-lint-disable.js
index 5cc9eacc27..dcfe61d24e 100644
--- a/lib/processors/template-lint-disable.js
+++ b/lib/processors/template-lint-disable.js
@@ -8,10 +8,8 @@ const noop = require('ember-eslint-parser/noop');
  *   {{! template-lint-disable rule1 rule2 }}
  *   {{!-- template-lint-disable rule1 rule2 --}}
  */
-const MUSTACHE_COMMENT_REGEX =
-  /{{!\s+template-lint-disable([\s\w,/-]*)}}/g;
-const MUSTACHE_BLOCK_COMMENT_REGEX =
-  /{{!--\s*template-lint-disable([\s\w,/-]*)--}}/g;
+const MUSTACHE_COMMENT_REGEX = /{{!\s+template-lint-disable([\s\w,/-]*)}}/g;
+const MUSTACHE_BLOCK_COMMENT_REGEX = /{{!--\s*template-lint-disable([\s\w,/-]*)--}}/g;
 
 // Store disable directives per file
 const fileDisableDirectives = new Map();
@@ -29,9 +27,7 @@ function collectMatches(line, lineIndex, directives) {
 
     while ((match = regex.exec(line)) !== null) {
       const rulesPart = (match[1] || '').trim();
-      const rules = rulesPart
-        ? rulesPart.split(/[\s,]+/).filter(Boolean)
-        : []; // empty = disable all
+      const rules = rulesPart ? rulesPart.split(/[\s,]+/).filter(Boolean) : []; // empty = disable all
 
       // Comment is on line lineIndex+1 (1-indexed), next line is lineIndex+2.
       // In template ASTs, TextNodes can start on the same line as the comment
diff --git a/tests/lib/rules-preprocessor/gjs-gts-parser-test.js b/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
index a1ccfcc2cf..8b96de80a0 100644
--- a/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
+++ b/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
@@ -1046,4 +1046,3 @@ describe('supports template-lint-disable directive', () => {
     expect(resultErrors).toHaveLength(0);
   });
 });
-

From e5bece87f9d7ba86ce8524be208bf6ce139672d5 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 11 Apr 2026 08:48:30 -0400
Subject: [PATCH 10/19] Address review feedback from johanrd

- Add early-exit in preprocess for files without directives (near-zero
  overhead for common case)
- Add `@` to regex character classes to support scoped plugin rules
  like @typescript-eslint/no-unused-vars
- Document semantic difference from ember-template-lint (next-line-only
  vs scope-based disable) and comment-line suppression behavior
- Fix misleading test name that claimed to test ember/ prefix mapping
  but was actually testing exact rule ID matching

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 lib/processors/template-lint-disable.js          | 16 ++++++++++++++--
 .../rules-preprocessor/gjs-gts-parser-test.js    |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/processors/template-lint-disable.js b/lib/processors/template-lint-disable.js
index dcfe61d24e..44b94c5066 100644
--- a/lib/processors/template-lint-disable.js
+++ b/lib/processors/template-lint-disable.js
@@ -8,8 +8,8 @@ const noop = require('ember-eslint-parser/noop');
  *   {{! template-lint-disable rule1 rule2 }}
  *   {{!-- template-lint-disable rule1 rule2 --}}
  */
-const MUSTACHE_COMMENT_REGEX = /{{!\s+template-lint-disable([\s\w,/-]*)}}/g;
-const MUSTACHE_BLOCK_COMMENT_REGEX = /{{!--\s*template-lint-disable([\s\w,/-]*)--}}/g;
+const MUSTACHE_COMMENT_REGEX = /{{!\s+template-lint-disable([\s\w,/@-]*)}}/g;
+const MUSTACHE_BLOCK_COMMENT_REGEX = /{{!--\s*template-lint-disable([\s\w,/@-]*)--}}/g;
 
 // Store disable directives per file
 const fileDisableDirectives = new Map();
@@ -19,6 +19,13 @@ const fileDisableDirectives = new Map();
  * which lines/rules should be suppressed.
  *
  * template-lint-disable means "disable next line" (like eslint-disable-next-line).
+ *
+ * NOTE: In ember-template-lint, `template-lint-disable` disables from that point
+ * for the rest of the scope (until `template-lint-enable`). This implementation
+ * intentionally uses "next line only" semantics to match ESLint conventions.
+ *
+ * Errors on the comment line itself are also suppressed (like eslint-disable-line)
+ * because template AST TextNodes can start on the same line as the comment.
  */
 function collectMatches(line, lineIndex, directives) {
   for (const regex of [MUSTACHE_COMMENT_REGEX, MUSTACHE_BLOCK_COMMENT_REGEX]) {
@@ -91,6 +98,11 @@ module.exports = {
   registerParsedFile: noop.registerParsedFile,
 
   preprocess(text, fileName) {
+    if (!text.includes('template-lint-disable')) {
+      fileDisableDirectives.delete(fileName);
+      return [text];
+    }
+
     const directives = parseDisableDirectives(text);
     if (directives.length > 0) {
       fileDisableDirectives.set(fileName, directives);
diff --git a/tests/lib/rules-preprocessor/gjs-gts-parser-test.js b/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
index 8b96de80a0..d1ea4670df 100644
--- a/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
+++ b/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
@@ -999,7 +999,7 @@ describe('supports template-lint-disable directive', () => {
     expect(resultErrors[0].ruleId).toBe('no-undef');
   });
 
-  it('supports template-lint rule name format (maps to ember/ prefix)', async () => {
+  it('disables a rule matched by exact ESLint rule ID', async () => {
     const eslint = initESLintWithTemplateLintDisable();
     const code = `
     <template>

From b89188e91437174fa6cdc886c5bbb578c3b3ac5a Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 11 Apr 2026 16:53:13 -0400
Subject: [PATCH 11/19] Fix noop.postprocess corrupting hbs error messages and
 add test coverage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Only delegate to noop.postprocess for gjs/gts files — the hbs parser
  never calls registerParsedFile, so noop appends irrelevant gjs/gts
  setup instructions to hbs error messages
- Add .message assertion in hbs test to catch future regressions
- Add test for comment-line suppression (eslint-disable-line behavior)
- Add test for @-scoped plugin rule names in regex

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 lib/processors/template-lint-disable.js       |  8 ++++--
 .../lib/rules-preprocessor/hbs-parser-test.js | 25 +++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/lib/processors/template-lint-disable.js b/lib/processors/template-lint-disable.js
index 44b94c5066..ebfb9a268c 100644
--- a/lib/processors/template-lint-disable.js
+++ b/lib/processors/template-lint-disable.js
@@ -114,8 +114,12 @@ module.exports = {
   },
 
   postprocess(messages, fileName) {
-    // First, apply noop's postprocess logic (config validation)
-    const msgs = noop.postprocess(messages, fileName);
+    // Only run noop's postprocess for gjs/gts files — it appends gjs/gts setup
+    // instructions on parse failures, which corrupts hbs error messages since
+    // the hbs parser never calls registerParsedFile.
+    const msgs = /\.(gjs|gts)$/.test(fileName)
+      ? noop.postprocess(messages, fileName)
+      : messages.flat();
 
     const directives = fileDisableDirectives.get(fileName);
     if (!directives) {
diff --git a/tests/lib/rules-preprocessor/hbs-parser-test.js b/tests/lib/rules-preprocessor/hbs-parser-test.js
index 597686d26f..2707088f0e 100644
--- a/tests/lib/rules-preprocessor/hbs-parser-test.js
+++ b/tests/lib/rules-preprocessor/hbs-parser-test.js
@@ -123,5 +123,30 @@ describe('supports template-lint-disable directive in hbs files', () => {
     const resultErrors = results.flatMap((result) => result.messages);
     expect(resultErrors).toHaveLength(1);
     expect(resultErrors[0].ruleId).toBe('ember/template-no-bare-strings');
+    // Verify error message is not corrupted with gjs/gts setup instructions
+    expect(resultErrors[0].message).not.toContain('To lint Gjs/Gts files');
+  });
+
+  it('suppresses errors on the comment line itself (like eslint-disable-line)', async () => {
+    const eslint = initHbsESLint();
+    const code = `Hello {{! template-lint-disable }}`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    // "Hello" is on the same line as the disable comment — suppressed
+    expect(resultErrors).toHaveLength(0);
+  });
+
+  it('supports @-scoped plugin rule names', async () => {
+    const eslint = initHbsESLint();
+    const code = `<div>
+  {{! template-lint-disable @ember/template-no-bare-strings }}
+  Hello world
+</div>`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    // @ember/template-no-bare-strings won't match ember/template-no-bare-strings,
+    // so the error should still fire (tests that @ is parsed, not swallowed)
+    expect(resultErrors).toHaveLength(1);
+    expect(resultErrors[0].ruleId).toBe('ember/template-no-bare-strings');
   });
 });

From 6434dbdb3c1e14ca6b22d1222c031e0d21c69a52 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 11 Apr 2026 17:26:36 -0400
Subject: [PATCH 12/19] Clean up: hoist regex, remove duplicate test, clarify
 docs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Hoist gjs/gts extension regex to module level to avoid recompiling
  on every postprocess call
- Remove duplicate "disables a rule matched by exact ESLint rule ID"
  test — identical to "disables a specific rule by eslint rule name"
- Rename @-scoped test to accurately describe what it tests (regex
  parsing, not rule suppression)
- Clarify doc comment: suppression covers both comment line and next
  line (not just "like eslint-disable-line")

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 lib/processors/template-lint-disable.js           | 10 +++++++---
 .../lib/rules-preprocessor/gjs-gts-parser-test.js | 15 ---------------
 tests/lib/rules-preprocessor/hbs-parser-test.js   |  7 ++++---
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/lib/processors/template-lint-disable.js b/lib/processors/template-lint-disable.js
index ebfb9a268c..54c54259d1 100644
--- a/lib/processors/template-lint-disable.js
+++ b/lib/processors/template-lint-disable.js
@@ -11,6 +11,8 @@ const noop = require('ember-eslint-parser/noop');
 const MUSTACHE_COMMENT_REGEX = /{{!\s+template-lint-disable([\s\w,/@-]*)}}/g;
 const MUSTACHE_BLOCK_COMMENT_REGEX = /{{!--\s*template-lint-disable([\s\w,/@-]*)--}}/g;
 
+const GJS_GTS_EXT = /\.(gjs|gts)$/;
+
 // Store disable directives per file
 const fileDisableDirectives = new Map();
 
@@ -24,8 +26,10 @@ const fileDisableDirectives = new Map();
  * for the rest of the scope (until `template-lint-enable`). This implementation
  * intentionally uses "next line only" semantics to match ESLint conventions.
  *
- * Errors on the comment line itself are also suppressed (like eslint-disable-line)
- * because template AST TextNodes can start on the same line as the comment.
+ * Errors on the comment line itself are also suppressed (similar to
+ * eslint-disable-line), and errors on the next line are suppressed
+ * (similar to eslint-disable-next-line). This dual behavior exists because
+ * template AST TextNodes can start on the same line as the comment.
  */
 function collectMatches(line, lineIndex, directives) {
   for (const regex of [MUSTACHE_COMMENT_REGEX, MUSTACHE_BLOCK_COMMENT_REGEX]) {
@@ -117,7 +121,7 @@ module.exports = {
     // Only run noop's postprocess for gjs/gts files — it appends gjs/gts setup
     // instructions on parse failures, which corrupts hbs error messages since
     // the hbs parser never calls registerParsedFile.
-    const msgs = /\.(gjs|gts)$/.test(fileName)
+    const msgs = GJS_GTS_EXT.test(fileName)
       ? noop.postprocess(messages, fileName)
       : messages.flat();
 
diff --git a/tests/lib/rules-preprocessor/gjs-gts-parser-test.js b/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
index d1ea4670df..c363fe31bb 100644
--- a/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
+++ b/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
@@ -999,21 +999,6 @@ describe('supports template-lint-disable directive', () => {
     expect(resultErrors[0].ruleId).toBe('no-undef');
   });
 
-  it('disables a rule matched by exact ESLint rule ID', async () => {
-    const eslint = initESLintWithTemplateLintDisable();
-    const code = `
-    <template>
-      <div>
-        {{! template-lint-disable no-undef }}
-        {{test}}
-      </div>
-    </template>
-    `;
-    const results = await eslint.lintText(code, { filePath: 'my-component.gjs' });
-    const resultErrors = results.flatMap((result) => result.messages);
-    expect(resultErrors).toHaveLength(0);
-  });
-
   it('supports multiple rule names', async () => {
     const eslint = initESLintWithTemplateLintDisable();
     const code = `
diff --git a/tests/lib/rules-preprocessor/hbs-parser-test.js b/tests/lib/rules-preprocessor/hbs-parser-test.js
index 2707088f0e..a8ba870831 100644
--- a/tests/lib/rules-preprocessor/hbs-parser-test.js
+++ b/tests/lib/rules-preprocessor/hbs-parser-test.js
@@ -136,7 +136,7 @@ describe('supports template-lint-disable directive in hbs files', () => {
     expect(resultErrors).toHaveLength(0);
   });
 
-  it('supports @-scoped plugin rule names', async () => {
+  it('parses @-scoped rule names without breaking the regex', async () => {
     const eslint = initHbsESLint();
     const code = `<div>
   {{! template-lint-disable @ember/template-no-bare-strings }}
@@ -144,8 +144,9 @@ describe('supports template-lint-disable directive in hbs files', () => {
 </div>`;
     const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
     const resultErrors = results.flatMap((result) => result.messages);
-    // @ember/template-no-bare-strings won't match ember/template-no-bare-strings,
-    // so the error should still fire (tests that @ is parsed, not swallowed)
+    // @ember/template-no-bare-strings won't match ruleId ember/template-no-bare-strings
+    // (different string), so the error still fires — this tests that @ is accepted
+    // by the regex without breaking parsing
     expect(resultErrors).toHaveLength(1);
     expect(resultErrors[0].ruleId).toBe('ember/template-no-bare-strings');
   });

From 464076ce1e14751aaeb32479080795f8f39af1df Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 11 Apr 2026 17:32:48 -0400
Subject: [PATCH 13/19] Add inline comments explaining regex spacing asymmetry

- Explain why MUSTACHE_COMMENT_REGEX uses \s+ (required to avoid
  ambiguity with {{!text}} syntax) while MUSTACHE_BLOCK_COMMENT_REGEX
  uses \s* (dashes already delimit the comment)
- Drop misleading "like eslint-disable-line" from test name

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 lib/processors/template-lint-disable.js         | 2 ++
 tests/lib/rules-preprocessor/hbs-parser-test.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/processors/template-lint-disable.js b/lib/processors/template-lint-disable.js
index 54c54259d1..03a83851c4 100644
--- a/lib/processors/template-lint-disable.js
+++ b/lib/processors/template-lint-disable.js
@@ -8,7 +8,9 @@ const noop = require('ember-eslint-parser/noop');
  *   {{! template-lint-disable rule1 rule2 }}
  *   {{!-- template-lint-disable rule1 rule2 --}}
  */
+// \s+ after ! — required because {{!text}} is valid Handlebars (comment with no space)
 const MUSTACHE_COMMENT_REGEX = /{{!\s+template-lint-disable([\s\w,/@-]*)}}/g;
+// \s* after -- — the dashes already delimit, so {{!--template-lint-disable--}} is fine
 const MUSTACHE_BLOCK_COMMENT_REGEX = /{{!--\s*template-lint-disable([\s\w,/@-]*)--}}/g;
 
 const GJS_GTS_EXT = /\.(gjs|gts)$/;
diff --git a/tests/lib/rules-preprocessor/hbs-parser-test.js b/tests/lib/rules-preprocessor/hbs-parser-test.js
index a8ba870831..02553601a5 100644
--- a/tests/lib/rules-preprocessor/hbs-parser-test.js
+++ b/tests/lib/rules-preprocessor/hbs-parser-test.js
@@ -127,7 +127,7 @@ describe('supports template-lint-disable directive in hbs files', () => {
     expect(resultErrors[0].message).not.toContain('To lint Gjs/Gts files');
   });
 
-  it('suppresses errors on the comment line itself (like eslint-disable-line)', async () => {
+  it('suppresses errors on the comment line itself', async () => {
     const eslint = initHbsESLint();
     const code = `Hello {{! template-lint-disable }}`;
     const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });

From bab29f6fb506dae40c27adcedbb9bab6384e39d2 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 11 Apr 2026 17:37:20 -0400
Subject: [PATCH 14/19] Fix silent no-ops and rule name matching gaps
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add regex lookahead to reject template-lint-disable-next-line and
  template-lint-disable-tree — these ember-template-lint directives
  previously matched silently and suppressed nothing
- Add ember/ prefix mapping to matchesRule so template-no-bare-strings
  (the form used in plugin docs and filenames) matches correctly
- Remove dead registerParsedFile re-export (parser imports it directly
  from ember-eslint-parser, not from the processor object)
- Fix template literal lint violation in hbs test
- Document unsupported directives (enable, disable-next-line, disable-tree)
  and JS string literal caveat in JSDoc

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 lib/processors/template-lint-disable.js       | 29 ++++++++++++++-----
 .../lib/rules-preprocessor/hbs-parser-test.js | 26 ++++++++++++++++-
 2 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/lib/processors/template-lint-disable.js b/lib/processors/template-lint-disable.js
index 03a83851c4..af18ce5a64 100644
--- a/lib/processors/template-lint-disable.js
+++ b/lib/processors/template-lint-disable.js
@@ -8,10 +8,12 @@ const noop = require('ember-eslint-parser/noop');
  *   {{! template-lint-disable rule1 rule2 }}
  *   {{!-- template-lint-disable rule1 rule2 --}}
  */
+// Lookahead (?=\s|…) ensures we match exactly "template-lint-disable"
+// and not "template-lint-disable-next-line" or "template-lint-disable-tree".
 // \s+ after ! — required because {{!text}} is valid Handlebars (comment with no space)
-const MUSTACHE_COMMENT_REGEX = /{{!\s+template-lint-disable([\s\w,/@-]*)}}/g;
+const MUSTACHE_COMMENT_REGEX = /{{!\s+template-lint-disable(?=\s|}})([\s\w,/@-]*)}}/g;
 // \s* after -- — the dashes already delimit, so {{!--template-lint-disable--}} is fine
-const MUSTACHE_BLOCK_COMMENT_REGEX = /{{!--\s*template-lint-disable([\s\w,/@-]*)--}}/g;
+const MUSTACHE_BLOCK_COMMENT_REGEX = /{{!--\s*template-lint-disable(?=\s|--)([\s\w,/@-]*)--}}/g;
 
 const GJS_GTS_EXT = /\.(gjs|gts)$/;
 
@@ -27,11 +29,19 @@ const fileDisableDirectives = new Map();
  * NOTE: In ember-template-lint, `template-lint-disable` disables from that point
  * for the rest of the scope (until `template-lint-enable`). This implementation
  * intentionally uses "next line only" semantics to match ESLint conventions.
+ * `template-lint-enable` is not supported and will be silently ignored.
+ * `template-lint-disable-next-line` and `template-lint-disable-tree` are also
+ * not matched — only the exact `template-lint-disable` directive is recognized.
  *
  * Errors on the comment line itself are also suppressed (similar to
  * eslint-disable-line), and errors on the next line are suppressed
  * (similar to eslint-disable-next-line). This dual behavior exists because
  * template AST TextNodes can start on the same line as the comment.
+ *
+ * CAVEAT: The processor runs on the entire file text, not just template regions.
+ * A JS string literal containing `{{! template-lint-disable }}` in a gjs file
+ * would match and suppress errors on the same/next line. This is unlikely in
+ * practice but impossible to fix without region-aware parsing.
  */
 function collectMatches(line, lineIndex, directives) {
   for (const regex of [MUSTACHE_COMMENT_REGEX, MUSTACHE_BLOCK_COMMENT_REGEX]) {
@@ -68,15 +78,20 @@ function parseDisableDirectives(text) {
 
 /**
  * Map a rule name from template-lint format to eslint-plugin-ember format.
- * e.g. "no-bare-strings" -> "ember/template-no-bare-strings"
- *
- * Also accepts already-qualified names like "ember/template-no-bare-strings".
+ * Accepts three forms:
+ *   "no-bare-strings"                  -> "ember/template-no-bare-strings"
+ *   "template-no-bare-strings"         -> "ember/template-no-bare-strings"
+ *   "ember/template-no-bare-strings"   -> exact match
  */
 function matchesRule(ruleId, disableRuleName) {
   if (ruleId === disableRuleName) {
     return true;
   }
-  // Map template-lint name to eslint-plugin-ember name
+  // e.g. "template-no-bare-strings" -> "ember/template-no-bare-strings"
+  if (ruleId === `ember/${disableRuleName}`) {
+    return true;
+  }
+  // e.g. "no-bare-strings" -> "ember/template-no-bare-strings"
   if (ruleId === `ember/template-${disableRuleName}`) {
     return true;
   }
@@ -101,8 +116,6 @@ function shouldSuppressMessage(message, directives) {
 }
 
 module.exports = {
-  registerParsedFile: noop.registerParsedFile,
-
   preprocess(text, fileName) {
     if (!text.includes('template-lint-disable')) {
       fileDisableDirectives.delete(fileName);
diff --git a/tests/lib/rules-preprocessor/hbs-parser-test.js b/tests/lib/rules-preprocessor/hbs-parser-test.js
index 02553601a5..a77a9917f8 100644
--- a/tests/lib/rules-preprocessor/hbs-parser-test.js
+++ b/tests/lib/rules-preprocessor/hbs-parser-test.js
@@ -129,13 +129,37 @@ describe('supports template-lint-disable directive in hbs files', () => {
 
   it('suppresses errors on the comment line itself', async () => {
     const eslint = initHbsESLint();
-    const code = `Hello {{! template-lint-disable }}`;
+    const code = 'Hello {{! template-lint-disable }}';
     const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
     const resultErrors = results.flatMap((result) => result.messages);
     // "Hello" is on the same line as the disable comment — suppressed
     expect(resultErrors).toHaveLength(0);
   });
 
+  it('does not match template-lint-disable-next-line (different directive)', async () => {
+    const eslint = initHbsESLint();
+    const code = `<div>
+  {{! template-lint-disable-next-line }}
+  Hello world
+</div>`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    // template-lint-disable-next-line is NOT a recognized directive — error should fire
+    expect(resultErrors).toHaveLength(1);
+    expect(resultErrors[0].ruleId).toBe('ember/template-no-bare-strings');
+  });
+
+  it('matches template-no-bare-strings middle form (ember/ prefix mapping)', async () => {
+    const eslint = initHbsESLint();
+    const code = `<div>
+  {{! template-lint-disable template-no-bare-strings }}
+  Hello world
+</div>`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    expect(resultErrors).toHaveLength(0);
+  });
+
   it('parses @-scoped rule names without breaking the regex', async () => {
     const eslint = initHbsESLint();
     const code = `<div>

From f9a0a2808d27c7f9ddfe658bbecc1931f511e532 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 11 Apr 2026 18:05:50 -0400
Subject: [PATCH 15/19] Add README section for template-lint-disable processor

Documents the experimental opt-in processor with setup instructions
for both flat and legacy configs, usage examples, supported rule name
forms, and differences from ember-template-lint semantics.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 README.md | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/README.md b/README.md
index c62c1626ce..54c0d29a88 100644
--- a/README.md
+++ b/README.md
@@ -150,6 +150,63 @@ rules in templates can be disabled with eslint directives with mustache or html
 </template>
 ```
 
+### template-lint-disable (experimental)
+
+> [!WARNING]
+> This processor is experimental and not yet covered by semver guarantees. The API may change in future releases.
+
+For users migrating from `ember-template-lint`, this plugin provides an opt-in `template-lint-disable` processor that recognizes `{{! template-lint-disable }}` comments. This can be useful for suppressing lint errors in `.hbs` files or in gjs/gts templates using familiar ember-template-lint syntax.
+
+To enable it, set the processor in your ESLint config:
+
+```js
+// eslint.config.js (flat config)
+const ember = require('eslint-plugin-ember');
+
+module.exports = [
+  {
+    files: ['**/*.hbs'],
+    plugins: { ember },
+    processor: 'ember/template-lint-disable',
+    // ...
+  },
+];
+```
+
+```js
+// .eslintrc.js (legacy config)
+module.exports = {
+  overrides: [
+    {
+      files: ['**/*.hbs'],
+      plugins: ['ember'],
+      processor: 'ember/template-lint-disable',
+      // ...
+    },
+  ],
+};
+```
+
+Usage:
+
+```hbs
+{{! suppress all rules on the next line }}
+{{! template-lint-disable }}
+Hello world
+
+{{! suppress a specific rule }}
+{{!-- template-lint-disable no-bare-strings --}}
+Hello world
+```
+
+Rule names can be specified as:
+- Template-lint names: `no-bare-strings` (maps to `ember/template-no-bare-strings`)
+- Plugin-qualified names: `template-no-bare-strings` (maps to `ember/template-no-bare-strings`)
+- Full ESLint rule IDs: `ember/template-no-bare-strings`, `no-undef`
+
+> [!NOTE]
+> Unlike `ember-template-lint`, this directive only suppresses the **next line** (and the comment line itself). It does not disable rules for the rest of the scope. `template-lint-enable`, `template-lint-disable-next-line`, and `template-lint-disable-tree` are not supported.
+
 ## 🧰 Configurations
 
 <!-- begin auto-generated configs list -->

From a429d2e85a0896984a45002734b43579c555852f Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 11 Apr 2026 18:32:45 -0400
Subject: [PATCH 16/19] Add hbs parser to README config and test eslint-disable
 ranges
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add parser: 'ember-eslint-parser/hbs' to README config examples —
  required for hbs files but was missing
- Document eslint-disable/eslint-enable as the way to suppress ranges
  (works natively via mustache comments, no special processor needed)
- Add test verifying eslint-disable/eslint-enable range suppression
  works in hbs templates

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 README.md                                       | 13 ++++++++++++-
 tests/lib/rules-preprocessor/hbs-parser-test.js | 15 +++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 54c0d29a88..f5215e5e06 100644
--- a/README.md
+++ b/README.md
@@ -157,7 +157,7 @@ rules in templates can be disabled with eslint directives with mustache or html
 
 For users migrating from `ember-template-lint`, this plugin provides an opt-in `template-lint-disable` processor that recognizes `{{! template-lint-disable }}` comments. This can be useful for suppressing lint errors in `.hbs` files or in gjs/gts templates using familiar ember-template-lint syntax.
 
-To enable it, set the processor in your ESLint config:
+To enable it, set the processor and parser in your ESLint config:
 
 ```js
 // eslint.config.js (flat config)
@@ -166,6 +166,7 @@ const ember = require('eslint-plugin-ember');
 module.exports = [
   {
     files: ['**/*.hbs'],
+    parser: 'ember-eslint-parser/hbs',
     plugins: { ember },
     processor: 'ember/template-lint-disable',
     // ...
@@ -179,6 +180,7 @@ module.exports = {
   overrides: [
     {
       files: ['**/*.hbs'],
+      parser: 'ember-eslint-parser/hbs',
       plugins: ['ember'],
       processor: 'ember/template-lint-disable',
       // ...
@@ -207,6 +209,15 @@ Rule names can be specified as:
 > [!NOTE]
 > Unlike `ember-template-lint`, this directive only suppresses the **next line** (and the comment line itself). It does not disable rules for the rest of the scope. `template-lint-enable`, `template-lint-disable-next-line`, and `template-lint-disable-tree` are not supported.
 
+To suppress a range of lines, use standard ESLint directives instead — these work natively in mustache comments:
+
+```hbs
+{{! eslint-disable ember/template-no-bare-strings }}
+Hello world
+Another bare string
+{{! eslint-enable ember/template-no-bare-strings }}
+```
+
 ## 🧰 Configurations
 
 <!-- begin auto-generated configs list -->
diff --git a/tests/lib/rules-preprocessor/hbs-parser-test.js b/tests/lib/rules-preprocessor/hbs-parser-test.js
index a77a9917f8..c4a97f4618 100644
--- a/tests/lib/rules-preprocessor/hbs-parser-test.js
+++ b/tests/lib/rules-preprocessor/hbs-parser-test.js
@@ -160,6 +160,21 @@ describe('supports template-lint-disable directive in hbs files', () => {
     expect(resultErrors).toHaveLength(0);
   });
 
+  it('eslint-disable/eslint-enable ranges work in hbs templates', async () => {
+    const eslint = initHbsESLint();
+    const code = `{{! eslint-disable ember/template-no-bare-strings }}
+Hello world
+Another bare string
+{{! eslint-enable ember/template-no-bare-strings }}
+This should error`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    // Lines 2-3 are inside the eslint-disable range — suppressed
+    // "This should error" after eslint-enable triggers the rule
+    expect(resultErrors).toHaveLength(1);
+    expect(resultErrors[0].ruleId).toBe('ember/template-no-bare-strings');
+  });
+
   it('parses @-scoped rule names without breaking the regex', async () => {
     const eslint = initHbsESLint();
     const code = `<div>

From a077ffe70432cf926b2179bff59d1b826b8f4a4b Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 11 Apr 2026 18:36:16 -0400
Subject: [PATCH 17/19] Document eslint-disable-next-line in templates and add
 test

Standard ESLint directives (eslint-disable-next-line, eslint-disable/
eslint-enable ranges) work natively in mustache comments alongside
the template-lint-disable processor. Add both forms to the README
and add a test for eslint-disable-next-line in hbs.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 README.md                                       |  7 ++++++-
 tests/lib/rules-preprocessor/hbs-parser-test.js | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f5215e5e06..65081bf8e3 100644
--- a/README.md
+++ b/README.md
@@ -209,9 +209,14 @@ Rule names can be specified as:
 > [!NOTE]
 > Unlike `ember-template-lint`, this directive only suppresses the **next line** (and the comment line itself). It does not disable rules for the rest of the scope. `template-lint-enable`, `template-lint-disable-next-line`, and `template-lint-disable-tree` are not supported.
 
-To suppress a range of lines, use standard ESLint directives instead — these work natively in mustache comments:
+Standard ESLint directives also work natively in mustache comments and can be used alongside `template-lint-disable`:
 
 ```hbs
+{{! suppress a single line }}
+{{! eslint-disable-next-line ember/template-no-bare-strings }}
+<span>Hello world</span>
+
+{{! suppress a range of lines }}
 {{! eslint-disable ember/template-no-bare-strings }}
 Hello world
 Another bare string
diff --git a/tests/lib/rules-preprocessor/hbs-parser-test.js b/tests/lib/rules-preprocessor/hbs-parser-test.js
index c4a97f4618..b5ee7b71c7 100644
--- a/tests/lib/rules-preprocessor/hbs-parser-test.js
+++ b/tests/lib/rules-preprocessor/hbs-parser-test.js
@@ -160,6 +160,21 @@ describe('supports template-lint-disable directive in hbs files', () => {
     expect(resultErrors).toHaveLength(0);
   });
 
+  it('eslint-disable-next-line works in hbs templates', async () => {
+    const eslint = initHbsESLint();
+    const code = `<div>
+  {{! eslint-disable-next-line ember/template-no-bare-strings }}
+  <span>Hello world</span>
+  <span>Still bare</span>
+</div>`;
+    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    // "Hello world" on the next line is suppressed, "Still bare" still errors
+    expect(resultErrors).toHaveLength(1);
+    expect(resultErrors[0].ruleId).toBe('ember/template-no-bare-strings');
+    expect(resultErrors[0].line).toBe(4);
+  });
+
   it('eslint-disable/eslint-enable ranges work in hbs templates', async () => {
     const eslint = initHbsESLint();
     const code = `{{! eslint-disable ember/template-no-bare-strings }}

From 5c433af474eede0f65b53ba9af0a914992217655 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 11 Apr 2026 18:40:58 -0400
Subject: [PATCH 18/19] Add test for eslint-disable/eslint-enable range in gjs
 templates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Verifies that standard ESLint range directives via mustache comments
work correctly in gjs templates — errors inside the disable/enable
range are suppressed, errors after the range still fire.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../rules-preprocessor/gjs-gts-parser-test.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/lib/rules-preprocessor/gjs-gts-parser-test.js b/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
index c363fe31bb..c11edc76b0 100644
--- a/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
+++ b/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
@@ -1030,4 +1030,23 @@ describe('supports template-lint-disable directive', () => {
     const resultErrors = results.flatMap((result) => result.messages);
     expect(resultErrors).toHaveLength(0);
   });
+
+  it('eslint-disable/eslint-enable range works in gjs templates', async () => {
+    const eslint = initESLintWithTemplateLintDisable();
+    const code = `
+    <template>
+      <div>
+        {{! eslint-disable no-undef }}
+        {{test}}
+        {{other}}
+        {{! eslint-enable no-undef }}
+        {{shouldError}}
+      </div>
+    </template>
+    `;
+    const results = await eslint.lintText(code, { filePath: 'my-component.gjs' });
+    const resultErrors = results.flatMap((result) => result.messages);
+    expect(resultErrors).toHaveLength(1);
+    expect(resultErrors[0].message).toBe("'shouldError' is not defined.");
+  });
 });

From d3b8cb6c37d5814ece6fc61ee13349fbd98ef316 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 11 Apr 2026 18:45:06 -0400
Subject: [PATCH 19/19] Fix markdownlint MD032: add blank line before list

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 65081bf8e3..412f91abcc 100644
--- a/README.md
+++ b/README.md
@@ -202,6 +202,7 @@ Hello world
 ```
 
 Rule names can be specified as:
+
 - Template-lint names: `no-bare-strings` (maps to `ember/template-no-bare-strings`)
 - Plugin-qualified names: `template-no-bare-strings` (maps to `ember/template-no-bare-strings`)
 - Full ESLint rule IDs: `ember/template-no-bare-strings`, `no-undef`