support gts autofix

ember-cli · May 13, 2023 · 0e306d6 · 0e306d6
1 parent 558dab3
commit 0e306d6
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 4 deletions.
diff --git a/lib/preprocessors/glimmer.js b/lib/preprocessors/glimmer.js
@@ -128,6 +128,7 @@ function mapRange(messages, filename) {
     return flattened;
   }
 
+  const originalDoc = new DocumentLines(original);
   const transformedDoc = new DocumentLines(transformed);
 
   const lines = transformed.split('\n');
@@ -193,6 +194,14 @@ function mapRange(messages, filename) {
   });
 
   return filtered.map((message) => {
+    if (message.fix) {
+      const [start, end] = message.fix.range;
+      const startPos = transformedDoc.offsetToPosition(start);
+      const endPos = transformedDoc.offsetToPosition(end);
+      const fix = message.fix;
+      fix.range = [originalDoc.positionToOffset(startPos), originalDoc.positionToOffset(endPos)];
+    }
+
     // 1. handle eslint diagnostics on single lines.
     if (message.line === message.endLine) {
       const originalLine = originalLines[message.line - 1];
@@ -295,4 +304,5 @@ function mapRange(messages, filename) {
 module.exports = {
   preprocess: gjs,
   postprocess: mapRange,
+  supportsAutofix: true,
 };
diff --git a/lib/utils/document.js b/lib/utils/document.js
@@ -1,5 +1,3 @@
-/* istanbul ignore file */
-
 /**
  * @typedef {{ line: number; character: number }} Position
  */
@@ -75,6 +73,7 @@ function computeLineStarts(text) {
   return result;
 }
 
+/* istanbul ignore next */
 /**
  * @param {number} ch
  * @return {boolean}

diff --git a/tests/lib/rules-preprocessor/gjs-gts-processor-test.js b/tests/lib/rules-preprocessor/gjs-gts-processor-test.js
@@ -35,6 +35,7 @@ function initESLint(options) {
       plugins: ['ember'],
       extends: ['plugin:ember/recommended'],
       rules: {
+        quotes: ['error', 'single'],
         semi: ['error', 'always'],
         'object-curly-spacing': ['error', 'always'],
         'lines-between-class-members': 'error',
@@ -173,7 +174,7 @@ const invalid = [
       import Component from '@glimmer/component';
 
       export default class MyComponent extends Component {
-        foo = "bar";
+        foo = 'bar';
         <template>"hi"</template>
       }
     `,
@@ -193,7 +194,7 @@ const invalid = [
       import Component from '@glimmer/component';
 
       export default class MyComponent extends Component {
-        foo = "bar";
+        foo = 'bar';
         <template>"hi"
         </template>
       }
@@ -208,6 +209,36 @@ const invalid = [
       },
     ],
   },
+  {
+    filename: 'my-component.gjs',
+    code: `
+      import Component from "@glimmer/component";
+      export default class MyComponent extends Component {
+        foo = 'bar';
+        <template>"hi"
+        </template>
+      }
+    `,
+    errors: [
+      {
+        message: 'Strings must use singlequote.',
+        line: 2,
+        endLine: 2,
+        endColumn: 49,
+        column: 29,
+        fix: {
+          range: [29, 49],
+        },
+      },
+      {
+        message: 'Expected blank line between class members.',
+        line: 5,
+        endLine: 6,
+        column: 9,
+        endColumn: 20,
+      },
+    ],
+  },
 ];
 
 describe('template-vars', () => {