eslint-plugin-ember-template-lint 0.11.0 → 0.13.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

@@ -1,5 +1,5 @@
 const { runAsWorker } = require('synckit');
-const { generateDifferences } = require('prettier-linter-helpers');
+const { generateDifferences, showInvisibles } = require('prettier-linter-helpers');
 const Document = require('../utils/document');
 
 async function _applyFixes(options, results, columnOffset) {
@@ -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) => {
@@ -65,6 +65,43 @@ async function _applyFixes(options, results, columnOffset) {
         diffs.forEach((d) => {
           d.range = [d.offset - columnOffset, d.offset + (d.deleteText?.length || 0) - columnOffset];
         });
+        if (ruleName === 'prettier') {
+          const { INSERT, DELETE, REPLACE } = generateDifferences;
+          let message;
+          results.length = 0;
+          diffs.forEach((d) => {
+            switch (d.operation) {
+            case INSERT:
+              message = `Insert \`${showInvisibles(
+                d.insertText
+              )}\``;
+              break;
+            case DELETE:
+              message = `Delete \`${showInvisibles(
+                d.deleteText
+              )}\``;
+              break;
+            case REPLACE:
+              message = `Replace \`${showInvisibles(
+                d.deleteText
+              )}\` with \`${showInvisibles(d.insertText)}\``;
+              break;
+            }
+            const { line, character: column } = origDoc.offsetToPosition(d.offset-columnOffset);
+            const { line: endLine, character: endColumn } = origDoc.offsetToPosition(d.offset + (d.deleteText?.length || 0)-columnOffset);
+            results.push({
+              isFixable: true,
+              rule: ruleName,
+              message,
+              line: line + 1,
+              column,
+              endLine: endLine + 1,
+              endColumn,
+              fix: [d]
+            });
+          });
+          return;
+        }
         fixableIssues.filter(r => r.rule === ruleName).forEach((r) => {
           const range = r.range;
           r.fix = diffs.filter(d => diffContained(d, range) || diffIntersect(d, range));

package/lib/rules/lint.js

@@ -56,7 +56,7 @@ function runTemplateLint(node, context) {
 
     lintMessages.forEach((msg) => {
       if (msg.rule === 'no-implicit-this') {
-        if (scopeVars.includes(msg.source)) {
+        if (scopeVars.includes(msg.source.split('.')[0])) {
           return;
         }
       }

package/package.json

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