Merge pull request #178 from ember-template-lint/fix-deprecated-log

Author: scalvert

lib/rules/prettier.js

@@ -90,8 +90,12 @@ module.exports = class Prettier extends Rule {
 
             this.log({
               message,
+              // As of [email protected], passing line and column whose values match the
+              // reference node's line and column isn't required (it uses the node's line/column).
+              // In order to support older versions (> 3.8.0), we're keeping these properties here.
               line: node.loc && node.loc.start.line,
               column: node.loc && node.loc.start.column,
+              node,
               source,
             });
 
@@ -108,8 +112,12 @@ module.exports = class Prettier extends Rule {
 
             differences.forEach((difference) => {
               let message = "";
-              let { line, column } = getLocFromIndex(
-                difference.offset,
+              // `difference.offset` is the offset from the beginning
+              // of the template, ie. it is the index
+              let { offset, deleteText = "" } = difference;
+              let { line, column } = getLocFromIndex(offset, this.source);
+              let { line: endLine, column: endColumn } = getLocFromIndex(
+                offset + deleteText.length,
                 this.source
               );
 
@@ -131,7 +139,15 @@ module.exports = class Prettier extends Rule {
                   break;
               }
 
-              this.log({ message, line, column, source, isFixable: true });
+              this.log({
+                message,
+                line,
+                column,
+                endLine,
+                endColumn,
+                source,
+                isFixable: true,
+              });
             });
           }
         },

test/unit/rules/lint-prettier-test.js

@@ -34,6 +34,8 @@ test
         message: "Delete `⏎`",
         line: 1,
         column: 34,
+        endLine: 1,
+        endColumn: 35,
         source: "{{#my-component}}{{/my-component}}\n",
         isFixable: true,
       },
@@ -50,6 +52,8 @@ test
         message: 'Replace `⏎·data-bar="lol"⏎·····` with ` data-bar="lol"`',
         line: 1,
         column: 13,
+        endLine: 3,
+        endColumn: 5,
         source: `<div data-foo
  data-bar="lol"
       some-other-thing={{haha-morethaneightychars}}>
@@ -65,6 +69,8 @@ test
         message: "Delete `⏎`",
         line: 1,
         column: 4,
+        endLine: 1,
+        endColumn: 5,
         source: "test\n",
         isFixable: true,
       },
@@ -85,6 +91,8 @@ test
         message: "Insert `··`",
         line: 2,
         column: 1,
+        endLine: 2,
+        endColumn: 1,
         source: "{{#my-component}}\n\ntest\n\n{{/my-component}}",
         isFixable: true,
       },
@@ -103,6 +111,8 @@ test
         message: "Delete `·`",
         line: 2,
         column: 6,
+        endLine: 2,
+        endColumn: 7,
         source:
           '{{#my-component class="class1 class2"}}\n  test \n\n{{/my-component}}',
         isFixable: true,