Rename retryTimedOutBoundary to resolveRetryThenable

This doesn't just retry. It assumes that resolving a thenable means that
it is ok to clear it from the thenable cache.

We'll reuse the retryTimedOutBoundary logic separately.

Author: sebmarkbage

packages/react-reconciler/src/ReactFiberBeginWork.js

@@ -84,7 +84,10 @@ import {
 import {
   shouldSetTextContent,
   shouldDeprioritizeSubtree,
+  isSuspenseInstancePending,
+  isSuspenseInstanceFallback,
 } from './ReactFiberHostConfig';
+import type {SuspenseInstance} from './ReactFiberHostConfig';
 import {pushHostContext, pushHostContainer} from './ReactFiberHostContext';
 import {
   pushProvider,
@@ -107,8 +110,6 @@ import {
 import {
   enterHydrationState,
   reenterHydrationStateFromDehydratedSuspenseInstance,
-  isDehydratedSuspenseComponentPending,
-  isDehydratedSuspenseComponentFallback,
   resetHydrationState,
   tryToClaimNextHydratableInstance,
 } from './ReactFiberHydrationContext';
@@ -1648,10 +1649,11 @@ function updateDehydratedSuspenseComponent(
   // We use childExpirationTime to indicate that a child might depend on context, so if
   // any context has changed, we need to treat is as if the input might have changed.
   const hasContextChanged = current.childExpirationTime >= renderExpirationTime;
+  const suspenseInstance = (current.stateNode: SuspenseInstance);
   if (
     didReceiveUpdate ||
     hasContextChanged ||
-    isDehydratedSuspenseComponentFallback(current)
+    isSuspenseInstanceFallback(suspenseInstance)
   ) {
     // This boundary has changed since the first render. This means that we are now unable to
     // hydrate it. We might still be able to hydrate it using an earlier expiration time but
@@ -1693,7 +1695,7 @@ function updateDehydratedSuspenseComponent(
     workInProgress.effectTag |= Placement;
     // Retry as a real Suspense component.
     return updateSuspenseComponent(null, workInProgress, renderExpirationTime);
-  } else if (isDehydratedSuspenseComponentPending(current)) {
+  } else if (isSuspenseInstancePending(suspenseInstance)) {
     // This component is still pending more data from the server, so we can't hydrate its
     // content. We treat it as if this component suspended itself. It might seem as if
     // we could just try to render it client-side instead. However, this will perform a

packages/react-reconciler/src/ReactFiberCommitWork.js

@@ -94,7 +94,7 @@ import {
 import {
   captureCommitPhaseError,
   requestCurrentTime,
-  retryTimedOutBoundary,
+  resolveRetryThenable,
 } from './ReactFiberScheduler';
 import {
   NoEffect as NoHookEffect,
@@ -1232,7 +1232,7 @@ function commitWork(current: Fiber | null, finishedWork: Fiber): void {
         }
         thenables.forEach(thenable => {
           // Memoize using the boundary fiber to prevent redundant listeners.
-          let retry = retryTimedOutBoundary.bind(null, finishedWork, thenable);
+          let retry = resolveRetryThenable.bind(null, finishedWork, thenable);
           if (enableSchedulerTracing) {
             retry = Schedule_tracing_wrap(retry);
           }

packages/react-reconciler/src/ReactFiberHydrationContext.js

@@ -34,8 +34,6 @@ import {
   canHydrateInstance,
   canHydrateTextInstance,
   canHydrateSuspenseInstance,
-  isSuspenseInstancePending,
-  isSuspenseInstanceFallback,
   getNextHydratableSibling,
   getFirstHydratableChild,
   hydrateInstance,
@@ -86,14 +84,6 @@ function reenterHydrationStateFromDehydratedSuspenseInstance(
   return true;
 }
 
-function isDehydratedSuspenseComponentPending(fiber: Fiber) {
-  return isSuspenseInstancePending((fiber.stateNode: SuspenseInstance));
-}
-
-function isDehydratedSuspenseComponentFallback(fiber: Fiber) {
-  return isSuspenseInstanceFallback((fiber.stateNode: SuspenseInstance));
-}
-
 function deleteHydratableInstance(
   returnFiber: Fiber,
   instance: HydratableInstance,
@@ -444,8 +434,6 @@ function resetHydrationState(): void {
 export {
   enterHydrationState,
   reenterHydrationStateFromDehydratedSuspenseInstance,
-  isDehydratedSuspenseComponentPending,
-  isDehydratedSuspenseComponentFallback,
   resetHydrationState,
   tryToClaimNextHydratableInstance,
   prepareToHydrateHostInstance,

packages/react-reconciler/src/ReactFiberScheduler.js

@@ -1698,7 +1698,20 @@ function pingSuspendedRoot(
   }
 }
 
-function retryTimedOutBoundary(boundaryFiber: Fiber, thenable: Thenable) {
+function retryTimedOutBoundary(boundaryFiber: Fiber) {
+  const currentTime = requestCurrentTime();
+  const retryTime = computeExpirationForFiber(currentTime, boundaryFiber);
+  const root = scheduleWorkToRoot(boundaryFiber, retryTime);
+  if (root !== null) {
+    markPendingPriorityLevel(root, retryTime);
+    const rootExpirationTime = root.expirationTime;
+    if (rootExpirationTime !== NoWork) {
+      requestWork(root, rootExpirationTime);
+    }
+  }
+}
+
+function resolveRetryThenable(boundaryFiber: Fiber, thenable: Thenable) {
   // The boundary fiber (a Suspense component) previously timed out and was
   // rendered in its fallback state. One of the promises that suspended it has
   // resolved, which means at least part of the tree was likely unblocked. Try
@@ -1729,16 +1742,7 @@ function retryTimedOutBoundary(boundaryFiber: Fiber, thenable: Thenable) {
     retryCache.delete(thenable);
   }
 
-  const currentTime = requestCurrentTime();
-  const retryTime = computeExpirationForFiber(currentTime, boundaryFiber);
-  const root = scheduleWorkToRoot(boundaryFiber, retryTime);
-  if (root !== null) {
-    markPendingPriorityLevel(root, retryTime);
-    const rootExpirationTime = root.expirationTime;
-    if (rootExpirationTime !== NoWork) {
-      requestWork(root, rootExpirationTime);
-    }
-  }
+  retryTimedOutBoundary(boundaryFiber);
 }
 
 function scheduleWorkToRoot(fiber: Fiber, expirationTime): FiberRoot | null {
@@ -2588,7 +2592,7 @@ export {
   renderDidSuspend,
   renderDidError,
   pingSuspendedRoot,
-  retryTimedOutBoundary,
+  resolveRetryThenable,
   markLegacyErrorBoundaryAsFailed,
   isAlreadyFailedLegacyErrorBoundary,
   scheduleWork,

packages/react-reconciler/src/ReactFiberUnwindWork.js

@@ -66,7 +66,7 @@ import {
   markLegacyErrorBoundaryAsFailed,
   isAlreadyFailedLegacyErrorBoundary,
   pingSuspendedRoot,
-  retryTimedOutBoundary,
+  resolveRetryThenable,
 } from './ReactFiberScheduler';
 
 import invariant from 'shared/invariant';
@@ -372,11 +372,7 @@ function throwException(
         // Memoize using the boundary fiber to prevent redundant listeners.
         if (!retryCache.has(thenable)) {
           retryCache.add(thenable);
-          let retry = retryTimedOutBoundary.bind(
-            null,
-            workInProgress,
-            thenable,
-          );
+          let retry = resolveRetryThenable.bind(null, workInProgress, thenable);
           if (enableSchedulerTracing) {
             retry = Schedule_tracing_wrap(retry);
           }