Update: block-spacing changed loc for extra (refs #12334) (#13314)

* Update: changed loc for extra (refs #12334) * Chore: linting fixes * Update: loc reporting for missing case * Chore: un-comment valid case * Chore: consistent ordering of datas in errors object
eslint · May 22, 2020 · 25462b2 · 25462b2
1 parent de0aab9
commit 25462b2
Show file tree

Hide file tree

Showing 2 changed files with 481 additions and 45 deletions.
diff --git a/lib/rules/block-spacing.js b/lib/rules/block-spacing.js
@@ -102,9 +102,18 @@ module.exports = {
 
             // Check.
             if (!isValid(openBrace, firstToken)) {
+                let loc = openBrace.loc;
+
+                if (messageId === "extra") {
+                    loc = {
+                        start: openBrace.loc.end,
+                        end: firstToken.loc.start
+                    };
+                }
+
                 context.report({
                     node,
-                    loc: openBrace.loc.start,
+                    loc,
                     messageId,
                     data: {
                         location: "after",
@@ -120,9 +129,17 @@ module.exports = {
                 });
             }
             if (!isValid(lastToken, closeBrace)) {
+                let loc = closeBrace.loc;
+
+                if (messageId === "extra") {
+                    loc = {
+                        start: lastToken.loc.end,
+                        end: closeBrace.loc.start
+                    };
+                }
                 context.report({
                     node,
-                    loc: closeBrace.loc.start,
+                    loc,
                     messageId,
                     data: {
                         location: "before",