chrome-devtools-frontend 1.0.1545096 → 1.0.1547571

package/front_end/ui/legacy/components/object_ui/ObjectPropertiesSection.ts

@@ -49,6 +49,7 @@ import objectPropertiesSectionStyles from './objectPropertiesSection.css.js';
 import objectValueStyles from './objectValue.css.js';
 import {RemoteObjectPreviewFormatter, renderNodeTitle} from './RemoteObjectPreviewFormatter.js';
 
+const {widgetConfig} = UI.Widget;
 const {ref, repeat, ifDefined, classMap} = Directives;
 const UIStrings = {
   /**
@@ -135,7 +136,6 @@ const UIStrings = {
 } as const;
 const str_ = i18n.i18n.registerUIStrings('ui/legacy/components/object_ui/ObjectPropertiesSection.ts', UIStrings);
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
-const EXPANDABLE_MAX_LENGTH = 50;
 const EXPANDABLE_MAX_DEPTH = 100;
 
 const objectPropertiesSectionMap = new WeakMap<Element, ObjectPropertiesSection>();
@@ -639,13 +639,16 @@ export class ObjectPropertiesSection extends UI.TreeOutline.TreeOutlineInShadow
         const text = JSON.stringify(description);
         const tooLong = description.length > maxRenderableStringLength;
         return html`<span class="value object-value-string" title=${ifDefined(tooLong ? undefined : description)}>${
-            tooLong ? new ExpandableTextPropertyValue(text, EXPANDABLE_MAX_LENGTH).element : text}</span>`;
+            tooLong ? html`<devtools-widget .widgetConfig=${
+                          widgetConfig(ExpandableTextPropertyValue, {text})}></devtools-widget>` :
+                      text}</span>`;
       }
       if (type === 'object' && subtype === 'trustedtype') {
         const text = `${className} '${description}'`;
         const tooLong = text.length > maxRenderableStringLength;
         return html`<span class="value object-value-trustedtype" title=${ifDefined(tooLong ? undefined : text)}>${
-            tooLong ? new ExpandableTextPropertyValue(text, EXPANDABLE_MAX_LENGTH).element :
+            tooLong ? html`<devtools-widget .widgetConfig=${
+                          widgetConfig(ExpandableTextPropertyValue, {text})}></devtools-widget>` :
                       html`${className} <span class=object-value-string title=${description}>${
                           JSON.stringify(description)}</span>`}</span>`;
       }
@@ -663,8 +666,9 @@ export class ObjectPropertiesSection extends UI.TreeOutline.TreeOutlineInShadow
           >${renderNodeTitle(description)}</span>`;
       }
       if (description.length > maxRenderableStringLength) {
-        return html`<span class="value object-value-${subtype || type}" title=${description}>${
-            new ExpandableTextPropertyValue(description, EXPANDABLE_MAX_LENGTH).element}</span>`;
+        return html`<span class="value object-value-${subtype || type}" title=${description}><devtools-widget
+                  .widgetConfig=${
+            widgetConfig(ExpandableTextPropertyValue, {text: description})}></devtools-widget></span>`;
       }
       const hasPreview = value.preview && showPreview;
       return html`<span class="value object-value-${subtype || type}" title=${description}>${
@@ -992,7 +996,6 @@ export class ObjectPropertyTreeElement extends UI.TreeOutline.TreeElement {
   private linkifier: Components.Linkifier.Linkifier|undefined;
   private readonly maxNumPropertiesToShow: number;
   readOnly!: boolean;
-  private prompt!: ObjectPropertyPrompt|undefined;
   #editing = false;
   readonly #view: TreeElementView;
   #completions: string[] = [];
@@ -1107,39 +1110,6 @@ export class ObjectPropertyTreeElement extends UI.TreeOutline.TreeElement {
     treeNode.appendChild(infoElement);
   }
 
-  static createRemoteObjectAccessorPropertySpan(
-      object: SDK.RemoteObject.RemoteObject|null, propertyPath: string[],
-      callback: (arg0: SDK.RemoteObject.CallFunctionResult) => void): HTMLElement {
-    const rootElement = document.createElement('span');
-    const element = rootElement.createChild('span');
-    element.textContent = i18nString(UIStrings.dots);
-    if (!object) {
-      return rootElement;
-    }
-    element.classList.add('object-value-calculate-value-button');
-    UI.Tooltip.Tooltip.install(element, i18nString(UIStrings.invokePropertyGetter));
-    element.addEventListener('click', onInvokeGetterClick, false);
-
-    function onInvokeGetterClick(event: Event): void {
-      event.consume();
-      if (object) {
-        void object.callFunction(invokeGetter, [{value: JSON.stringify(propertyPath)}]).then(callback);
-      }
-    }
-
-    function invokeGetter(this: Object, arrayStr: string): Object {
-      let result: Object = this;
-      const properties = JSON.parse(arrayStr);
-      for (let i = 0, n = properties.length; i < n; ++i) {
-        // @ts-expect-error callFunction expects this to be a generic Object, so while this works we can't be more specific on types.
-        result = result[properties[i]];
-      }
-      return result;
-    }
-
-    return rootElement;
-  }
-
   get nameElement(): Element|undefined {
     return this.#nameElement;
   }
@@ -1623,13 +1593,6 @@ export class ArrayGroupingTreeElement extends UI.TreeOutline.TreeElement {
   static sparseIterationThreshold = 250000;
 }
 
-export class ObjectPropertyPrompt extends UI.TextPrompt.TextPrompt {
-  constructor() {
-    super();
-    this.initialize(TextEditor.JavaScript.completeInContext);
-  }
-}
-
 export class ObjectPropertiesSectionsTreeExpandController {
   static readonly #propertyPathCache = new WeakMap<UI.TreeOutline.TreeElement, string>();
   static readonly #sectionMap = new WeakMap<RootElement, string>();
@@ -1740,89 +1703,102 @@ export class Renderer implements UI.UIUtils.Renderer {
   }
 }
 
-export class ExpandableTextPropertyValue {
-  private readonly text: string;
-  private readonly maxLength: number;
-  private readonly maxDisplayableTextLength: number;
-  readonly #byteCount: number;
-  #expanded = false;
-  #element: DocumentFragment;
-
-  constructor(text: string, maxLength: number) {
-    this.#element = document.createDocumentFragment();
-    this.text = text;
-    this.maxLength = maxLength;
-    this.maxDisplayableTextLength = 10000000;
-    this.#byteCount = Platform.StringUtilities.countWtf8Bytes(text);
-    this.#render();
-  }
-
-  get element(): DocumentFragment {
-    return this.#element;
-  }
-
-  #render(): void {
-    const totalBytesText = i18n.ByteUtilities.bytesToString(this.#byteCount);
-    const onContextMenu = (e: Event): void => {
-      const {target} = e;
-      if (!(target instanceof Element)) {
-        return;
-      }
-      const listItem = target.closest('li');
-      const element = listItem && UI.TreeOutline.TreeElement.getTreeElementBylistItemNode(listItem);
-      if (!(element instanceof ObjectPropertyTreeElement)) {
-        return;
-      }
-      const contextMenu = element.getContextMenu(e);
-      if (this.text.length < this.maxDisplayableTextLength && !this.#expanded) {
-        contextMenu.clipboardSection().appendItem(
-            i18nString(UIStrings.showMoreS, {PH1: totalBytesText}), this.expandText.bind(this),
-            {jslogContext: 'show-more'});
-      }
+interface ExpandableTextViewInput {
+  copyText: () => void;
+  expandText: () => void;
+  expanded: boolean;
+  maxLength: number;
+  byteCount: number;
+  text: string;
+}
+type ExpandableTextView = (input: ExpandableTextViewInput, output: object, target: HTMLElement) => void;
+export const EXPANDABLE_TEXT_DEFAULT_VIEW: ExpandableTextView = (input, output, target) => {
+  const totalBytesText = i18n.ByteUtilities.bytesToString(input.byteCount);
+  const canExpand = input.text.length < ExpandableTextPropertyValue.MAX_DISPLAYABLE_TEXT_LENGTH;
+  const onContextMenu = (e: Event): void => {
+    const {target} = e;
+    if (!(target instanceof Element)) {
+      return;
+    }
+    const listItem = target.closest('li');
+    const element = listItem && UI.TreeOutline.TreeElement.getTreeElementBylistItemNode(listItem);
+    if (!(element instanceof ObjectPropertyTreeElement)) {
+      return;
+    }
+    const contextMenu = element.getContextMenu(e);
+    if (canExpand && !input.expanded) {
       contextMenu.clipboardSection().appendItem(
-          i18nString(UIStrings.copy), this.copyText.bind(this), {jslogContext: 'copy'});
-      void contextMenu.show();
-      e.consume(true);
-    };
+          i18nString(UIStrings.showMoreS, {PH1: totalBytesText}), input.expandText, {jslogContext: 'show-more'});
+    }
+    contextMenu.clipboardSection().appendItem(i18nString(UIStrings.copy), input.copyText, {jslogContext: 'copy'});
+    void contextMenu.show();
+    e.consume(true);
+  };
 
-    const croppedText = this.text.slice(0, this.maxLength);
+  const croppedText = input.text.slice(0, input.maxLength);
 
-    // eslint-disable-next-line @devtools/no-lit-render-outside-of-view
-    render(
-        // clang-format off
+  render(
+      // clang-format off
         html`<span title=${croppedText + '…'} @contextmenu=${onContextMenu}>
-               ${this.#expanded ? this.text : croppedText}
+               ${input.expanded ? input.text : croppedText}
                <button
-                 ?hidden=${this.#expanded}
-                 @click=${this.#canExpand ? this.expandText.bind(this) : undefined}
-                 jslog=${ifDefined(this.#canExpand ? VisualLogging.action('expand').track({click: true}) : undefined)}
-                 class=${this.#canExpand ? 'expandable-inline-button' : 'undisplayable-text'}
-                 data-text=${this.#canExpand ? i18nString(UIStrings.showMoreS, {PH1: totalBytesText}) :
+                 ?hidden=${input.expanded}
+                 @click=${canExpand ? input.expandText : undefined}
+                 jslog=${ifDefined(canExpand ? VisualLogging.action('expand').track({click: true}) : undefined)}
+                 class=${canExpand ? 'expandable-inline-button' : 'undisplayable-text'}
+                 data-text=${canExpand ? i18nString(UIStrings.showMoreS, {PH1: totalBytesText}) :
                                            i18nString(UIStrings.longTextWasTruncatedS, {PH1: totalBytesText})}
                  ></button>
                <button
                  class=expandable-inline-button
-                 @click=${this.copyText.bind(this)}
+                 @click=${input.copyText}
                  data-text=${i18nString(UIStrings.copy)}
                  jslog=${VisualLogging.action('copy').track({click: true})}
                  ></button>
              </span>`,
-        // clang-format on
-        this.#element);
+      // clang-format on
+      target);
+};
+
+export class ExpandableTextPropertyValue extends UI.Widget.Widget {
+  static readonly MAX_DISPLAYABLE_TEXT_LENGTH = 10000000;
+  static readonly EXPANDABLE_MAX_LENGTH = 50;
+  #text = '';
+  #byteCount = 0;
+  #expanded = false;
+  #maxLength = ExpandableTextPropertyValue.EXPANDABLE_MAX_LENGTH;
+  readonly #view: ExpandableTextView;
+
+  constructor(target?: HTMLElement, view = EXPANDABLE_TEXT_DEFAULT_VIEW) {
+    super(target);
+    this.#view = view;
   }
 
-  get #canExpand(): boolean {
-    return this.text.length < this.maxDisplayableTextLength;
+  set text(text: string) {
+    this.#text = text;
+    this.#byteCount = Platform.StringUtilities.countWtf8Bytes(text);
+    this.requestUpdate();
   }
 
-  private expandText(): void {
-    if (!this.#expanded) {
-      this.#expanded = true;
-      this.#render();
-    }
+  set maxLength(maxLength: number) {
+    this.#maxLength = maxLength;
+    this.requestUpdate();
   }
 
-  private copyText(): void {
-    Host.InspectorFrontendHost.InspectorFrontendHostInstance.copyText(this.text);
+  override performUpdate(): void {
+    const input: ExpandableTextViewInput = {
+      copyText: () => Host.InspectorFrontendHost.InspectorFrontendHostInstance.copyText(this.#text),
+      expandText: () => {
+        if (!this.#expanded) {
+          this.#expanded = true;
+          this.requestUpdate();
+        }
+      },
+      expanded: this.#expanded,
+      byteCount: this.#byteCount,
+      maxLength: this.#maxLength,
+      text: this.#text,
+    };
+    this.#view(input, {}, this.contentElement);
   }
 }

package/front_end/ui/legacy/components/perf_ui/LineLevelProfile.ts

@@ -8,7 +8,6 @@ import type * as Protocol from '../../../../generated/protocol.js';
 import * as Bindings from '../../../../models/bindings/bindings.js';
 import type * as CPUProfile from '../../../../models/cpu_profile/cpu_profile.js';
 import * as Workspace from '../../../../models/workspace/workspace.js';
-import * as SourceFrame from '../source_frame/source_frame.js';
 
 let performanceInstance: Performance;
 
@@ -16,7 +15,7 @@ export class Performance {
   private readonly helper: Helper;
 
   private constructor() {
-    this.helper = new Helper(SourceFrame.SourceFrame.DecoratorType.PERFORMANCE);
+    this.helper = new Helper(Workspace.UISourceCode.DecoratorType.PERFORMANCE);
   }
 
   static instance(opts: {
@@ -50,7 +49,8 @@ export class Performance {
           const lineInfo = node.positionTicks[j];
           const line = lineInfo.line;
           const time = lineInfo.ticks * sampleDuration;
-          this.helper.addLineData(target, node.url, line, time);
+          // Since no column number is provided by legacy profile, default to 1 (beginning of line).
+          this.helper.addLocationData(target, node.url, {line, column: 1}, time);
         }
       }
     }
@@ -62,13 +62,14 @@ export class Performance {
       this.helper.scheduleUpdate();
       return;
     }
-    if (!profile.samples) {
+    if (!profile.samples || !profile.columns) {
       return;
     }
 
     for (let i = 1; i < profile.samples.length; ++i) {
       const line = profile.lines[i];
-      if (!line) {
+      const column = profile.columns?.[i];
+      if (!line || !column) {
         continue;
       }
       const node = profile.nodeByIndex(i);
@@ -80,7 +81,7 @@ export class Performance {
         continue;
       }
       const time = profile.timestamps[i] - profile.timestamps[i - 1];
-      this.helper.addLineData(target, scriptIdOrUrl, line, time);
+      this.helper.addLocationData(target, scriptIdOrUrl, {line, column}, time);
     }
     this.helper.scheduleUpdate();
   }
@@ -91,7 +92,7 @@ let memoryInstance: Memory;
 export class Memory {
   private readonly helper: Helper;
   private constructor() {
-    this.helper = new Helper(SourceFrame.SourceFrame.DecoratorType.MEMORY);
+    this.helper = new Helper(Workspace.UISourceCode.DecoratorType.MEMORY);
   }
 
   static instance(opts: {
@@ -124,43 +125,55 @@ export class Memory {
         return;
       }
       const line = node.callFrame.lineNumber + 1;
-      helper.addLineData(target, script, line, node.selfSize);
+      // Since no column number is provided by the heap profile, default to 1 (beginning of line).
+      helper.addLocationData(target, script, {line, column: 1}, node.selfSize);
     }
   }
 }
 
 export class Helper {
-  private readonly type: string;
+  private readonly type: Workspace.UISourceCode.DecoratorType;
   private readonly locationPool = new Bindings.LiveLocation.LiveLocationPool();
   private updateTimer: number|null = null;
-  private lineData =
-      new Map<SDK.Target.Target|null, Map<Platform.DevToolsPath.UrlString|number, Map<number, number>>>();
-
-  constructor(type: string) {
+  /**
+   * Given a location in a script (with line and column numbers being 1-based) stores
+   * the time spent at that location in a performance profile.
+   */
+  private locationData =
+      new Map<SDK.Target.Target|null, Map<Platform.DevToolsPath.UrlString|number, Map<number, Map<number, number>>>>();
+  constructor(type: Workspace.UISourceCode.DecoratorType) {
     this.type = type;
     this.reset();
   }
 
   reset(): void {
     // The second map uses string keys for script URLs and numbers for scriptId.
-    this.lineData = new Map();
+    this.locationData = new Map();
     this.scheduleUpdate();
   }
 
-  addLineData(
-      target: SDK.Target.Target|null, scriptIdOrUrl: Platform.DevToolsPath.UrlString|number, line: number,
-      data: number): void {
-    let targetData = this.lineData.get(target);
+  /**
+   * Stores the time taken running a given script location (line and column)
+   */
+  addLocationData(
+      target: SDK.Target.Target|null, scriptIdOrUrl: Platform.DevToolsPath.UrlString|number,
+      {line, column}: {line: number, column: number}, data: number): void {
+    let targetData = this.locationData.get(target);
     if (!targetData) {
       targetData = new Map();
-      this.lineData.set(target, targetData);
+      this.locationData.set(target, targetData);
     }
     let scriptData = targetData.get(scriptIdOrUrl);
     if (!scriptData) {
       scriptData = new Map();
       targetData.set(scriptIdOrUrl, scriptData);
     }
-    scriptData.set(line, (scriptData.get(line) || 0) + data);
+    let lineData = scriptData.get(line);
+    if (!lineData) {
+      lineData = new Map();
+      scriptData.set(line, lineData);
+    }
+    lineData.set(column, (lineData.get(column) || 0) + data);
   }
 
   scheduleUpdate(): void {
@@ -176,10 +189,9 @@ export class Helper {
   private async doUpdate(): Promise<void> {
     this.locationPool.disposeAll();
     // Map from sources to line->value profile maps.
-    const decorationsBySource = new Map<Workspace.UISourceCode.UISourceCode, Map<number, number>>();
+    const decorationsBySource = new Map<Workspace.UISourceCode.UISourceCode, Map<number, Map<number, number>>>();
     const pending: Array<Promise<void>> = [];
-
-    for (const [target, scriptToLineMap] of this.lineData) {
+    for (const [target, scriptToLineMap] of this.locationData) {
       const debuggerModel = target ? target.model(SDK.DebuggerModel.DebuggerModel) : null;
       for (const [scriptIdOrUrl, lineToDataMap] of scriptToLineMap) {
         // debuggerModel is null when the profile is loaded from file.
@@ -187,23 +199,34 @@ export class Helper {
         const workspace = Workspace.Workspace.WorkspaceImpl.instance();
         if (debuggerModel) {
           const workspaceBinding = Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding.instance();
-          for (const lineToData of lineToDataMap) {
-            const line = lineToData[0] - 1;
-            const data = lineToData[1];
-            const rawLocation = typeof scriptIdOrUrl === 'string' ?
-                debuggerModel.createRawLocationByURL(scriptIdOrUrl, line, 0) :
-                debuggerModel.createRawLocationByScriptId(String(scriptIdOrUrl) as Protocol.Runtime.ScriptId, line, 0);
-            if (rawLocation) {
-              pending.push(workspaceBinding.rawLocationToUILocation(rawLocation).then(uiLocation => {
-                if (uiLocation) {
-                  let lineMap = decorationsBySource.get(uiLocation.uiSourceCode);
-                  if (!lineMap) {
-                    lineMap = new Map<number, number>();
-                    decorationsBySource.set(uiLocation.uiSourceCode, lineMap);
-                  }
-                  lineMap.set(uiLocation.lineNumber + 1, data);
+          for (const [lineNumber, lineData] of lineToDataMap) {
+            // lineData contains profiling data by column.
+            for (const [columnNumber, data] of lineData) {
+              const zeroBasedLine = lineNumber - 1;
+              const zeroBasedColumn = columnNumber - 1;
+              if (target) {
+                const rawLocation = typeof scriptIdOrUrl === 'string' ?
+                    debuggerModel.createRawLocationByURL(scriptIdOrUrl, zeroBasedLine, zeroBasedColumn || 0) :
+                    debuggerModel.createRawLocationByScriptId(
+                        String(scriptIdOrUrl) as Protocol.Runtime.ScriptId, zeroBasedLine, zeroBasedColumn || 0);
+                if (rawLocation) {
+                  pending.push(workspaceBinding.rawLocationToUILocation(rawLocation).then(uiLocation => {
+                    if (uiLocation) {
+                      let lineMap = decorationsBySource.get(uiLocation.uiSourceCode);
+                      if (!lineMap) {
+                        lineMap = new Map<number, Map<number, number>>();
+                        decorationsBySource.set(uiLocation.uiSourceCode, lineMap);
+                      }
+                      let columnMap = lineMap.get(lineNumber);
+                      if (!columnMap) {
+                        columnMap = new Map<number, number>();
+                        lineMap.set(lineNumber, columnMap);
+                      }
+                      columnMap.set((zeroBasedColumn || 0) + 1, data);
+                    }
+                  }));
                 }
-              }));
+              }
             }
           }
         } else if (typeof scriptIdOrUrl === 'string') {

package/front_end/ui/legacy/components/perf_ui/OverviewGrid.ts

@@ -176,7 +176,7 @@ export class Window extends Common.ObjectWrapper.ObjectWrapper<EventTypes> {
 
     this.parentElement.addEventListener('wheel', this.onMouseWheel.bind(this), true);
     this.parentElement.addEventListener('dblclick', this.resizeWindowMaximum.bind(this), true);
-    Platform.DOMUtilities.appendStyle(this.parentElement, overviewGridStyles);
+    UI.DOMUtilities.appendStyle(this.parentElement, overviewGridStyles);
 
     this.leftResizeElement = parentElement.createChild('div', 'overview-grid-window-resizer');
     UI.UIUtils.installDragHandle(

package/front_end/ui/legacy/components/perf_ui/TimelineGrid.ts

@@ -33,8 +33,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import * as Platform from '../../../../core/platform/platform.js';
 import type * as NetworkTimeCalculator from '../../../../models/network_time_calculator/network_time_calculator.js';
+import * as UI from '../../legacy.js';
 import * as ThemeSupport from '../../theme_support/theme_support.js';
 
 import {DEFAULT_FONT_SIZE, getFontFamilyForCanvas} from './Font.js';
@@ -51,7 +51,7 @@ export class TimelineGrid {
 
   constructor() {
     this.element = document.createElement('div');
-    Platform.DOMUtilities.appendStyle(this.element, timelineGridStyles);
+    UI.DOMUtilities.appendStyle(this.element, timelineGridStyles);
 
     this.#dividersElement = this.element.createChild('div', 'resources-dividers');
 

package/front_end/ui/legacy/components/source_frame/SourceFrame.ts

@@ -121,7 +121,7 @@ export class SourceFrameImpl extends Common.ObjectWrapper.eventMixin<EventTypes,
   private readonly lazyContent: () => Promise<TextUtils.ContentData.ContentDataOrError>;
   private prettyInternal: boolean;
   private rawContent: string|CodeMirror.Text|null;
-  private formattedMap: Formatter.ScriptFormatter.FormatterSourceMapping|null;
+  protected formattedMap: Formatter.ScriptFormatter.FormatterSourceMapping|null;
   private readonly prettyToggle: UI.Toolbar.ToolbarToggle;
   private shouldAutoPrettyPrint: boolean;
   private readonly progressToolbarItem: UI.Toolbar.ToolbarItem;
@@ -400,6 +400,7 @@ export class SourceFrameImpl extends Common.ObjectWrapper.eventMixin<EventTypes,
       newSelection = textEditor.createSelection(
           {lineNumber: start[0], columnNumber: start[1]}, {lineNumber: end[0], columnNumber: end[1]});
     } else {
+      this.formattedMap = null;
       await this.setContent(this.rawContent || '');
       this.baseDoc = textEditor.state.doc;
       const start = this.prettyToRawLocation(startPos.lineNumber, startPos.columnNumber);
@@ -1051,12 +1052,6 @@ export interface Transformer {
   };
 }
 
-export const enum DecoratorType {
-  PERFORMANCE = 'performance',
-  MEMORY = 'memory',
-  COVERAGE = 'coverage',
-}
-
 const config = {
   editable: new CodeMirror.Compartment(),
   language: new CodeMirror.Compartment(),
@@ -1135,8 +1130,7 @@ const searchHighlighter = CodeMirror.ViewPlugin.fromClass(class {
             }
             if (match[0].length) {
               const start = pos + match.index, end = start + match[0].length;
-              const current =
-                  active.currentRange && active.currentRange.from === start && active.currentRange.to === end;
+              const current = active.currentRange?.from === start && active.currentRange.to === end;
               builder.add(start, end, current ? currentSearchMatchDeco : searchMatchDeco);
             } else {
               active.regexp.regex.lastIndex = match.index + 1;