chrome-devtools-frontend 1.0.964938 → 1.0.966659

package/front_end/generated/InspectorBackendCommands.js

@@ -282,6 +282,27 @@ export function registerCommands(inspectorBackend) {
   inspectorBackend.registerEnum(
       'Audits.ClientHintIssueReason',
       {MetaTagAllowListInvalidOrigin: 'MetaTagAllowListInvalidOrigin', MetaTagModifiedHTML: 'MetaTagModifiedHTML'});
+  inspectorBackend.registerEnum('Audits.FederatedAuthRequestIssueReason', {
+    ApprovalDeclined: 'ApprovalDeclined',
+    TooManyRequests: 'TooManyRequests',
+    WellKnownHttpNotFound: 'WellKnownHttpNotFound',
+    WellKnownNoResponse: 'WellKnownNoResponse',
+    WellKnownInvalidResponse: 'WellKnownInvalidResponse',
+    ClientIdMetadataHttpNotFound: 'ClientIdMetadataHttpNotFound',
+    ClientIdMetadataNoResponse: 'ClientIdMetadataNoResponse',
+    ClientIdMetadataInvalidResponse: 'ClientIdMetadataInvalidResponse',
+    ErrorFetchingSignin: 'ErrorFetchingSignin',
+    InvalidSigninResponse: 'InvalidSigninResponse',
+    AccountsHttpNotFound: 'AccountsHttpNotFound',
+    AccountsNoResponse: 'AccountsNoResponse',
+    AccountsInvalidResponse: 'AccountsInvalidResponse',
+    IdTokenHttpNotFound: 'IdTokenHttpNotFound',
+    IdTokenNoResponse: 'IdTokenNoResponse',
+    IdTokenInvalidResponse: 'IdTokenInvalidResponse',
+    IdTokenInvalidRequest: 'IdTokenInvalidRequest',
+    ErrorIdToken: 'ErrorIdToken',
+    Canceled: 'Canceled'
+  });
   inspectorBackend.registerEnum('Audits.InspectorIssueCode', {
     SameSiteCookieIssue: 'SameSiteCookieIssue',
     MixedContentIssue: 'MixedContentIssue',
@@ -297,7 +318,8 @@ export function registerCommands(inspectorBackend) {
     NavigatorUserAgentIssue: 'NavigatorUserAgentIssue',
     GenericIssue: 'GenericIssue',
     DeprecationIssue: 'DeprecationIssue',
-    ClientHintIssue: 'ClientHintIssue'
+    ClientHintIssue: 'ClientHintIssue',
+    FederatedAuthRequestIssue: 'FederatedAuthRequestIssue'
   });
   inspectorBackend.registerEvent('Audits.issueAdded', ['issue']);
   inspectorBackend.registerEnum('Audits.GetEncodedResponseRequestEncoding', {Webp: 'webp', Jpeg: 'jpeg', Png: 'png'});
@@ -1647,7 +1669,8 @@ export function registerCommands(inspectorBackend) {
     SameOrigin: 'SameOrigin',
     SameOriginAllowPopups: 'SameOriginAllowPopups',
     UnsafeNone: 'UnsafeNone',
-    SameOriginPlusCoep: 'SameOriginPlusCoep'
+    SameOriginPlusCoep: 'SameOriginPlusCoep',
+    SameOriginAllowPopupsPlusCoep: 'SameOriginAllowPopupsPlusCoep'
   });
   inspectorBackend.registerEnum(
       'Network.CrossOriginEmbedderPolicyValue',
@@ -2001,10 +2024,12 @@ export function registerCommands(inspectorBackend) {
     ChUaPlatform: 'ch-ua-platform',
     ChUaModel: 'ch-ua-model',
     ChUaMobile: 'ch-ua-mobile',
+    ChUaFull: 'ch-ua-full',
     ChUaFullVersion: 'ch-ua-full-version',
     ChUaFullVersionList: 'ch-ua-full-version-list',
     ChUaPlatformVersion: 'ch-ua-platform-version',
     ChUaReduced: 'ch-ua-reduced',
+    ChUaWow64: 'ch-ua-wow64',
     ChViewportHeight: 'ch-viewport-height',
     ChViewportWidth: 'ch-viewport-width',
     ChWidth: 'ch-width',

package/front_end/generated/protocol.ts

@@ -1052,6 +1052,38 @@ export namespace Audits {
     MetaTagModifiedHTML = 'MetaTagModifiedHTML',
   }
 
+  export interface FederatedAuthRequestIssueDetails {
+    federatedAuthRequestIssueReason: FederatedAuthRequestIssueReason;
+  }
+
+  /**
+   * Represents the failure reason when a federated authentication reason fails.
+   * Should be updated alongside RequestIdTokenStatus in
+   * third_party/blink/public/mojom/webid/federated_auth_request.mojom to include
+   * all cases except for success.
+   */
+  export const enum FederatedAuthRequestIssueReason {
+    ApprovalDeclined = 'ApprovalDeclined',
+    TooManyRequests = 'TooManyRequests',
+    WellKnownHttpNotFound = 'WellKnownHttpNotFound',
+    WellKnownNoResponse = 'WellKnownNoResponse',
+    WellKnownInvalidResponse = 'WellKnownInvalidResponse',
+    ClientIdMetadataHttpNotFound = 'ClientIdMetadataHttpNotFound',
+    ClientIdMetadataNoResponse = 'ClientIdMetadataNoResponse',
+    ClientIdMetadataInvalidResponse = 'ClientIdMetadataInvalidResponse',
+    ErrorFetchingSignin = 'ErrorFetchingSignin',
+    InvalidSigninResponse = 'InvalidSigninResponse',
+    AccountsHttpNotFound = 'AccountsHttpNotFound',
+    AccountsNoResponse = 'AccountsNoResponse',
+    AccountsInvalidResponse = 'AccountsInvalidResponse',
+    IdTokenHttpNotFound = 'IdTokenHttpNotFound',
+    IdTokenNoResponse = 'IdTokenNoResponse',
+    IdTokenInvalidResponse = 'IdTokenInvalidResponse',
+    IdTokenInvalidRequest = 'IdTokenInvalidRequest',
+    ErrorIdToken = 'ErrorIdToken',
+    Canceled = 'Canceled',
+  }
+
   /**
    * This issue tracks client hints related issues. It's used to deprecate old
    * features, encourage the use of new ones, and provide general guidance.
@@ -1082,6 +1114,7 @@ export namespace Audits {
     GenericIssue = 'GenericIssue',
     DeprecationIssue = 'DeprecationIssue',
     ClientHintIssue = 'ClientHintIssue',
+    FederatedAuthRequestIssue = 'FederatedAuthRequestIssue',
   }
 
   /**
@@ -1105,6 +1138,7 @@ export namespace Audits {
     genericIssueDetails?: GenericIssueDetails;
     deprecationIssueDetails?: DeprecationIssueDetails;
     clientHintIssueDetails?: ClientHintIssueDetails;
+    federatedAuthRequestIssueDetails?: FederatedAuthRequestIssueDetails;
   }
 
   /**
@@ -1885,6 +1919,11 @@ export namespace CSS {
      * The array enumerates container queries starting with the innermost one, going outwards.
      */
     containerQueries?: CSSContainerQuery[];
+    /**
+     * @supports CSS at-rule array.
+     * The array enumerates @supports at-rules starting with the innermost one, going outwards.
+     */
+    supports?: CSSSupports[];
   }
 
   /**
@@ -2127,6 +2166,25 @@ export namespace CSS {
     name?: string;
   }
 
+  /**
+   * CSS Supports at-rule descriptor.
+   */
+  export interface CSSSupports {
+    /**
+     * Supports rule text.
+     */
+    text: string;
+    /**
+     * The associated rule header range in the enclosing stylesheet (if
+     * available).
+     */
+    range?: SourceRange;
+    /**
+     * Identifier of the stylesheet containing this object (if exists).
+     */
+    styleSheetId?: StyleSheetId;
+  }
+
   /**
    * Information about amount of glyphs that were rendered with given font.
    */
@@ -7958,6 +8016,7 @@ export namespace Network {
     SameOriginAllowPopups = 'SameOriginAllowPopups',
     UnsafeNone = 'UnsafeNone',
     SameOriginPlusCoep = 'SameOriginPlusCoep',
+    SameOriginAllowPopupsPlusCoep = 'SameOriginAllowPopupsPlusCoep',
   }
 
   export interface CrossOriginOpenerPolicyStatus {
@@ -9984,10 +10043,12 @@ export namespace Page {
     ChUaPlatform = 'ch-ua-platform',
     ChUaModel = 'ch-ua-model',
     ChUaMobile = 'ch-ua-mobile',
+    ChUaFull = 'ch-ua-full',
     ChUaFullVersion = 'ch-ua-full-version',
     ChUaFullVersionList = 'ch-ua-full-version-list',
     ChUaPlatformVersion = 'ch-ua-platform-version',
     ChUaReduced = 'ch-ua-reduced',
+    ChUaWow64 = 'ch-ua-wow64',
     ChViewportHeight = 'ch-viewport-height',
     ChViewportWidth = 'ch-viewport-width',
     ChWidth = 'ch-width',

package/front_end/legacy_test_runner/bindings_test_runner/PersistenceTestRunner.js

@@ -23,7 +23,7 @@ Persistence.AutomappingStatus.prototype.toString = function() {
   return lines.join('\n');
 };
 
-BindingsTestRunner.waitForBinding = function(fileName) {
+BindingsTestRunner.waitForBinding = async function(fileName) {
   const uiSourceCodes = self.Workspace.workspace.uiSourceCodes();
 
   for (const uiSourceCode of uiSourceCodes) {
@@ -34,7 +34,7 @@ BindingsTestRunner.waitForBinding = function(fileName) {
     }
 
     if (uiSourceCode.name() === fileName) {
-      return Promise.resolve(binding);
+      return binding;
     }
   }
 

package/front_end/legacy_test_runner/console_test_runner/console_test_runner.js

@@ -50,6 +50,7 @@ ConsoleTestRunner.dumpConsoleMessagesIntoArray = async function(printOriginating
     const element = uiMessage.element();
     // Retrieving the message element triggered rendering, now wait for
     // the live location within to be resolved initially.
+    await uiMessage.formatErrorStackPromiseForTest();
     await TestRunner.waitForPendingLiveLocationUpdates();
 
     let classNames;
@@ -220,9 +221,14 @@ ConsoleTestRunner.evaluateInConsole = function(code, callback, dontForceMainCont
     const element = commandResult.toMessageElement();
     // Only call the callback once the live location within the
     // message element is resolved initially.
-    TestRunner.waitForPendingLiveLocationUpdates().then(() => {
-      callback(element.deepTextContent());
-    });
+    Promise
+        .all([
+          commandResult.formatErrorStackPromiseForTest(),
+          TestRunner.waitForPendingLiveLocationUpdates(),
+        ])
+        .then(() => {
+          callback(element.deepTextContent());
+        });
   });
 };
 

package/front_end/legacy_test_runner/heap_profiler_test_runner/heap_profiler_test_runner.js

@@ -624,14 +624,13 @@ HeapProfilerTestRunner.takeAndOpenSnapshot = async function(generator, callback)
   const snapshot = generator();
   const profileType = Profiler.ProfileTypeRegistry.instance.heapSnapshotProfileType;
 
-  function pushGeneratedSnapshot(reportProgress) {
+  async function pushGeneratedSnapshot(reportProgress) {
     if (reportProgress) {
       profileType.reportHeapSnapshotProgress({data: {done: 50, total: 100, finished: false}});
       profileType.reportHeapSnapshotProgress({data: {done: 100, total: 100, finished: true}});
     }
     snapshot.snapshot.typeId = 'HEAP';
     profileType.addHeapSnapshotChunk({data: JSON.stringify(snapshot)});
-    return Promise.resolve();
   }
 
   HeapProfilerTestRunner.takeAndOpenSnapshotCallback = callback;

package/front_end/legacy_test_runner/sources_test_runner/DebuggerTestRunner.js

@@ -198,31 +198,31 @@ SourcesTestRunner.waitUntilPausedAndDumpStackAndResume = function(callback, opti
 };
 
 SourcesTestRunner.stepOver = function() {
-  Promise.resolve().then(function() {
+  queueMicrotask(function() {
     UI.panels.sources.stepOver();
   });
 };
 
 SourcesTestRunner.stepInto = function() {
-  Promise.resolve().then(function() {
+  queueMicrotask(function() {
     UI.panels.sources.stepInto();
   });
 };
 
 SourcesTestRunner.stepIntoAsync = function() {
-  Promise.resolve().then(function() {
+  queueMicrotask(function() {
     UI.panels.sources.stepIntoAsync();
   });
 };
 
 SourcesTestRunner.stepOut = function() {
-  Promise.resolve().then(function() {
+  queueMicrotask(function() {
     UI.panels.sources.stepOut();
   });
 };
 
 SourcesTestRunner.togglePause = function() {
-  Promise.resolve().then(function() {
+  queueMicrotask(function() {
     UI.panels.sources.togglePause();
   });
 };

package/front_end/models/bindings/ContentProviderBasedProject.ts

@@ -46,8 +46,7 @@ interface UISourceCodeData {
   metadata: Workspace.UISourceCode.UISourceCodeMetadata|null;
 }
 
-export class ContentProviderBasedProject extends Workspace.Workspace.ProjectStore implements
-    Workspace.Workspace.Project {
+export class ContentProviderBasedProject extends Workspace.Workspace.ProjectStore {
   readonly #contentProviders: Map<string, TextUtils.ContentProvider.ContentProvider>;
   readonly #isServiceProjectInternal: boolean;
   readonly #uiSourceCodeToData: WeakMap<Workspace.UISourceCode.UISourceCode, UISourceCodeData>;
@@ -199,7 +198,7 @@ export class ContentProviderBasedProject extends Workspace.Workspace.ProjectStor
   }
 
   indexContent(progress: Common.Progress.Progress): void {
-    void Promise.resolve().then(progress.done.bind(progress));
+    queueMicrotask(progress.done.bind(progress));
   }
 
   addUISourceCodeWithProvider(

package/front_end/models/extensions/ExtensionServer.ts

@@ -57,7 +57,7 @@ const extensionOrigins: WeakMap<MessagePort, string> = new WeakMap();
 
 declare global {
   interface Window {
-    DevToolsAPI?: {getInspectedTabId?(): string|undefined};
+    DevToolsAPI?: {getInspectedTabId?(): string|undefined, getOriginsForbiddenForExtensions?(): string[]};
   }
 }
 
@@ -1102,6 +1102,12 @@ export class ExtensionServer extends Common.ObjectWrapper.ObjectWrapper<EventTyp
         parsedURL.pathname.startsWith('/webstore')) {
       return false;
     }
+
+    if ((window.DevToolsAPI && window.DevToolsAPI.getOriginsForbiddenForExtensions &&
+             window.DevToolsAPI.getOriginsForbiddenForExtensions() ||
+         []).includes(parsedURL.origin)) {
+      return false;
+    }
     return true;
   }
 

package/front_end/models/persistence/FileSystemWorkspaceBinding.ts

@@ -153,7 +153,7 @@ export class FileSystemWorkspaceBinding {
   }
 }
 
-export class FileSystem extends Workspace.Workspace.ProjectStore implements Workspace.Workspace.Project {
+export class FileSystem extends Workspace.Workspace.ProjectStore {
   readonly fileSystemInternal: PlatformFileSystem;
   readonly fileSystemBaseURL: string;
   private readonly fileSystemParentURL: string;

package/front_end/models/persistence/IsolatedFileSystem.ts

@@ -98,12 +98,12 @@ export class IsolatedFileSystem extends PlatformFileSystem {
     this.fileLocks = new Map();
   }
 
-  static create(
+  static async create(
       manager: IsolatedFileSystemManager, path: string, embedderPath: string, type: string, name: string,
       rootURL: string): Promise<IsolatedFileSystem|null> {
     const domFileSystem = Host.InspectorFrontendHost.InspectorFrontendHostInstance.isolatedFileSystem(name, rootURL);
     if (!domFileSystem) {
-      return Promise.resolve(null as IsolatedFileSystem | null);
+      return null as IsolatedFileSystem | null;
     }
 
     const fileSystem = new IsolatedFileSystem(manager, path, embedderPath, domFileSystem, type);

package/front_end/models/persistence/NetworkPersistenceManager.ts

@@ -383,8 +383,7 @@ export class NetworkPersistenceManager extends Common.ObjectWrapper.ObjectWrappe
 
       return SDK.NetworkManager.MultitargetNetworkManager.instance().setInterceptionHandlerForPatterns(
           Array.from(patterns).map(
-              pattern =>
-                  ({urlPattern: pattern, interceptionStage: Protocol.Network.InterceptionStage.HeadersReceived})),
+              pattern => ({urlPattern: pattern, requestStage: Protocol.Fetch.RequestStage.Response})),
           this.interceptionHandlerBound);
     }
   }
@@ -467,8 +466,12 @@ export class NetworkPersistenceManager extends Common.ObjectWrapper.ObjectWrappe
 
     let mimeType = '';
     if (interceptedRequest.responseHeaders) {
-      const responseHeaders = SDK.NetworkManager.NetworkManager.lowercaseHeaders(interceptedRequest.responseHeaders);
-      mimeType = responseHeaders['content-type'];
+      for (const header of interceptedRequest.responseHeaders) {
+        if (header.name.toLowerCase() === 'content-type') {
+          mimeType = header.value;
+          break;
+        }
+      }
     }
 
     if (!mimeType) {

package/front_end/models/workspace/WorkspaceImpl.ts

@@ -42,41 +42,36 @@ export interface ProjectSearchConfig {
   filePathMatchesFileQuery(filePath: string): boolean;
 }
 
-export abstract class Project {
-  abstract workspace(): WorkspaceImpl;
-  abstract id(): string;
-  abstract type(): string;
-  abstract isServiceProject(): boolean;
-  abstract displayName(): string;
-  abstract requestMetadata(uiSourceCode: UISourceCode): Promise<UISourceCodeMetadata|null>;
-  abstract requestFileContent(uiSourceCode: UISourceCode): Promise<TextUtils.ContentProvider.DeferredContent>;
-  abstract canSetFileContent(): boolean;
-  abstract setFileContent(uiSourceCode: UISourceCode, newContent: string, isBase64: boolean): Promise<void>;
-  abstract fullDisplayName(uiSourceCode: UISourceCode): string;
-  abstract mimeType(uiSourceCode: UISourceCode): string;
-  abstract canRename(): boolean;
+export interface Project {
+  workspace(): WorkspaceImpl;
+  id(): string;
+  type(): projectTypes;
+  isServiceProject(): boolean;
+  displayName(): string;
+  requestMetadata(uiSourceCode: UISourceCode): Promise<UISourceCodeMetadata|null>;
+  requestFileContent(uiSourceCode: UISourceCode): Promise<TextUtils.ContentProvider.DeferredContent>;
+  canSetFileContent(): boolean;
+  setFileContent(uiSourceCode: UISourceCode, newContent: string, isBase64: boolean): Promise<void>;
+  fullDisplayName(uiSourceCode: UISourceCode): string;
+  mimeType(uiSourceCode: UISourceCode): string;
+  canRename(): boolean;
   rename(
-      _uiSourceCode: UISourceCode, _newName: string,
-      _callback: (arg0: boolean, arg1?: string, arg2?: string, arg3?: Common.ResourceType.ResourceType) => void): void {
-  }
-  excludeFolder(_path: string): void {
-  }
-  abstract canExcludeFolder(path: string): boolean;
-  abstract createFile(path: string, name: string|null, content: string, isBase64?: boolean): Promise<UISourceCode|null>;
-  abstract canCreateFile(): boolean;
-  deleteFile(_uiSourceCode: UISourceCode): void {
-  }
-  remove(): void {
-  }
-  abstract searchInFileContent(uiSourceCode: UISourceCode, query: string, caseSensitive: boolean, isRegex: boolean):
+      uiSourceCode: UISourceCode, newName: string,
+      callback: (arg0: boolean, arg1?: string, arg2?: string, arg3?: Common.ResourceType.ResourceType) => void): void;
+  excludeFolder(path: string): void;
+  canExcludeFolder(path: string): boolean;
+  createFile(path: string, name: string|null, content: string, isBase64?: boolean): Promise<UISourceCode|null>;
+  canCreateFile(): boolean;
+  deleteFile(uiSourceCode: UISourceCode): void;
+  remove(): void;
+  searchInFileContent(uiSourceCode: UISourceCode, query: string, caseSensitive: boolean, isRegex: boolean):
       Promise<TextUtils.ContentProvider.SearchMatch[]>;
-  abstract findFilesMatchingSearchRequest(
+  findFilesMatchingSearchRequest(
       searchConfig: ProjectSearchConfig, filesMathingFileQuery: string[],
       progress: Common.Progress.Progress): Promise<string[]>;
-  indexContent(_progress: Common.Progress.Progress): void {
-  }
-  abstract uiSourceCodeForURL(url: string): UISourceCode|null;
-  abstract uiSourceCodes(): UISourceCode[];
+  indexContent(progress: Common.Progress.Progress): void;
+  uiSourceCodeForURL(url: string): UISourceCode|null;
+  uiSourceCodes(): UISourceCode[];
 }
 
 // TODO(crbug.com/1167717): Make this a const enum again
@@ -90,7 +85,7 @@ export enum projectTypes {
   Service = 'service',
 }
 
-export class ProjectStore {
+export abstract class ProjectStore implements Project {
   private readonly workspaceInternal: WorkspaceImpl;
   private readonly idInternal: string;
   private readonly typeInternal: projectTypes;
@@ -100,7 +95,6 @@ export class ProjectStore {
     index: number,
   }>;
   private uiSourceCodesList: UISourceCode[];
-  private readonly project: Project;
 
   constructor(workspace: WorkspaceImpl, id: string, type: projectTypes, displayName: string) {
     this.workspaceInternal = workspace;
@@ -110,14 +104,13 @@ export class ProjectStore {
 
     this.uiSourceCodesMap = new Map();
     this.uiSourceCodesList = [];
-    this.project = (this as unknown as Project);
   }
 
   id(): string {
     return this.idInternal;
   }
 
-  type(): string {
+  type(): projectTypes {
     return this.typeInternal;
   }
 
@@ -130,7 +123,7 @@ export class ProjectStore {
   }
 
   createUISourceCode(url: string, contentType: Common.ResourceType.ResourceType): UISourceCode {
-    return new UISourceCode(this.project, url, contentType);
+    return new UISourceCode(this, url, contentType);
   }
 
   addUISourceCode(uiSourceCode: UISourceCode): boolean {
@@ -166,7 +159,7 @@ export class ProjectStore {
   }
 
   removeProject(): void {
-    this.workspaceInternal.removeProject(this.project);
+    this.workspaceInternal.removeProject(this);
     this.uiSourceCodesMap = new Map();
     this.uiSourceCodesList = [];
   }
@@ -190,6 +183,38 @@ export class ProjectStore {
     this.uiSourceCodesMap.set(newPath, value);
     this.uiSourceCodesMap.delete(oldPath);
   }
+
+  // No-op implementation for a handfull of interface methods.
+
+  rename(
+      _uiSourceCode: UISourceCode, _newName: string,
+      _callback: (arg0: boolean, arg1?: string, arg2?: string, arg3?: Common.ResourceType.ResourceType) => void): void {
+  }
+  excludeFolder(_path: string): void {
+  }
+  deleteFile(_uiSourceCode: UISourceCode): void {
+  }
+  remove(): void {
+  }
+  indexContent(_progress: Common.Progress.Progress): void {
+  }
+
+  abstract isServiceProject(): boolean;
+  abstract requestMetadata(uiSourceCode: UISourceCode): Promise<UISourceCodeMetadata|null>;
+  abstract requestFileContent(uiSourceCode: UISourceCode): Promise<TextUtils.ContentProvider.DeferredContent>;
+  abstract canSetFileContent(): boolean;
+  abstract setFileContent(uiSourceCode: UISourceCode, newContent: string, isBase64: boolean): Promise<void>;
+  abstract fullDisplayName(uiSourceCode: UISourceCode): string;
+  abstract mimeType(uiSourceCode: UISourceCode): string;
+  abstract canRename(): boolean;
+  abstract canExcludeFolder(path: string): boolean;
+  abstract createFile(path: string, name: string|null, content: string, isBase64?: boolean): Promise<UISourceCode|null>;
+  abstract canCreateFile(): boolean;
+  abstract searchInFileContent(uiSourceCode: UISourceCode, query: string, caseSensitive: boolean, isRegex: boolean):
+      Promise<TextUtils.ContentProvider.SearchMatch[]>;
+  abstract findFilesMatchingSearchRequest(
+      searchConfig: ProjectSearchConfig, filesMathingFileQuery: string[],
+      progress: Common.Progress.Progress): Promise<string[]>;
 }
 
 let workspaceInstance: WorkspaceImpl|undefined;

package/front_end/panels/console/ConsoleViewMessage.ts

@@ -56,7 +56,7 @@ import type {Chrome} from '../../../extension-api/ExtensionAPI.js'; // eslint-di
 import {format} from './ConsoleFormat.js';
 import type {ConsoleViewportElement} from './ConsoleViewport.js';
 import consoleViewStyles from './consoleView.css.js';
-import {parseSourcePositionsFromErrorStack} from './ErrorStackParser.js';
+import {augmentErrorStackWithScriptIds, parseSourcePositionsFromErrorStack} from './ErrorStackParser.js';
 
 const UIStrings = {
   /**
@@ -236,6 +236,9 @@ export class ConsoleViewMessage implements ConsoleViewportElement {
   private requestResolver: Logs.RequestResolver.RequestResolver;
   private issueResolver: IssuesManager.IssueResolver.IssueResolver;
 
+  /** Formatting Error#stack is asynchronous. Allow tests to wait for the result */
+  #formatErrorStackPromiseForTest = Promise.resolve();
+
   constructor(
       consoleMessage: SDK.ConsoleModel.ConsoleMessage, linkifier: Components.Linkifier.Linkifier,
       requestResolver: Logs.RequestResolver.RequestResolver, issueResolver: IssuesManager.IssueResolver.IssueResolver,
@@ -307,6 +310,10 @@ export class ConsoleViewMessage implements ConsoleViewportElement {
     return this.message;
   }
 
+  formatErrorStackPromiseForTest(): Promise<void> {
+    return this.#formatErrorStackPromiseForTest;
+  }
+
   protected buildMessage(): HTMLElement {
     let messageElement;
     let messageText: Common.UIString.LocalizedString|string = this.message.messageText;
@@ -816,11 +823,28 @@ export class ConsoleViewMessage implements ConsoleViewportElement {
 
   private formatParameterAsError(output: SDK.RemoteObject.RemoteObject): HTMLElement {
     const result = document.createElement('span');
-    const errorSpan = this.tryFormatAsError(output.description || '');
-    result.appendChild(errorSpan ? errorSpan : this.linkifyStringAsFragment(output.description || ''));
+    const errorStack = output.description || '';
+
+    // Combine the ExceptionDetails for this error object with the parsed Error#stack.
+    // The Exceptiondetails include script IDs for stack frames, which allows more accurate
+    // linking.
+    this.#formatErrorStackPromiseForTest = this.retrieveExceptionDetails(output).then(exceptionDetails => {
+      const errorSpan = this.tryFormatAsError(errorStack, exceptionDetails);
+      result.appendChild(errorSpan ?? this.linkifyStringAsFragment(errorStack));
+    });
+
     return result;
   }
 
+  private async retrieveExceptionDetails(errorObject: SDK.RemoteObject.RemoteObject):
+      Promise<Protocol.Runtime.ExceptionDetails|undefined> {
+    const runtimeModel = this.message.runtimeModel();
+    if (runtimeModel && errorObject.objectId) {
+      return runtimeModel.getExceptionDetails(errorObject.objectId);
+    }
+    return undefined;
+  }
+
   private formatAsArrayEntry(output: SDK.RemoteObject.RemoteObject): HTMLElement {
     return this.previewFormatter.renderPropertyPreview(
         output.type, output.subtype, output.className, output.description);
@@ -1422,7 +1446,7 @@ export class ConsoleViewMessage implements ConsoleViewportElement {
     return true;
   }
 
-  private tryFormatAsError(string: string): HTMLElement|null {
+  private tryFormatAsError(string: string, exceptionDetails?: Protocol.Runtime.ExceptionDetails): HTMLElement|null {
     const runtimeModel = this.message.runtimeModel();
     if (!runtimeModel) {
       return null;
@@ -1432,6 +1456,9 @@ export class ConsoleViewMessage implements ConsoleViewportElement {
     if (!linkInfos?.length) {
       return null;
     }
+    if (exceptionDetails?.stackTrace) {
+      augmentErrorStackWithScriptIds(linkInfos, exceptionDetails.stackTrace);
+    }
 
     const debuggerModel = runtimeModel.debuggerModel();
     const formattedResult = document.createElement('span');
@@ -1447,8 +1474,8 @@ export class ConsoleViewMessage implements ConsoleViewportElement {
       const suffix = `${line.substring(link.positionRight)}${newline}`;
 
       formattedLine.appendChild(this.linkifyStringAsFragment(prefix));
-      const scriptLocationLink =
-          this.linkifier.linkifyScriptLocation(debuggerModel.target(), null, link.url, link.lineNumber, {
+      const scriptLocationLink = this.linkifier.linkifyScriptLocation(
+          debuggerModel.target(), link.scriptId || null, link.url, link.lineNumber, {
             columnNumber: link.columnNumber,
             className: undefined,
             tabStop: undefined,

package/front_end/panels/console/ErrorStackParser.ts

@@ -4,6 +4,7 @@
 
 import * as Common from '../../core/common/common.js';
 import type * as SDK from '../../core/sdk/sdk.js';
+import type * as Protocol from '../../generated/protocol.js';
 
 export interface ParsedErrorFrame {
   line: string;
@@ -11,6 +12,7 @@ export interface ParsedErrorFrame {
     url: string,
     lineNumber?: number,
     columnNumber?: number, enclosedInBraces: boolean, positionLeft: number, positionRight: number,
+    scriptId?: Protocol.Runtime.ScriptId,
   };
 }
 
@@ -115,3 +117,35 @@ function parseOrScriptMatch(debuggerModel: SDK.DebuggerModel.DebuggerModel, url:
   }
   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;
+}