fix: remove arrow function expression parentheses

u3u · Aug 8, 2023 · 2e12fa4 · 2e12fa4
1 parent 10c6388
commit 2e12fa4
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/src/rules/arrow-return-style.test.ts b/src/rules/arrow-return-style.test.ts
@@ -190,6 +190,18 @@ ruleTester.run(RULE_NAME, arrowReturnStyleRule, {
         );
       `,
     },
+
+    {
+      code: 'const render = () => (<div />)',
+
+      errors: [
+        {
+          messageId: 'useExplicitReturn',
+        },
+      ],
+
+      output: 'const render = () => { return <div /> }',
+    },
   ],
 
   valid: [

diff --git a/src/rules/arrow-return-style.ts b/src/rules/arrow-return-style.ts
@@ -1,4 +1,4 @@
-import { AST_NODE_TYPES } from '@typescript-eslint/utils';
+import { AST_NODE_TYPES, ASTUtils } from '@typescript-eslint/utils';
 import { createRule } from '../utils/create-rule';
 
 type Options = [
@@ -78,13 +78,16 @@ export const arrowReturnStyleRule = createRule<Options, MessageIds>({
           context.report({
             fix: (fixer) => {
               const fixes = [];
-
-              if (isObjectLiteral()) {
-                fixes.push(
-                  fixer.remove(sourceCode.getTokenBefore(arrowBody)!),
-                  fixer.remove(sourceCode.getTokenAfter(arrowBody)!)
-                );
-              }
+              const firstToken = sourceCode.getTokenBefore(arrowBody);
+              const lastToken = sourceCode.getTokenAfter(arrowBody);
+
+              if (
+                firstToken &&
+                lastToken &&
+                ASTUtils.isOpeningParenToken(firstToken) &&
+                ASTUtils.isClosingParenToken(lastToken)
+              )
+                fixes.push(fixer.remove(firstToken), fixer.remove(lastToken));
 
               fixes.push(fixer.replaceText(arrowBody, `{ return ${sourceCode.getText(arrowBody)} }`));