Include parentheses

typescript-eslint · Mar 20, 2023 · 631994b · 631994b
1 parent e53dde0
commit 631994b
Show file tree

Hide file tree

Showing 2 changed files with 109 additions and 10 deletions.
diff --git a/packages/eslint-plugin/src/rules/consistent-type-assertions.ts b/packages/eslint-plugin/src/rules/consistent-type-assertions.ts
@@ -84,6 +84,28 @@ export default util.createRule<Options, MessageIds>({
       );
     }
 
+    function getTextWithParentheses(node: TSESTree.Node): string {
+      // Capture parentheses before and after the node
+      let beforeCount = 0;
+      let afterCount = 0;
+
+      if (util.isParenthesized(node, sourceCode)) {
+        const bodyOpeningParen = sourceCode.getTokenBefore(
+          node,
+          util.isOpeningParenToken,
+        )!;
+        const bodyClosingParen = sourceCode.getTokenAfter(
+          node,
+          util.isClosingParenToken,
+        )!;
+
+        beforeCount = node.range[0] - bodyOpeningParen.range[0];
+        afterCount = bodyClosingParen.range[1] - node.range[1];
+      }
+
+      return sourceCode.getText(node, beforeCount, afterCount);
+    }
+
     function reportIncorrectAssertionType(
       node: TSESTree.TSTypeAssertion | TSESTree.TSAsExpression,
     ): void {
@@ -106,11 +128,11 @@ export default util.createRule<Options, MessageIds>({
             ? (fixer): TSESLint.RuleFix[] => [
                 fixer.replaceText(
                   node,
-                  context.getSourceCode().getText(node.expression),
+                  getTextWithParentheses(node.expression),
                 ),
                 fixer.insertTextAfter(
                   node,
-                  ` as ${context.getSourceCode().getText(node.typeAnnotation)}`,
+                  ` as ${getTextWithParentheses(node.typeAnnotation)}`,
                 ),
               ]
             : undefined,

diff --git a/packages/eslint-plugin/tests/rules/consistent-type-assertions.test.ts b/packages/eslint-plugin/tests/rules/consistent-type-assertions.test.ts
@@ -9,7 +9,12 @@ const ANGLE_BRACKET_TESTS_EXCEPT_CONST_CASE = `
 const x = <Foo>new Generic<int>();
 const x = <A>b;
 const x = <readonly number[]>[1];
-const x = <a | b>('string');`;
+const x = <a | b>('string');
+const x = <A>!'string';
+const x = <A>a + b;
+const x = <(A)>a + (b);
+const x = <Foo>(new Generic<string>());
+const x = (new (<Foo>Generic<string>)());`;
 
 const ANGLE_BRACKET_TESTS = `${ANGLE_BRACKET_TESTS_EXCEPT_CONST_CASE}
 const x = <const>{ key: 'value' };
@@ -19,7 +24,12 @@ const AS_TESTS_EXCEPT_CONST_CASE = `
 const x = new Generic<int>() as Foo;
 const x = b as A;
 const x = [1] as readonly number[];
-const x = ('string') as a | b;`;
+const x = ('string') as a | b;
+const x = !'string' as A;
+const x = a as A + b;
+const x = a as (A) + (b);
+const x = (new Generic<string>()) as Foo;
+const x = (new (Generic<string> as Foo)());`;
 
 const AS_TESTS = `${AS_TESTS_EXCEPT_CONST_CASE}
 const x = { key: 'value' } as const;
@@ -164,6 +174,26 @@ ruleTester.run('consistent-type-assertions', rule, {
           messageId: 'angle-bracket',
           line: 6,
         },
+        {
+          messageId: 'angle-bracket',
+          line: 7,
+        },
+        {
+          messageId: 'angle-bracket',
+          line: 8,
+        },
+        {
+          messageId: 'angle-bracket',
+          line: 9,
+        },
+        {
+          messageId: 'angle-bracket',
+          line: 10,
+        },
+        {
+          messageId: 'angle-bracket',
+          line: 11,
+        },
       ],
     }),
     ...batchedSingleLineTests({
@@ -194,13 +224,28 @@ ruleTester.run('consistent-type-assertions', rule, {
           messageId: 'as',
           line: 6,
         },
+        {
+          messageId: 'as',
+          line: 7,
+        },
+        {
+          messageId: 'as',
+          line: 8,
+        },
+        {
+          messageId: 'as',
+          line: 9,
+        },
+        {
+          messageId: 'as',
+          line: 10,
+        },
+        {
+          messageId: 'as',
+          line: 11,
+        },
       ],
-      output: `
-const x = new Generic<int>() as Foo;
-const x = b as A;
-const x = [1] as readonly number[];
-const x = 'string' as a | b;
-const x = { key: 'value' } as const;`,
+      output: AS_TESTS,
     }),
     ...batchedSingleLineTests({
       code: AS_TESTS_EXCEPT_CONST_CASE,
@@ -230,6 +275,22 @@ const x = { key: 'value' } as const;`,
           messageId: 'never',
           line: 6,
         },
+        {
+          messageId: 'never',
+          line: 7,
+        },
+        {
+          messageId: 'never',
+          line: 8,
+        },
+        {
+          messageId: 'never',
+          line: 9,
+        },
+        {
+          messageId: 'never',
+          line: 10,
+        },
       ],
     }),
     ...batchedSingleLineTests({
@@ -260,6 +321,22 @@ const x = { key: 'value' } as const;`,
           messageId: 'never',
           line: 6,
         },
+        {
+          messageId: 'never',
+          line: 7,
+        },
+        {
+          messageId: 'never',
+          line: 8,
+        },
+        {
+          messageId: 'never',
+          line: 9,
+        },
+        {
+          messageId: 'never',
+          line: 10,
+        },
       ],
     }),
     ...batchedSingleLineTests({