fix regex

lunaruan · lunaruan · commit 6ed1043bc9e2 · 2022-05-03T16:58:48.000-04:00
diff --git a/packages/react-devtools-shared/src/backend/utils.js b/packages/react-devtools-shared/src/backend/utils.js
@@ -188,7 +188,7 @@ export function formatWithStyles(
   }
 
   // Matches any of %(o|O|d|i|s|f), but not %%(o|O|d|i|s|f)
-  const REGEXP = /([^%]|^)(%([oOdisf]))/g;
+  const REGEXP = /(?<!%)((%%)*)(%([oOdisf]))/g;
   if (inputArgs[0].match(REGEXP)) {
     return [`%c${inputArgs[0]}`, style, ...inputArgs.slice(1)];
   } else {
diff --git a/packages/react-devtools-shared/src/hook.js b/packages/react-devtools-shared/src/hook.js
@@ -189,7 +189,7 @@ export function installHook(target: any): DevToolsHook | null {
     }
 
     // Matches any of %(o|O|d|i|s|f), but not %%(o|O|d|i|s|f)
-    const REGEXP = /([^%]|^)(%([oOdisf]))/g;
+    const REGEXP = /(?<!%)((%%)*)(%([oOdisf]))/g;
     if (inputArgs[0].match(REGEXP)) {
       return [`%c${inputArgs[0]}`, style, ...inputArgs.slice(1)];
     } else {

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ export function formatWithStyles(`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`// Matches any of %(o\|O\|d\|i\|s\|f), but not %%(o\|O\|d\|i\|s\|f)`
`191`		`- const REGEXP = /([^%]\|^)(%([oOdisf]))/g;`
	`191`	`+ const REGEXP = /(?<!%)((%%)*)(%([oOdisf]))/g;`
`192`	`192`	`if (inputArgs[0].match(REGEXP)) {`
`193`	`193`	return [`%c${inputArgs[0]}`, style, ...inputArgs.slice(1)];
`194`	`194`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ export function installHook(target: any): DevToolsHook \| null {`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`// Matches any of %(o\|O\|d\|i\|s\|f), but not %%(o\|O\|d\|i\|s\|f)`
`192`		`- const REGEXP = /([^%]\|^)(%([oOdisf]))/g;`
	`192`	`+ const REGEXP = /(?<!%)((%%)*)(%([oOdisf]))/g;`
`193`	`193`	`if (inputArgs[0].match(REGEXP)) {`
`194`	`194`	return [`%c${inputArgs[0]}`, style, ...inputArgs.slice(1)];
`195`	`195`	`} else {`