Merge pull request #1994 from patricklx/fix-locations

fix locations for ast after templates

Author: NullVoxPopuli

lib/parsers/gjs-gts-parser.js

@@ -489,20 +489,27 @@ function transformForLint(code) {
    */
   const result = processor.parse(code);
   for (const tplInfo of result.reverse()) {
+    const lineBreaks = [...tplInfo.contents].reduce(
+      (prev, curr) => prev + (DocumentLines.isLineBreak(curr.codePointAt(0)) ? 1 : 0),
+      0
+    );
     if (tplInfo.type === 'class-member') {
       const tplLength = tplInfo.range.end - tplInfo.range.start;
-      const spaces = tplLength - 'static{`'.length - '`}'.length;
-      const total = ' '.repeat(spaces);
+      const spaces = tplLength - 'static{`'.length - '`}'.length - lineBreaks;
+      const total = ' '.repeat(spaces) + '\n'.repeat(lineBreaks);
       const replacementCode = `static{\`${total}\`}`;
       jsCode = replaceRange(jsCode, tplInfo.range.start, tplInfo.range.end, replacementCode);
     } else {
       const tplLength = tplInfo.range.end - tplInfo.range.start;
-      const spaces = tplLength - '`'.length - '`'.length;
-      const total = ' '.repeat(spaces);
+      const spaces = tplLength - '`'.length - '`'.length - lineBreaks;
+      const total = ' '.repeat(spaces) + '\n'.repeat(lineBreaks);
       const replacementCode = `\`${total}\``;
       jsCode = replaceRange(jsCode, tplInfo.range.start, tplInfo.range.end, replacementCode);
     }
   }
+  if (jsCode.length !== code.length) {
+    throw new Error('bad transform');
+  }
   return {
     templateInfos: result,
     output: jsCode,

lib/utils/document.js

@@ -98,3 +98,4 @@ function isLineBreak(ch) {
 }
 
 module.exports = DocumentLines;
+module.exports.isLineBreak = isLineBreak;

tests/lib/rules-preprocessor/gjs-gts-parser-test.js

@@ -159,13 +159,9 @@ const valid = [
     filename: 'my-component.gjs',
     code: `
       const Foo = <template>hi</template>;
-      const Bar = 'x';
+
       <template>
-        <Foo as |Abc Xyz|>
-          <Abc.x />
-          {{Xyz.x}}
-        </Foo>
-        <Bar.x />
+        <Foo />
       </template>
     `,
   },
@@ -727,7 +723,8 @@ describe('multiple tokens in same file', () => {
       severity: 2,
     });
   });
-  it('correctly maps duplicate <template> tokens to the correct lines', async () => {
+
+  it('correctly maps tokens after handlebars', async () => {
     const eslint = initESLint();
     const code = `
     import Component from '@glimmer/component';
@@ -741,7 +738,8 @@ describe('multiple tokens in same file', () => {
         super(...arguments);
       }
 
-      foo = 'bar';
+      foo = bar;
+
       <template>
         <div>
           some totally random, non-meaningful text {{bar}}
@@ -752,11 +750,15 @@ describe('multiple tokens in same file', () => {
     const results = await eslint.lintText(code, { filePath: 'my-component.gjs' });
 
     const resultErrors = results.flatMap((result) => result.messages);
-    expect(resultErrors).toHaveLength(2);
+    expect(resultErrors).toHaveLength(3);
     expect(resultErrors[0].message).toBe("'foo' is not defined.");
     expect(resultErrors[0].line).toBe(5);
 
     expect(resultErrors[1].message).toBe("'bar' is not defined.");
-    expect(resultErrors[1].line).toBe(16);
+    expect(resultErrors[1].endLine).toBe(13);
+    expect(resultErrors[1].line).toBe(13);
+
+    expect(resultErrors[2].message).toBe("'bar' is not defined.");
+    expect(resultErrors[2].line).toBe(17);
   });
 });