fixup!

Author: BridgeAR

doc/api/util.md

@@ -847,7 +847,7 @@ added: v0.3.0
 changes:
   - version:
     - REPLACEME
-    pr-url: https://github.com/nodejs/node/pull/XXXXX
+    pr-url: https://github.com/nodejs/node/pull/59710
     description: The util.inspect.styles.regexp style is now a method that is
                  invoked for coloring the stringified regular expression.
   - version:

lib/internal/util/inspect.js

@@ -518,20 +518,6 @@ inspect.styles.regexp.colors = ['green', 'red', 'yellow', 'cyan', 'magenta'];
 
 const highlightRegExpColors = inspect.styles.regexp.colors.slice();
 
-function findSequence(regexpString, i, start, end, write) {
-  // TODO(BridgeAR): Improve the output by using a different depth for the content.
-  let seq = start;
-  i++;
-  while (i < regexpString.length && regexpString[i] !== end) {
-    seq += regexpString[i++];
-  }
-  if (i < regexpString.length) {
-    seq += end;
-    i++;
-  }
-  return seq;
-}
-
 /**
  * Tokenize and colorize a JavaScript RegExp pattern per ECMAScript grammar.
  * This is a tolerant single-pass highlighter, not a validator.
@@ -562,6 +548,24 @@ function highlightRegExp(regexpString) {
     return acc;
   }, []);
 
+  function writeGroup(start, end, decreaseDepth = 1) {
+    depth -= decreaseDepth;
+    write(start);
+    let seq = '';
+    i++;
+    while (i < regexpString.length && regexpString[i] !== end) {
+      seq += regexpString[i++];
+    }
+    depth++;
+    write(seq);
+    depth--;
+    if (i < regexpString.length) {
+      write(end);
+      i++;
+    }
+    depth += decreaseDepth;
+  }
+
   const write = (str) => {
     const idx = depth % palette.length;
     const color = palette[idx];
@@ -584,10 +588,13 @@ function highlightRegExp(regexpString) {
         i++;
         if (i < regexpString.length) {
           seq += regexpString[i++];
-          if (i < regexpString.length && seq[1] === 'u' && regexpString[i] === '{') {
-            const str = findSequence(regexpString, i, '{', '}');
-            seq += str;
-            i += str.length;
+          const next = seq[1];
+          if (next === 'u' && regexpString[i] === '{') {
+            writeGroup(`${seq}{`, '}', 0);
+            continue;
+          } else if ((next === 'p' || next === 'P') && regexpString[i] === '{') {
+            writeGroup(`${seq}{`, '}', 0);
+            continue;
           } else if (seq[1] === 'x') {
             seq += regexpString.slice(i, i + 2);
             i += 2;
@@ -634,8 +641,8 @@ function highlightRegExp(regexpString) {
           if (a === '<' && (b === '=' || b === '!')) {
             depth--;
             write('?<');
-            depth++;
             write(b);
+            depth++;
             i += 2;
           } else if (a === '<') {
             // Named capture: write '?<name>' as a single colored token
@@ -677,9 +684,8 @@ function highlightRegExp(regexpString) {
         const next = seq[1];
         if (i < regexpString.length) {
           if (next === 'u' && regexpString[i] === '{') {
-            const str = findSequence(regexpString, i, '{', '}');
-            seq += str;
-            i += str.length;
+            writeGroup(`${seq}{`, '}', 0);
+            continue;
           } else if (next === 'x') {
             seq += regexpString.slice(i, i + 2);
             i += 2;
@@ -688,13 +694,11 @@ function highlightRegExp(regexpString) {
               seq += regexpString[i++];
             }
           } else if (next === 'k' && regexpString[i] === '<') {
-            const str = findSequence(regexpString, i, '<', '>');
-            seq += str;
-            i += str.length;
+            writeGroup(`${seq}<`, '>');
+            continue;
           } else if ((next === 'p' || next === 'P') && regexpString[i] === '{') {
-            const str = findSequence(regexpString, i, '{', '}');
-            seq += str;
-            i += str.length;
+            writeGroup(`${seq}{`, '}', 0);
+            continue;
           }
         }
       }