fix: parens in TypeCastExpression

gajus · Sep 19, 2016 · 0e0081f · 0e0081f
1 parent 98839f0
commit 0e0081f
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 8 deletions.
diff --git a/src/rules/spaceAfterTypeColon.js b/src/rules/spaceAfterTypeColon.js
@@ -179,26 +179,28 @@ const objectTypePropertyEvaluator = (context) => {
 };
 
 const typeCastEvaluator = (context) => {
+  const sourceCode = context.getSourceCode();
   const {always} = parseOptions(context);
 
   return (typeCastExpression) => {
-    const spaces = typeCastExpression.typeAnnotation.typeAnnotation.start - typeCastExpression.typeAnnotation.start - 1;
+    const [, firstTokenOfType] = sourceCode.getFirstTokens(typeCastExpression.typeAnnotation, 2);
+    const spaces = firstTokenOfType.start - typeCastExpression.typeAnnotation.start - 1;
 
     if (always && spaces > 1) {
       context.report({
-        fix: spacingFixers.stripSpacesBefore(typeCastExpression.typeAnnotation.typeAnnotation, spaces - 1),
+        fix: spacingFixers.stripSpacesBefore(firstTokenOfType, spaces - 1),
         message: 'There must be 1 space after type cast colon.',
         node: typeCastExpression
       });
     } else if (always && spaces === 0) {
       context.report({
-        fix: spacingFixers.addSpaceBefore(typeCastExpression.typeAnnotation.typeAnnotation),
+        fix: spacingFixers.addSpaceBefore(firstTokenOfType),
         message: 'There must be a space after type cast colon.',
         node: typeCastExpression
       });
     } else if (!always && spaces > 0) {
       context.report({
-        fix: spacingFixers.stripSpacesBefore(typeCastExpression.typeAnnotation.typeAnnotation, spaces),
+        fix: spacingFixers.stripSpacesBefore(firstTokenOfType, spaces),
         message: 'There must be no space after type cast colon.',
         node: typeCastExpression
       });

diff --git a/src/rules/spaceBeforeTypeColon.js b/src/rules/spaceBeforeTypeColon.js
@@ -134,26 +134,28 @@ const objectTypePropertyEvaluator = (context) => {
 };
 
 const typeCastEvaluator = (context) => {
+  const sourceCode = context.getSourceCode();
   const {always} = parseOptions(context);
 
   return (typeCastExpression) => {
-    const spaces = typeCastExpression.typeAnnotation.start - typeCastExpression.expression.end;
+    const lastTokenOfIdentifier = sourceCode.getTokenBefore(typeCastExpression.typeAnnotation);
+    const spaces = typeCastExpression.typeAnnotation.start - lastTokenOfIdentifier.end;
 
     if (always && spaces > 1) {
       context.report({
-        fix: spacingFixers.stripSpacesAfter(typeCastExpression.expression, spaces - 1),
+        fix: spacingFixers.stripSpacesAfter(lastTokenOfIdentifier, spaces - 1),
         message: 'There must be 1 space before type cast colon.',
         node: typeCastExpression
       });
     } else if (always && spaces === 0) {
       context.report({
-        fix: spacingFixers.addSpaceAfter(typeCastExpression.expression),
+        fix: spacingFixers.addSpaceAfter(lastTokenOfIdentifier),
         message: 'There must be a space before type cast colon.',
         node: typeCastExpression
       });
     } else if (!always && spaces > 0) {
       context.report({
-        fix: spacingFixers.stripSpacesAfter(typeCastExpression.expression, spaces),
+        fix: spacingFixers.stripSpacesAfter(lastTokenOfIdentifier, spaces),
         message: 'There must be no space before type cast colon.',
         node: typeCastExpression
       });

diff --git a/tests/rules/assertions/spaceAfterTypeColon.js b/tests/rules/assertions/spaceAfterTypeColon.js
@@ -703,6 +703,24 @@ const TYPE_CAST_EXPRESSIONS = {
       errors: [{message: 'There must be 1 space after type cast colon.'}],
       options: ['always'],
       output: 'const x = ({}: {})'
+    },
+    {
+      code: '((x): (string))',
+      errors: [{message: 'There must be no space after type cast colon.'}],
+      options: ['never'],
+      output: '((x):(string))'
+    },
+    {
+      code: '((x):(string))',
+      errors: [{message: 'There must be a space after type cast colon.'}],
+      options: ['always'],
+      output: '((x): (string))'
+    },
+    {
+      code: '((x):  (string))',
+      errors: [{message: 'There must be 1 space after type cast colon.'}],
+      options: ['always'],
+      output: '((x): (string))'
     }
   ],
   valid: [
@@ -713,6 +731,14 @@ const TYPE_CAST_EXPRESSIONS = {
     {
       code: 'const x = ({}: {})',
       options: ['always']
+    },
+    {
+      code: '((x):(string))',
+      options: ['never']
+    },
+    {
+      code: '((x): (string))',
+      options: ['always']
     }
   ]
 };

diff --git a/tests/rules/assertions/spaceBeforeTypeColon.js b/tests/rules/assertions/spaceBeforeTypeColon.js
@@ -489,6 +489,24 @@ const TYPE_CAST_EXPRESSIONS = {
       errors: [{message: 'There must be 1 space before type cast colon.'}],
       options: ['always'],
       output: 'const x = ({} :{})'
+    },
+    {
+      code: '((x) : string)',
+      errors: [{message: 'There must be no space before type cast colon.'}],
+      options: ['never'],
+      output: '((x): string)'
+    },
+    {
+      code: '((x): string)',
+      errors: [{message: 'There must be a space before type cast colon.'}],
+      options: ['always'],
+      output: '((x) : string)'
+    },
+    {
+      code: '((x)  : string)',
+      errors: [{message: 'There must be 1 space before type cast colon.'}],
+      options: ['always'],
+      output: '((x) : string)'
     }
   ],
   valid: [
@@ -499,6 +517,14 @@ const TYPE_CAST_EXPRESSIONS = {
     {
       code: 'const x = ({} :{})',
       options: ['always']
+    },
+    {
+      code: '((x): string)',
+      options: ['never']
+    },
+    {
+      code: '((x) : string)',
+      options: ['always']
     }
   ]
 };