Update: key-spacing loc changes for extra space (refs #12334) (#13362)

* Update: key-spacing loc changes for extra (refs #12334) * Chore: Fixed typo in variable name. Co-authored-by: Kai Cataldo <kai@kaicataldo.com> Co-authored-by: Kai Cataldo <kai@kaicataldo.com>
eslint · Jun 11, 2020 · 2a21049 · 2a21049
1 parent 7ce7988
commit 2a21049
Show file tree

Hide file tree

Showing 2 changed files with 153 additions and 55 deletions.
diff --git a/lib/rules/key-spacing.js b/lib/rules/key-spacing.js
@@ -433,11 +433,15 @@ module.exports = {
                 tokenBeforeColon = sourceCode.getTokenBefore(nextColon, { includeComments: true }),
                 tokenAfterColon = sourceCode.getTokenAfter(nextColon, { includeComments: true }),
                 isKeySide = side === "key",
-                locStart = isKeySide ? tokenBeforeColon.loc.start : tokenAfterColon.loc.start,
                 isExtra = diff > 0,
                 diffAbs = Math.abs(diff),
                 spaces = Array(diffAbs + 1).join(" ");
 
+            const locStart = isKeySide ? tokenBeforeColon.loc.end : nextColon.loc.start;
+            const locEnd = isKeySide ? nextColon.loc.start : tokenAfterColon.loc.start;
+            const missingLoc = isKeySide ? tokenBeforeColon.loc : tokenAfterColon.loc;
+            const loc = isExtra ? { start: locStart, end: locEnd } : missingLoc;
+
             if ((
                 diff && mode === "strict" ||
                 diff < 0 && mode === "minimum" ||
@@ -482,7 +486,7 @@ module.exports = {
 
                 context.report({
                     node: property[side],
-                    loc: locStart,
+                    loc,
                     messageId,
                     data: {
                         computed: property.computed ? "computed " : "",