Fix: Report columns for eol-last correctly (fixes #7136) (#7149)

eslint · Sep 18, 2016 · 6148d85 · 6148d85
1 parent e016384
commit 6148d85
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/lib/rules/eol-last.js b/lib/rules/eol-last.js
@@ -39,7 +39,7 @@ module.exports = {
                 const sourceCode = context.getSourceCode(),
                     src = sourceCode.getText(),
                     location = {
-                        column: 1,
+                        column: lodash.last(sourceCode.lines).length,
                         line: sourceCode.lines.length
                     },
                     LF = "\n",

diff --git a/tests/lib/cli-engine.js b/tests/lib/cli-engine.js
@@ -113,9 +113,9 @@ describe("CLIEngine", function() {
             assert.equal(report.results[0].messages.length, 5);
             assert.equal(report.results[0].messages[0].ruleId, "strict");
             assert.equal(report.results[0].messages[1].ruleId, "no-var");
-            assert.equal(report.results[0].messages[2].ruleId, "eol-last");
-            assert.equal(report.results[0].messages[3].ruleId, "no-unused-vars");
-            assert.equal(report.results[0].messages[4].ruleId, "quotes");
+            assert.equal(report.results[0].messages[2].ruleId, "no-unused-vars");
+            assert.equal(report.results[0].messages[3].ruleId, "quotes");
+            assert.equal(report.results[0].messages[4].ruleId, "eol-last");
         });
 
         it("should report one message when using specific config file", function() {
@@ -2401,11 +2401,11 @@ describe("CLIEngine", function() {
             assert.equal(errorResults[0].messages[0].severity, 2);
             assert.equal(errorResults[0].messages[1].ruleId, "no-var");
             assert.equal(errorResults[0].messages[1].severity, 2);
-            assert.equal(errorResults[0].messages[2].ruleId, "eol-last");
+            assert.equal(errorResults[0].messages[2].ruleId, "no-unused-vars");
             assert.equal(errorResults[0].messages[2].severity, 2);
-            assert.equal(errorResults[0].messages[3].ruleId, "no-unused-vars");
+            assert.equal(errorResults[0].messages[3].ruleId, "quotes");
             assert.equal(errorResults[0].messages[3].severity, 2);
-            assert.equal(errorResults[0].messages[4].ruleId, "quotes");
+            assert.equal(errorResults[0].messages[4].ruleId, "eol-last");
             assert.equal(errorResults[0].messages[4].severity, 2);
         });
 

diff --git a/tests/lib/eslint.js b/tests/lib/eslint.js
@@ -3126,7 +3126,7 @@ describe("eslint", function() {
             assert.equal(messages[0].line, 1);
             assert.equal(messages[0].column, 6);
             assert.equal(messages[1].line, 2);
-            assert.equal(messages[1].column, 2);
+            assert.equal(messages[1].column, 18);
             assert.equal(messages[2].line, 2);
             assert.equal(messages[2].column, 18);
         });