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) <[email protected]>

Author: NullVoxPopuli

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',
+    },
   ],
 };

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',
+  },
 ];

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

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,
   },
 };

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.
@@ -1019,3 +1020,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');
+  });
+});