Fix: add end location to reports in object-curly-newline (refs #12334) (

#13460)
eslint · Jul 7, 2020 · 095194c · 095194c
1 parent 10251bb
commit 095194c
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/lib/rules/object-curly-newline.js b/lib/rules/object-curly-newline.js
@@ -224,7 +224,7 @@ module.exports = {
                     context.report({
                         messageId: "expectedLinebreakAfterOpeningBrace",
                         node,
-                        loc: openBrace.loc.start,
+                        loc: openBrace.loc,
                         fix(fixer) {
                             if (hasCommentsFirstToken) {
                                 return null;
@@ -238,7 +238,7 @@ module.exports = {
                     context.report({
                         messageId: "expectedLinebreakBeforeClosingBrace",
                         node,
-                        loc: closeBrace.loc.start,
+                        loc: closeBrace.loc,
                         fix(fixer) {
                             if (hasCommentsLastToken) {
                                 return null;
@@ -260,7 +260,7 @@ module.exports = {
                     context.report({
                         messageId: "unexpectedLinebreakAfterOpeningBrace",
                         node,
-                        loc: openBrace.loc.start,
+                        loc: openBrace.loc,
                         fix(fixer) {
                             if (hasCommentsFirstToken) {
                                 return null;
@@ -280,7 +280,7 @@ module.exports = {
                     context.report({
                         messageId: "unexpectedLinebreakBeforeClosingBrace",
                         node,
-                        loc: closeBrace.loc.start,
+                        loc: closeBrace.loc,
                         fix(fixer) {
                             if (hasCommentsLastToken) {
                                 return null;

diff --git a/tests/lib/rules/object-curly-newline.js b/tests/lib/rules/object-curly-newline.js
@@ -607,8 +607,20 @@ ruleTester.run("object-curly-newline", rule, {
             ].join("\n"),
             options: ["always"],
             errors: [
-                { line: 1, column: 9, messageId: "expectedLinebreakAfterOpeningBrace" },
-                { line: 1, column: 14, messageId: "expectedLinebreakBeforeClosingBrace" }
+                {
+                    line: 1,
+                    column: 9,
+                    endLine: 1,
+                    endColumn: 10,
+                    messageId: "expectedLinebreakAfterOpeningBrace"
+                },
+                {
+                    line: 1,
+                    column: 14,
+                    endLine: 1,
+                    endColumn: 15,
+                    messageId: "expectedLinebreakBeforeClosingBrace"
+                }
             ]
         },
         {
@@ -717,8 +729,20 @@ ruleTester.run("object-curly-newline", rule, {
             ].join("\n"),
             options: ["never"],
             errors: [
-                { line: 1, column: 9, messageId: "unexpectedLinebreakAfterOpeningBrace" },
-                { line: 3, column: 1, messageId: "unexpectedLinebreakBeforeClosingBrace" }
+                {
+                    line: 1,
+                    column: 9,
+                    endLine: 1,
+                    endColumn: 10,
+                    messageId: "unexpectedLinebreakAfterOpeningBrace"
+                },
+                {
+                    line: 3,
+                    column: 1,
+                    endLine: 3,
+                    endColumn: 2,
+                    messageId: "unexpectedLinebreakBeforeClosingBrace"
+                }
             ]
         },
         {