Fix incorrect no-trailing-spaces in embedded templates

ember-template-lint · Mar 8, 2023 · 1c84835 · 1c84835
1 parent d829786
commit 1c84835
Show file tree

Hide file tree

Showing 2 changed files with 89 additions and 2 deletions.
diff --git a/lib/rules/no-trailing-spaces.js b/lib/rules/no-trailing-spaces.js
@@ -9,10 +9,13 @@ export default class NoTrailingSpaces extends Rule {
 
         exit(node) {
           let source = this.sourceForNode(node);
+          let lines = source.split('\n');
 
-          for (const [i, line] of source.split('\n').entries()) {
+          for (const [i, line] of lines.entries()) {
             let column = line.length - 1;
-            if (line[column] === ' ') {
+            let isLastLine = i === lines.length - 1;
+
+            if (line[column] === ' ' && (!isLastLine || column > this.columnOffset)) {
               this.log({
                 message: 'line cannot end with space',
                 node,

diff --git a/test/unit/rules/no-trailing-spaces-test.js b/test/unit/rules/no-trailing-spaces-test.js
@@ -11,6 +11,22 @@ generateRuleTests({
     'test\n' + '\n',
     // test the re-entering of yielded content
     '{{#my-component}}\n' + '  test\n' + '{{/my-component}}',
+    {
+      template: [
+        "import { hbs } from 'ember-cli-htmlbars';",
+        '',
+        "test('it renders', async (assert) => {",
+        '  await render(hbs`',
+        '    <div class="parent">',
+        '      <div class="child"></div>',
+        '    </div>',
+        '  `);',
+        ');',
+      ].join('\n'),
+      meta: {
+        filePath: 'layout.js',
+      },
+    },
   ],
 
   bad: [
@@ -100,5 +116,73 @@ generateRuleTests({
         `);
       },
     },
+    {
+      template: [
+        "import { hbs } from 'ember-cli-htmlbars';",
+        '',
+        "test('it renders', async (assert) => {",
+        '  await render(hbs`  ',
+        '    <div class="parent">',
+        '      <div class="child"></div>',
+        '    </div>',
+        '  `);',
+        ');',
+      ].join('\n'),
+      meta: {
+        filePath: 'layout.js',
+      },
+
+      verifyResults(results) {
+        expect(results).toMatchInlineSnapshot(`
+          [
+            {
+              "column": 20,
+              "endColumn": 21,
+              "endLine": 8,
+              "filePath": "layout.js",
+              "line": 4,
+              "message": "line cannot end with space",
+              "rule": "no-trailing-spaces",
+              "severity": 2,
+              "source": "  ",
+            },
+          ]
+        `);
+      },
+    },
+    {
+      template: [
+        "import { hbs } from 'ember-cli-htmlbars';",
+        '',
+        "test('it renders', async (assert) => {",
+        '  await render(hbs`',
+        '    <div></div>',
+        '  ',
+        '    <div></div>',
+        '  `);',
+        ');',
+      ].join('\n'),
+      meta: {
+        filePath: 'layout.js',
+      },
+
+      verifyResults(results) {
+        expect(results).toMatchInlineSnapshot(`
+          [
+            {
+              "column": 1,
+              "endColumn": 2,
+              "endLine": 8,
+              "filePath": "layout.js",
+              "line": 6,
+              "message": "line cannot end with space",
+              "rule": "no-trailing-spaces",
+              "severity": 2,
+              "source": "  ",
+            },
+          ]
+        `);
+      },
+    },
   ],
 });