Rename SSR warning variables to be more descriptive what they stand for

Author: sompylasar

packages/react-dom/src/client/ReactDOMComponent.js

@@ -72,8 +72,8 @@ let getNodeSignatureForMessage = (node: Node) => '<...>';
 let getTagWithPropsSignature = (tag: string, props: Object) => '<...>';
 let getNodeSurroundingsAndDiff = (
   parentNode: Element | Document,
-  deletedIndex: number,
-  insertedIndex: number,
+  hostInstanceDeletedIndex: number,
+  hostInstanceInsertedIndex: number,
   insertTag: string | null,
   insertProps: Object | null,
   insertText: string | null,
@@ -254,8 +254,8 @@ if (__DEV__) {
 
   getNodeSurroundingsAndDiff = function(
     parentNode: Element | Document,
-    deletedIndex: number,
-    insertedIndex: number,
+    hostInstanceDeletedIndex: number,
+    hostInstanceInsertedIndex: number,
     insertTag: string | null,
     insertProps: Object | null,
     insertText: string | null,
@@ -298,12 +298,12 @@ if (__DEV__) {
         ++hydrationSkippedCount;
         continue;
       }
-      if (i - hydrationSkippedCount === deletedIndex) {
+      if (i - hydrationSkippedCount === hostInstanceDeletedIndex) {
         ret += DIFF_REMOVED + INDENT + getNodeSignatureForDiff(node);
       } else {
         ret += DIFF_UNCHANGED + INDENT + getNodeSignatureForDiff(node);
       }
-      if (i - hydrationSkippedCount === insertedIndex) {
+      if (i - hydrationSkippedCount === hostInstanceInsertedIndex) {
         insert();
       }
     }
@@ -1447,8 +1447,8 @@ export function warnForInsertedHydratedElement(
   parentNode: Element | Document,
   tag: string,
   props: Object,
-  index: number,
-  isReplaced: boolean,
+  hydrationWarningHostInstanceIndex: number,
+  hydrationWarningHostInstanceIsReplaced: boolean,
 ) {
   if (__DEV__) {
     if (didWarnInvalidHydration) {
@@ -1462,8 +1462,10 @@ export function warnForInsertedHydratedElement(
       getNodeSignatureForMessage(parentNode),
       getNodeSurroundingsAndDiff(
         parentNode,
-        isReplaced ? index : -1,
-        index,
+        hydrationWarningHostInstanceIsReplaced
+          ? hydrationWarningHostInstanceIndex
+          : -1,
+        hydrationWarningHostInstanceIndex,
         tag,
         props,
         null,
@@ -1475,8 +1477,8 @@ export function warnForInsertedHydratedElement(
 export function warnForInsertedHydratedText(
   parentNode: Element | Document,
   text: string,
-  index: number,
-  isReplaced: boolean,
+  hydrationWarningHostInstanceIndex: number,
+  hydrationWarningHostInstanceIsReplaced: boolean,
 ) {
   if (__DEV__) {
     if (text === '') {
@@ -1497,8 +1499,10 @@ export function warnForInsertedHydratedText(
       getNodeSignatureForMessage(parentNode),
       getNodeSurroundingsAndDiff(
         parentNode,
-        isReplaced ? index : -1,
-        index,
+        hydrationWarningHostInstanceIsReplaced
+          ? hydrationWarningHostInstanceIndex
+          : -1,
+        hydrationWarningHostInstanceIndex,
         null,
         null,
         text,

packages/react-dom/src/client/ReactDOMHostConfig.js

@@ -558,28 +558,33 @@ export function didNotFindHydratableContainerInstance(
   parentContainer: Container,
   type: string,
   props: Props,
-  index: number,
-  isReplaced: boolean,
+  hydrationWarningHostInstanceIndex: number,
+  hydrationWarningHostInstanceIsReplaced: boolean,
 ) {
   if (__DEV__) {
     warnForInsertedHydratedElement(
       parentContainer,
       type,
       props,
-      index,
-      isReplaced,
+      hydrationWarningHostInstanceIndex,
+      hydrationWarningHostInstanceIsReplaced,
     );
   }
 }
 
 export function didNotFindHydratableContainerTextInstance(
   parentContainer: Container,
   text: string,
-  index: number,
-  isReplaced: boolean,
+  hydrationWarningHostInstanceIndex: number,
+  hydrationWarningHostInstanceIsReplaced: boolean,
 ) {
   if (__DEV__) {
-    warnForInsertedHydratedText(parentContainer, text, index, isReplaced);
+    warnForInsertedHydratedText(
+      parentContainer,
+      text,
+      hydrationWarningHostInstanceIndex,
+      hydrationWarningHostInstanceIsReplaced,
+    );
   }
 }
 
@@ -589,16 +594,16 @@ export function didNotFindHydratableInstance(
   parentInstance: Instance,
   type: string,
   props: Props,
-  index: number,
-  isReplaced: boolean,
+  hydrationWarningHostInstanceIndex: number,
+  hydrationWarningHostInstanceIsReplaced: boolean,
 ) {
   if (__DEV__ && parentProps[SUPPRESS_HYDRATION_WARNING] !== true) {
     warnForInsertedHydratedElement(
       parentInstance,
       type,
       props,
-      index,
-      isReplaced,
+      hydrationWarningHostInstanceIndex,
+      hydrationWarningHostInstanceIsReplaced,
     );
   }
 }
@@ -608,10 +613,15 @@ export function didNotFindHydratableTextInstance(
   parentProps: Props,
   parentInstance: Instance,
   text: string,
-  index: number,
-  isReplaced: boolean,
+  hydrationWarningHostInstanceIndex: number,
+  hydrationWarningHostInstanceIsReplaced: boolean,
 ) {
   if (__DEV__ && parentProps[SUPPRESS_HYDRATION_WARNING] !== true) {
-    warnForInsertedHydratedText(parentInstance, text, index, isReplaced);
+    warnForInsertedHydratedText(
+      parentInstance,
+      text,
+      hydrationWarningHostInstanceIndex,
+      hydrationWarningHostInstanceIsReplaced,
+    );
   }
 }

packages/react-reconciler/src/ReactFiberHydrationContext.js

@@ -102,10 +102,12 @@ function deleteHydratableInstance(
 function insertNonHydratedInstance(
   returnFiber: Fiber,
   fiber: Fiber,
-  isReplaced: boolean,
+  hydrationWarningHostInstanceIsReplaced: boolean,
 ) {
   fiber.effectTag |= Placement;
   if (__DEV__) {
+    // TODO: Find out what `hydrationWarningHostInstanceIndex` should be, `fiber.index` is wrong.
+    const hydrationWarningHostInstanceIndex = fiber.index;
     switch (returnFiber.tag) {
       case HostRoot: {
         const parentContainer = returnFiber.stateNode.containerInfo;
@@ -117,17 +119,17 @@ function insertNonHydratedInstance(
               parentContainer,
               type,
               props,
-              fiber.index,
-              isReplaced,
+              hydrationWarningHostInstanceIndex,
+              hydrationWarningHostInstanceIsReplaced,
             );
             break;
           case HostText:
             const text = fiber.pendingProps;
             didNotFindHydratableContainerTextInstance(
               parentContainer,
               text,
-              fiber.index,
-              isReplaced,
+              hydrationWarningHostInstanceIndex,
+              hydrationWarningHostInstanceIsReplaced,
             );
             break;
         }
@@ -147,8 +149,8 @@ function insertNonHydratedInstance(
               parentInstance,
               type,
               props,
-              fiber.index,
-              isReplaced,
+              hydrationWarningHostInstanceIndex,
+              hydrationWarningHostInstanceIsReplaced,
             );
             break;
           case HostText:
@@ -158,8 +160,8 @@ function insertNonHydratedInstance(
               parentProps,
               parentInstance,
               text,
-              fiber.index,
-              isReplaced,
+              hydrationWarningHostInstanceIndex,
+              hydrationWarningHostInstanceIsReplaced,
             );
             break;
         }