add try catch finally pattern to return statement (#49)

pipopotamasu · Feb 23, 2024 · 4f4b274 · 4f4b274
1 parent dfea636
commit 4f4b274
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/rules/no-implicit-any/return-statement/index.spec.ts b/rules/no-implicit-any/return-statement/index.spec.ts
@@ -99,6 +99,31 @@ ruleTester.run('return-statement', rule, {
         }
       `,
     },
+    {
+      code: `
+        function foo () {
+          try {
+            return doSomethingMightHaveError();
+          } catch {
+            throw new Error('error');
+          } finally {
+            return null;
+          }
+        }
+      `,
+    },
+    {
+      code: `
+        function foo () {
+          try {
+            doSomethingMightHaveError();
+            return null;
+          } catch {
+            return 'error'
+          }
+        }
+      `,
+    },
   ],
   invalid: [
     {

diff --git a/rules/no-implicit-any/return-statement/index.ts b/rules/no-implicit-any/return-statement/index.ts
@@ -56,6 +56,11 @@ function getReturnStatementNodes(nodes: TSESTree.Statement[]) {
           returnStatementNodes.push(getReturnStatementNodes(caseNode.consequent));
         });
         break;
+      case AST_NODE_TYPES.TryStatement:
+        returnStatementNodes.push(getReturnStatementNodes(node.block.body));
+        if (node.handler) returnStatementNodes.push(getReturnStatementNode(node.handler.body));
+        if (node.finalizer) returnStatementNodes.push(getReturnStatementNodes(node.finalizer.body));
+        break;
       case AST_NODE_TYPES.IfStatement:
         returnStatementNodes.push(getReturnStatementNode(node.consequent));
         if (node.alternate) returnStatementNodes.push(getReturnStatementNode(node.alternate));
@@ -91,7 +96,6 @@ export const lintReturnStatement = (
   const functionNode = getFunctionNode(node.parent);
   if (functionNode.body.type !== AST_NODE_TYPES.BlockStatement) return;
   const returnStatementNodes = getReturnStatementNodes(functionNode.body.body);
-
   let shouldReport = true;
 
   for (const returnStatementNode of returnStatementNodes) {