From 726ba80298dad46b331aca1bcb71ca9b2004ed91 Mon Sep 17 00:00:00 2001
From: Billy Janitsch <billy@kensho.com>
Date: Fri, 15 Apr 2022 11:35:35 -0400
Subject: [PATCH] Synchronize implementations of second render logging (#24381)

Minor followup to #24373. The fix for #24373 (comment) didn't get synchronized to the hook implementation.
---
 packages/react-devtools-shared/src/backend/utils.js | 2 +-
 packages/react-devtools-shared/src/hook.js          | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/react-devtools-shared/src/backend/utils.js b/packages/react-devtools-shared/src/backend/utils.js
index da911cf94458e..f0f78b7f778b5 100644
--- a/packages/react-devtools-shared/src/backend/utils.js
+++ b/packages/react-devtools-shared/src/backend/utils.js
@@ -187,7 +187,7 @@ export function formatWithStyles(
     return inputArgs;
   }
 
-  // Matches any of %(o|O|i|s|f), but not %%(o|O|i|s|f)
+  // Matches any of %(o|O|d|i|s|f), but not %%(o|O|d|i|s|f)
   const REGEXP = /([^%]|^)(%([oOdisf]))/g;
   if (inputArgs[0].match(REGEXP)) {
     return [`%c${inputArgs[0]}`, style, ...inputArgs.slice(1)];
diff --git a/packages/react-devtools-shared/src/hook.js b/packages/react-devtools-shared/src/hook.js
index 1ea54985fab68..ad5b33850b765 100644
--- a/packages/react-devtools-shared/src/hook.js
+++ b/packages/react-devtools-shared/src/hook.js
@@ -180,13 +180,16 @@ export function installHook(target: any): DevToolsHook | null {
       inputArgs === undefined ||
       inputArgs === null ||
       inputArgs.length === 0 ||
-      (typeof inputArgs[0] === 'string' && inputArgs[0].includes('%c')) ||
+      // Matches any of %c but not %%c
+      (typeof inputArgs[0] === 'string' &&
+        inputArgs[0].match(/([^%]|^)(%c)/g)) ||
       style === undefined
     ) {
       return inputArgs;
     }
 
-    const REGEXP = /(%?)(%([oOdisf]))/g;
+    // Matches any of %(o|O|d|i|s|f), but not %%(o|O|d|i|s|f)
+    const REGEXP = /([^%]|^)(%([oOdisf]))/g;
     if (inputArgs[0].match(REGEXP)) {
       return [`%c${inputArgs[0]}`, style, ...inputArgs.slice(1)];
     } else {