Update: Improve report location for comma-style (refs #12334) (#13111)

eslint · Mar 31, 2020 · 438dcbb · 438dcbb
1 parent 85b7254
commit 438dcbb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/lib/rules/comma-style.js b/lib/rules/comma-style.js
@@ -146,10 +146,7 @@ module.exports = {
                 // lone comma
                 context.report({
                     node: reportItem,
-                    loc: {
-                        line: commaToken.loc.end.line,
-                        column: commaToken.loc.start.column
-                    },
+                    loc: commaToken.loc,
                     messageId: "unexpectedLineBeforeAndAfterComma",
                     fix: getFixerFunction(styleType, previousItemToken, commaToken, currentItemToken)
                 });
@@ -158,6 +155,7 @@ module.exports = {
 
                 context.report({
                     node: reportItem,
+                    loc: commaToken.loc,
                     messageId: "expectedCommaFirst",
                     fix: getFixerFunction(style, previousItemToken, commaToken, currentItemToken)
                 });
@@ -166,10 +164,7 @@ module.exports = {
 
                 context.report({
                     node: reportItem,
-                    loc: {
-                        line: commaToken.loc.end.line,
-                        column: commaToken.loc.end.column
-                    },
+                    loc: commaToken.loc,
                     messageId: "expectedCommaLast",
                     fix: getFixerFunction(style, previousItemToken, commaToken, currentItemToken)
                 });

diff --git a/tests/lib/rules/comma-style.js b/tests/lib/rules/comma-style.js
@@ -292,7 +292,9 @@ ruleTester.run("comma-style", rule, {
             output: "var foo = 1,\nbar = 2;",
             errors: [{
                 messageId: "expectedCommaLast",
-                type: "VariableDeclarator"
+                type: "VariableDeclarator",
+                column: 1,
+                endColumn: 2
             }]
         },
         {
@@ -473,7 +475,9 @@ ruleTester.run("comma-style", rule, {
             options: ["first"],
             errors: [{
                 messageId: "expectedCommaFirst",
-                type: "VariableDeclarator"
+                type: "VariableDeclarator",
+                column: 12,
+                endColumn: 13
             }]
         },
         {
@@ -590,7 +594,9 @@ ruleTester.run("comma-style", rule, {
             output: "var foo = [\n(bar\n),\nbaz\n];",
             errors: [{
                 messageId: "unexpectedLineBeforeAndAfterComma",
-                type: "Identifier"
+                type: "Identifier",
+                column: 1,
+                endColumn: 2
             }]
         },
         {