fixup! feat(valid-expect-in-promise): re-write implementation

Author: G-Rath

src/rules/valid-expect-in-promise.ts

@@ -57,6 +57,27 @@ const reportReturnRequired = (context: RuleContext, node: TSESTree.Node) => {
   });
 };
 
+const findTopOfBodyNode = (
+  node: ThenOrCatchCallExpression,
+): TSESTree.Statement | null => {
+  let { parent } = node;
+
+  while (parent) {
+    if (parent.parent && parent.parent.type === AST_NODE_TYPES.BlockStatement) {
+      if (
+        parent.parent.parent?.parent?.type === AST_NODE_TYPES.CallExpression &&
+        isTestCaseCall(parent.parent.parent?.parent)
+      ) {
+        return parent as TSESTree.Statement;
+      }
+    }
+
+    parent = parent.parent;
+  }
+
+  return null;
+};
+
 const isTestCaseCallWithCallbackArg = (
   node: TSESTree.CallExpression,
 ): boolean => {
@@ -164,24 +185,3 @@ export default createRule<unknown[], MessageIds>({
     };
   },
 });
-
-const findTopOfBodyNode = (
-  node: ThenOrCatchCallExpression,
-): TSESTree.Statement | null => {
-  let { parent } = node;
-
-  while (parent) {
-    if (parent.parent && parent.parent.type === AST_NODE_TYPES.BlockStatement) {
-      if (
-        parent.parent.parent?.parent?.type === AST_NODE_TYPES.CallExpression &&
-        isTestCaseCall(parent.parent.parent?.parent)
-      ) {
-        return parent as TSESTree.Statement;
-      }
-    }
-
-    parent = parent.parent;
-  }
-
-  return null;
-};