chrome-devtools-frontend 1.0.1649421 → 1.0.1650100

package/front_end/ui/legacy/components/utils/Linkifier.ts

@@ -1060,15 +1060,21 @@ export class LinkHandlerSettingUI {
 
   update(): void {
     this.element.removeChildren();
-    const names = [...linkHandlers.keys()];
-    names.unshift(i18nString(UIStrings.auto));
-    for (const name of names) {
+    // Populate the dropdown with extension origins. The first option is the
+    // special "Auto" value which is not a real origin.
+    const origins = [...linkHandlers.keys()];
+    origins.unshift(i18nString(UIStrings.auto));
+    for (const origin of origins) {
       const option = document.createElement('option');
-      option.textContent = name;
-      option.selected = name === Linkifier.linkHandlerSetting().get();
+      const registration = linkHandlers.get(origin);
+      // If the origin has a registered handler, display its user-friendly title.
+      // Otherwise, fallback to the origin string itself (e.g. for the "Auto" option).
+      option.textContent = registration === undefined ? origin : registration.title;
+      option.value = origin;
+      option.selected = origin === Linkifier.linkHandlerSetting().get();
       this.element.appendChild(option);
     }
-    this.element.disabled = names.length <= 1;
+    this.element.disabled = origins.length <= 1;
   }
 
   private onChange(event: Event): void {

package/package.json

@@ -92,5 +92,5 @@
     "webidl2": "24.5.0",
     "yargs": "17.7.2"
   },
-  "version": "1.0.1649421"
+  "version": "1.0.1650100"
 }

package/front_end/models/stack_trace/ErrorStackParser.ts

@@ -1,174 +0,0 @@
-// Copyright 2022 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import * as Common from '../../core/common/common.js';
-import type * as Platform from '../../core/platform/platform.js';
-import type * as SDK from '../../core/sdk/sdk.js';
-import type * as Protocol from '../../generated/protocol.js';
-
-export interface ParsedErrorFrame {
-  line: string;
-  isCallFrame?: boolean;
-  link?: {
-    url: Platform.DevToolsPath.UrlString,
-    prefix: string,
-    suffix: string,
-    enclosedInBraces: boolean,
-    lineNumber?: number,
-    columnNumber?: number,
-    scriptId?: Protocol.Runtime.ScriptId,
-  };
-}
-
-/**
- * Combines the error description (essentially the `Error#stack` property value)
- * with the `issueSummary`.
- *
- * @param description the `description` property of the `Error` remote object.
- * @param issueSummary the optional `issueSummary` of the `exceptionMetaData`.
- * @returns the enriched description.
- * @see https://goo.gle/devtools-reduce-network-noise-design
- */
-export function concatErrorDescriptionAndIssueSummary(description: string, issueSummary: string): string {
-  // Insert the issue summary right after the error message.
-  const pos = description.indexOf('\n');
-  const prefix = pos === -1 ? description : description.substring(0, pos);
-  const suffix = pos === -1 ? '' : description.substring(pos);
-  description = `${prefix}. ${issueSummary}${suffix}`;
-  return description;
-}
-
-/**
- * Takes a V8 Error#stack string and extracts source position information.
- *
- * The result includes the url, line and column number, as well as where
- * the url is found in the raw line.
- *
- * @returns Null if the provided string has an unexpected format. A
- *          populated `ParsedErrorFrame[]` otherwise.
- */
-export function parseSourcePositionsFromErrorStack(
-    runtimeModel: SDK.RuntimeModel.RuntimeModel, stack: string): ParsedErrorFrame[]|null {
-  if (!(/\n\s*at\s/.test(stack) || stack.startsWith('SyntaxError:'))) {
-    return null;
-  }
-  const debuggerModel = runtimeModel.debuggerModel();
-  const baseURL = runtimeModel.target().inspectedURL();
-
-  const lines = stack.split('\n');
-  const linkInfos = [];
-  for (const line of lines) {
-    const match = /^\s*at\s(async\s)?/.exec(line);
-    if (!match) {
-      if (linkInfos.length && linkInfos[linkInfos.length - 1].isCallFrame) {
-        return null;
-      }
-      linkInfos.push({line});
-      continue;
-    }
-
-    const isCallFrame = true;
-    let left = match[0].length;
-    let right = line.length;
-    let enclosedInBraces = false;
-    if (line[right - 1] === ')') {
-      right--;
-      enclosedInBraces = true;
-      left = line.lastIndexOf(' (', right);
-      if (left < 0) {
-        return null;
-      }
-      left += 2;
-      // Relevant in the `eval at ...` case.
-      const newRight = line.indexOf('), ', left);
-      if (newRight > left) {
-        right = newRight;
-      }
-    }
-
-    const linkCandidate = line.substring(left, right);
-    const splitResult = Common.ParsedURL.ParsedURL.splitLineAndColumn(linkCandidate);
-    if (splitResult.url === '<anonymous>') {
-      if (linkInfos.length && linkInfos[linkInfos.length - 1].isCallFrame && !linkInfos[linkInfos.length - 1].link) {
-        // Combine builtin frames.
-        linkInfos[linkInfos.length - 1].line += `\n${line}`;
-      } else {
-        linkInfos.push({line, isCallFrame});
-      }
-      continue;
-    }
-    let url = parseOrScriptMatch(debuggerModel, splitResult.url);
-    if (!url && Common.ParsedURL.ParsedURL.isRelativeURL(splitResult.url)) {
-      url = parseOrScriptMatch(debuggerModel, Common.ParsedURL.ParsedURL.completeURL(baseURL, splitResult.url));
-    }
-    if (!url) {
-      return null;
-    }
-
-    linkInfos.push({
-      line,
-      isCallFrame,
-      link: {
-        url,
-        prefix: line.substring(0, left),
-        suffix: line.substring(right),
-        enclosedInBraces,
-        lineNumber: splitResult.lineNumber,
-        columnNumber: splitResult.columnNumber,
-      },
-    });
-  }
-  return linkInfos;
-}
-
-function parseOrScriptMatch(debuggerModel: SDK.DebuggerModel.DebuggerModel, url: Platform.DevToolsPath.UrlString|null):
-    Platform.DevToolsPath.UrlString|null {
-  if (!url) {
-    return null;
-  }
-  if (Common.ParsedURL.ParsedURL.isValidUrlString(url)) {
-    return url;
-  }
-  if (debuggerModel.scriptsForSourceURL(url).length) {
-    return url;
-  }
-  // nodejs stack traces contain (absolute) file paths, but v8 reports them as file: urls.
-  const fileUrl = new URL(url, 'file://');
-  if (debuggerModel.scriptsForSourceURL(fileUrl.href).length) {
-    return fileUrl.href as Platform.DevToolsPath.UrlString;
-  }
-  return null;
-}
-
-/**
- * Error#stack output only contains script URLs. In some cases we are able to
- * retrieve additional exception details from V8 that we can use to augment
- * the parsed Error#stack with script IDs.
- * This function sets the `scriptId` field in `ParsedErrorFrame` when it finds
- * the corresponding info in `Protocol.Runtime.StackTrace`.
- */
-export function augmentErrorStackWithScriptIds(
-    parsedFrames: ParsedErrorFrame[], protocolStackTrace: Protocol.Runtime.StackTrace): void {
-  // Note that the number of frames between the two stack traces can differ. The
-  // parsed Error#stack can contain Builtin frames which are not present in the protocol
-  // stack. This means its easier to always search the whole protocol stack for a matching
-  // frame rather then trying to detect the Builtin frames and skipping them.
-  for (const parsedFrame of parsedFrames) {
-    const protocolFrame = protocolStackTrace.callFrames.find(frame => framesMatch(parsedFrame, frame));
-    if (protocolFrame && parsedFrame.link) {
-      parsedFrame.link.scriptId = protocolFrame.scriptId;
-    }
-  }
-}
-
-/** Returns true iff both stack frames have the same url and line/column numbers. The function name is ignored */
-function framesMatch(parsedFrame: ParsedErrorFrame, protocolFrame: Protocol.Runtime.CallFrame): boolean {
-  if (!parsedFrame.link) {
-    return false;
-  }
-
-  const {url, lineNumber, columnNumber} = parsedFrame.link;
-  return url === protocolFrame.url && lineNumber === protocolFrame.lineNumber &&
-      columnNumber === protocolFrame.columnNumber;
-}