Address PR Feedback

Author: NullVoxPopuli

lib/rules/template-attribute-indentation.js

@@ -132,6 +132,8 @@ module.exports = {
         "Incorrect indentation of close bracket '>' for the element '<{{tagName}}>' beginning at L{{actualLine}}:C{{actualColumn}}. Expected '<{{tagName}}>' to be at L{{expectedLine}}:C{{expectedColumn}}.",
       incorrectBlockParamIndentation:
         "Incorrect indentation of block params '{{blockParamStatement}}' beginning at L{{actualLine}}:C{{actualColumn}}. Expecting the block params to be at L{{expectedLine}}:C{{expectedColumn}}.",
+      incorrectClosingTag:
+        "Incorrect indentation of close tag '</{{tagName}}>' for element '<{{tagName}}>' beginning at L{{actualLine}}:C{{actualColumn}}. Expected '</{{tagName}}>' to be at L{{expectedLine}}:C{{expectedColumn}}.",
     },
     originallyFrom: {
       name: 'ember-template-lint',
@@ -459,6 +461,29 @@ module.exports = {
       }
     }
 
+    function validateClosingTag(node) {
+      // `</tag>` is `2 + tag.length + 1` chars: `</` + tag + `>`
+      const actualColumnStartLocation = 3 + node.tag.length;
+      const actualColumn = node.loc.end.column - actualColumnStartLocation;
+      const expectedColumn = node.loc.start.column;
+
+      if (actualColumn !== expectedColumn) {
+        const actualLine = node.loc.end.line;
+        context.report({
+          node,
+          messageId: 'incorrectClosingTag',
+          loc: { line: actualLine, column: actualColumn },
+          data: {
+            tagName: node.tag,
+            actualLine,
+            actualColumn,
+            expectedLine: actualLine,
+            expectedColumn,
+          },
+        });
+      }
+    }
+
     function validateNonBlockForm(node) {
       if (node.params.length > 0 || (node.hash && node.hash.pairs.length > 0)) {
         const nextLocation = validateParams(node);
@@ -501,6 +526,10 @@ module.exports = {
               const expectedCloseBraceLocation = validateParams(node);
               validateCloseBrace(node, expectedCloseBraceLocation);
             }
+
+            if (node.children.length > 0) {
+              validateClosingTag(node);
+            }
           }
         }
       },

tests/lib/rules/template-attribute-indentation.js

@@ -990,3 +990,49 @@ gjsRuleTester.run('template-attribute-indentation', rule, {
     },
   ],
 });
+
+// ---- Closing tag tests ----
+
+hbsRuleTester.run('template-attribute-indentation (closing tag)', rule, {
+  valid: [
+    // Closing tag correctly aligned with opening tag, after text content
+    {
+      code: ['<div', '  class="foo"', '>', '  content', '</div>'].join('\n'),
+      options: [{ 'process-elements': true }],
+    },
+    // Closing tag correctly aligned, after element child
+    {
+      code: ['<div', '  class="foo"', '>', '  <span>text</span>', '</div>'].join('\n'),
+      options: [{ 'process-elements': true }],
+    },
+    // Short element — canApplyRule returns false (single-line, under maxLength)
+    {
+      code: '<div class="foo">content</div>',
+      options: [{ 'process-elements': true }],
+    },
+  ],
+
+  invalid: [
+    // Closing tag indented too far (wrong column)
+    {
+      code: ['<div', '  class="foo"', '>', '  content', '  </div>'].join('\n'),
+      output: null,
+      options: [{ 'process-elements': true }],
+      errors: [{ messageId: 'incorrectClosingTag' }],
+    },
+    // Closing tag on same line as content (wrong column)
+    {
+      code: ['<MyComponent', '  @arg="val"', '>text</MyComponent>'].join('\n'),
+      output: null,
+      options: [{ 'process-elements': true }],
+      errors: [{ messageId: 'incorrectClosingTag' }],
+    },
+    // Closing tag indented when it should be at column 0
+    {
+      code: ['<MyComponent', '  @arg="val"', '>', '  text', '    </MyComponent>'].join('\n'),
+      output: null,
+      options: [{ 'process-elements': true }],
+      errors: [{ messageId: 'incorrectClosingTag' }],
+    },
+  ],
+});