Fix: handle optional annotations in type-annotation-spacing (typescri…

…pt-eslint#121)
armanio123 · Jan 18, 2019 · 863baef · 863baef
1 parent 7728cc0
commit 863baef
Show file tree

Hide file tree

Showing 2 changed files with 2,546 additions and 14 deletions.
diff --git a/packages/eslint-plugin-typescript/lib/rules/type-annotation-spacing.js b/packages/eslint-plugin-typescript/lib/rules/type-annotation-spacing.js
@@ -79,38 +79,46 @@ module.exports = {
          */
         function checkTypeAnnotationSpacing(typeAnnotation) {
             const nextToken = typeAnnotation;
-            const punctuatorToken = sourceCode.getTokenBefore(nextToken);
-            const previousToken = sourceCode.getTokenBefore(punctuatorToken);
-            const type = punctuatorToken.value;
+            const punctuatorTokenEnd = sourceCode.getTokenBefore(nextToken);
+            let punctuatorTokenStart = punctuatorTokenEnd;
+            let previousToken = sourceCode.getTokenBefore(punctuatorTokenEnd);
+            let type = punctuatorTokenEnd.value;
 
             if (punctuators.indexOf(type) === -1) {
                 return;
             }
 
-            const previousDelta =
-                punctuatorToken.range[0] - previousToken.range[1];
-            const nextDelta = nextToken.range[0] - punctuatorToken.range[1];
-
             const before =
                 type === ":" ? colonOptions.before : arrowOptions.before;
             const after =
                 type === ":" ? colonOptions.after : arrowOptions.after;
 
+            if (type === ":" && previousToken.value === "?") {
+                // shift the start to the ?
+                type = "?:";
+                punctuatorTokenStart = previousToken;
+                previousToken = sourceCode.getTokenBefore(previousToken);
+            }
+
+            const previousDelta =
+                punctuatorTokenStart.range[0] - previousToken.range[1];
+            const nextDelta = nextToken.range[0] - punctuatorTokenEnd.range[1];
+
             if (after && nextDelta === 0) {
                 context.report({
-                    node: punctuatorToken,
+                    node: punctuatorTokenEnd,
                     message: `Expected a space after the '${type}'`,
                     fix(fixer) {
-                        return fixer.insertTextAfter(punctuatorToken, " ");
+                        return fixer.insertTextAfter(punctuatorTokenEnd, " ");
                     }
                 });
             } else if (!after && nextDelta > 0) {
                 context.report({
-                    node: punctuatorToken,
+                    node: punctuatorTokenEnd,
                     message: `Unexpected space after the '${type}'`,
                     fix(fixer) {
                         return fixer.removeRange([
-                            punctuatorToken.range[1],
+                            punctuatorTokenEnd.range[1],
                             nextToken.range[0]
                         ]);
                     }
@@ -119,20 +127,20 @@ module.exports = {
 
             if (before && previousDelta === 0) {
                 context.report({
-                    node: punctuatorToken,
+                    node: punctuatorTokenStart,
                     message: `Expected a space before the '${type}'`,
                     fix(fixer) {
                         return fixer.insertTextAfter(previousToken, " ");
                     }
                 });
             } else if (!before && previousDelta > 0) {
                 context.report({
-                    node: punctuatorToken,
+                    node: punctuatorTokenStart,
                     message: `Unexpected space before the '${type}'`,
                     fix(fixer) {
                         return fixer.removeRange([
                             previousToken.range[1],
-                            punctuatorToken.range[0]
+                            punctuatorTokenStart.range[0]
                         ]);
                     }
                 });