fix

Author: NullVoxPopuli

lib/rules/template-no-html-comments.js

@@ -23,44 +23,34 @@ module.exports = {
   },
 
   create(context) {
+    const glimmerTemplateRanges = [];
+
     return {
-      'Program:exit'(node) {
-        // Check for HTML comments in the source text
+      GlimmerTemplate(node) {
+        glimmerTemplateRanges.push(node.range);
+      },
+
+      'Program:exit'() {
         const sourceCode = context.sourceCode || context.getSourceCode();
-        const text = sourceCode.getText(node);
+        const fullText = sourceCode.getText();
 
-        // Find all HTML comments in template blocks
-        const htmlCommentRegex = /<!--([\S\s]*?)-->/g;
-        let match;
+        for (const comment of sourceCode.getAllComments()) {
+          if (comment.type !== 'Block') {continue;}
 
-        const hasTemplateTag = text.includes('<template>');
+          // getAllComments() returns both HTML (<!-- -->) and Handlebars ({{! }}, {{!-- --}})
+          // comments as Block type — only flag actual HTML comments.
+          if (!fullText.startsWith('<!--', comment.range[0])) {continue;}
 
-        while ((match = htmlCommentRegex.exec(text)) !== null) {
-          let isInTemplate = false;
-
-          if (hasTemplateTag) {
-            const beforeComment = text.slice(0, match.index);
-            const templateStart = beforeComment.lastIndexOf('<template>');
-            const templateEnd = text.indexOf('</template>', match.index);
-            isInTemplate = templateStart !== -1 && templateEnd !== -1;
-          } else {
-            // Standalone .hbs file — entire file is template content
-            isInTemplate = true;
-          }
+          const isInTemplate = glimmerTemplateRanges.some(
+            ([start, end]) => comment.range[0] >= start && comment.range[1] <= end
+          );
 
           if (isInTemplate) {
-            const commentContent = match[1];
-            const startIndex = match.index;
-            const endIndex = match.index + match[0].length;
-
             context.report({
-              loc: {
-                start: sourceCode.getLocFromIndex(startIndex),
-                end: sourceCode.getLocFromIndex(endIndex),
-              },
+              loc: comment.loc,
               messageId: 'noHtmlComments',
               fix(fixer) {
-                return fixer.replaceTextRange([startIndex, endIndex], `{{!${commentContent}}}`);
+                return fixer.replaceTextRange(comment.range, `{{!${comment.value}}}`);
               },
             });
           }

tests/lib/rules/template-no-html-comments.js

@@ -36,6 +36,11 @@ ruleTester.run('template-no-html-comments', rule, {
       output: '<template>{{!comment here}}</template>',
       errors: [{ messageId: 'noHtmlComments' }],
     },
+    {
+      code: '<template><!--\n    line one\n    line two\n  --></template>',
+      output: '<template>{{!\n    line one\n    line two\n  }}</template>',
+      errors: [{ messageId: 'noHtmlComments' }],
+    },
   ],
 });