eslint-plugin-ember-template-lint 0.10.0 → 0.12.0

package/README.md

@@ -1,6 +1,6 @@
 # eslint-plugin-hbs-template
 
-Provide linting (via [ember-template-lint](https://github.com/ember-template-lint/ember-template-lint)) for hbs templates files, template string literals and gts,gjs 
+Provide linting (via [ember-template-lint](https://github.com/ember-template-lint/ember-template-lint)) for hbs templates files, template string literals and gts,gjs (also enables eslint to run its other rules in gts/gjs)
 * no extra config file needed
 
 * no need to run extra tool for linting

package/lib/rules/hbs-worker.js

@@ -19,7 +19,7 @@ async function _applyFixes(options, results, columnOffset) {
 
   let template = currentSource;
   if (columnOffset) {
-    template = spaces + template.split('\n').join('\n' + spaces);
+    template = spaces + template.replace(/\n([^\n])/g, '\n' + spaces + '$1');
   }
   const origDoc = new Document(template);
   fixableIssues.forEach((r) => {
@@ -63,7 +63,7 @@ async function _applyFixes(options, results, columnOffset) {
         }
         const diffs = generateDifferences(template, code);
         diffs.forEach((d) => {
-          d.range = [d.offset, d.offset + (d.deleteText?.length || 0)];
+          d.range = [d.offset - columnOffset, d.offset + (d.deleteText?.length || 0) - columnOffset];
         });
         fixableIssues.filter(r => r.rule === ruleName).forEach((r) => {
           const range = r.range;

package/lib/rules/lint.js

@@ -27,8 +27,6 @@ function runTemplateLint(node, context) {
     lintMessages.forEach((m) => {
       if (m.fix) {
         m.fix.forEach((fix) => {
-          const d = fix;
-          fix.range = [d.offset, d.offset + (d.deleteText?.length || 0)];
           const start = originalDocument.offsetToPosition(fix.range[0]);
           const end = originalDocument.offsetToPosition(fix.range[1]);
           fix.range = [
@@ -41,7 +39,7 @@ function runTemplateLint(node, context) {
               character: end.character
             })
           ];
-          fix.range = fix.range.map(x => offset + x - columnOffset);
+          fix.range = fix.range.map(x => offset + x);
         });
       }
       m.range = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-ember-template-lint",
-  "version": "0.10.0",
+  "version": "0.12.0",
   "description": "Provide linting for ember template",
   "keywords": [
     "eslint",