Change formatMessage parameter to getStack

Gives us flexibility in the future to deal with the stack and the
message separately.

Author: acdlite

src/isomorphic/classic/types/checkPropTypes.js

@@ -26,10 +26,10 @@ var loggedTypeFailures = {};
  * @param {object} values Runtime values that need to be type-checked
  * @param {string} location e.g. "prop", "context", "child context"
  * @param {string} componentName Name of the component for error messages.
- * @param {?Function} formatMessage Function that transforms the error message, to add additional info.
+ * @param {?Function} getStack Returns the component stack.
  * @private
  */
-function checkPropTypes(typeSpecs, values, location, componentName, formatMessage) {
+function checkPropTypes(typeSpecs, values, location, componentName, getStack) {
   for (var typeSpecName in typeSpecs) {
     if (typeSpecs.hasOwnProperty(typeSpecName)) {
       var error;
@@ -68,13 +68,14 @@ function checkPropTypes(typeSpecs, values, location, componentName, formatMessag
         // same error.
         loggedTypeFailures[error.message] = true;
 
-        var message = formatMessage ? formatMessage(error.message) : error.message;
+        var stack = getStack ? getStack() : '';
 
         warning(
           false,
-          'Failed %s type: %s',
+          'Failed %s type: %s%s',
           location,
-          message,
+          error.message,
+          stack,
         );
       }
     }

src/shared/types/checkReactTypeSpec.js

@@ -38,33 +38,32 @@ function checkReactTypeSpec(
   // only during reconciliation (begin and complete phase).
   workInProgressOrDebugID
 ) {
-  function formatMessage(message) {
+  function getStack() {
+    let stack = '';
     if (__DEV__) {
-      let componentStackInfo = '';
       if (!ReactComponentTreeHook) {
         ReactComponentTreeHook = require('ReactComponentTreeHook');
       }
       if (workInProgressOrDebugID != null) {
         if (typeof workInProgressOrDebugID === 'number') {
           // DebugID from Stack.
           const debugID = workInProgressOrDebugID;
-          componentStackInfo = ReactComponentTreeHook.getStackAddendumByID(debugID);
+          stack = ReactComponentTreeHook.getStackAddendumByID(debugID);
         } else if (typeof workInProgressOrDebugID.tag === 'number') {
           // This is a Fiber.
           // The stack will only be correct if this is a work in progress
           // version and we're calling it during reconciliation.
           const workInProgress = workInProgressOrDebugID;
-          componentStackInfo = ReactComponentTreeHook.getStackAddendumByWorkInProgressFiber(workInProgress);
+          stack = ReactComponentTreeHook.getStackAddendumByWorkInProgressFiber(workInProgress);
         }
       } else if (element !== null) {
-        componentStackInfo = ReactComponentTreeHook.getCurrentStackAddendum(element);
+        stack = ReactComponentTreeHook.getCurrentStackAddendum(element);
       }
-      message += componentStackInfo;
     }
-    return message;
+    return stack;
   }
 
-  checkPropTypes(typeSpecs, values, location, componentName, formatMessage);
+  checkPropTypes(typeSpecs, values, location, componentName, getStack);
 }
 
 module.exports = checkReactTypeSpec;