chrome-devtools-frontend 1.0.1660788 → 1.0.1661063

package/front_end/models/issues_manager/IssuesManager.ts

@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 import * as Common from '../../core/common/common.js';
+import * as Root from '../../core/root/root.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import * as Protocol from '../../generated/protocol.js';
 
-import {AttributionReportingIssue} from './AttributionReportingIssue.js';
 import {BounceTrackingIssue} from './BounceTrackingIssue.js';
 import {ClientHintIssue} from './ClientHintIssue.js';
 import {ConnectionAllowlistIssue} from './ConnectionAllowlistIssue.js';
@@ -38,8 +38,6 @@ import {UnencodedDigestIssue} from './UnencodedDigestIssue.js';
 
 export {Events} from './IssuesManagerEvents.js';
 
-let issuesManagerInstance: IssuesManager|null = null;
-
 function createIssuesForBlockedByResponseIssue(
     issuesModel: SDK.IssuesModel.IssuesModel|null,
     inspectorIssue: Protocol.Audits.InspectorIssue): CrossOriginEmbedderPolicyIssue[] {
@@ -54,111 +52,109 @@ function createIssuesForBlockedByResponseIssue(
   return [];
 }
 
-const issueCodeHandlers = new Map<
-    Protocol.Audits.InspectorIssueCode,
-    (model: SDK.IssuesModel.IssuesModel|null, inspectorIssue: Protocol.Audits.InspectorIssue) => Issue[]>([
-  [
-    Protocol.Audits.InspectorIssueCode.CookieIssue,
-    CookieIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.MixedContentIssue,
-    MixedContentIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.HeavyAdIssue,
-    HeavyAdIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.ContentSecurityPolicyIssue,
-    ContentSecurityPolicyIssue.fromInspectorIssue,
-  ],
-  [Protocol.Audits.InspectorIssueCode.BlockedByResponseIssue, createIssuesForBlockedByResponseIssue],
-  [
-    Protocol.Audits.InspectorIssueCode.SharedArrayBufferIssue,
-    SharedArrayBufferIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.SharedDictionaryIssue,
-    SharedDictionaryIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.CorsIssue,
-    CorsIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.QuirksModeIssue,
-    QuirksModeIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.AttributionReportingIssue,
-    AttributionReportingIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.GenericIssue,
-    GenericIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.DeprecationIssue,
-    DeprecationIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.ClientHintIssue,
-    ClientHintIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.EmailVerificationRequestIssue,
-    EmailVerificationRequestIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.FederatedAuthRequestIssue,
-    FederatedAuthRequestIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.BounceTrackingIssue,
-    BounceTrackingIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.StylesheetLoadingIssue,
-    StylesheetLoadingIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.PartitioningBlobURLIssue,
-    PartitioningBlobURLIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.PropertyRuleIssue,
-    PropertyRuleIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.CookieDeprecationMetadataIssue,
-    CookieDeprecationMetadataIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.ElementAccessibilityIssue,
-    ElementAccessibilityIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.SRIMessageSignatureIssue,
-    SRIMessageSignatureIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.UnencodedDigestIssue,
-    UnencodedDigestIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.ConnectionAllowlistIssue,
-    ConnectionAllowlistIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.PermissionElementIssue,
-    PermissionElementIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.SelectivePermissionsInterventionIssue,
-    SelectivePermissionsInterventionIssue.fromInspectorIssue,
-  ],
-]);
+const issueCodeHandlers =
+    new Map<Protocol.Audits.InspectorIssueCode,
+            (model: SDK.IssuesModel.IssuesModel|null, inspectorIssue: Protocol.Audits.InspectorIssue,
+             frameManager: SDK.FrameManager.FrameManager) => Issue[]>(
+        [
+          [
+            Protocol.Audits.InspectorIssueCode.CookieIssue,
+            CookieIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.MixedContentIssue,
+            MixedContentIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.HeavyAdIssue,
+            HeavyAdIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.ContentSecurityPolicyIssue,
+            ContentSecurityPolicyIssue.fromInspectorIssue,
+          ],
+          [Protocol.Audits.InspectorIssueCode.BlockedByResponseIssue, createIssuesForBlockedByResponseIssue],
+          [
+            Protocol.Audits.InspectorIssueCode.SharedArrayBufferIssue,
+            SharedArrayBufferIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.SharedDictionaryIssue,
+            SharedDictionaryIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.CorsIssue,
+            CorsIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.QuirksModeIssue,
+            QuirksModeIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.GenericIssue,
+            GenericIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.DeprecationIssue,
+            DeprecationIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.ClientHintIssue,
+            ClientHintIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.EmailVerificationRequestIssue,
+            EmailVerificationRequestIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.FederatedAuthRequestIssue,
+            FederatedAuthRequestIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.BounceTrackingIssue,
+            BounceTrackingIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.StylesheetLoadingIssue,
+            StylesheetLoadingIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.PartitioningBlobURLIssue,
+            PartitioningBlobURLIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.PropertyRuleIssue,
+            PropertyRuleIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.CookieDeprecationMetadataIssue,
+            CookieDeprecationMetadataIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.ElementAccessibilityIssue,
+            ElementAccessibilityIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.SRIMessageSignatureIssue,
+            SRIMessageSignatureIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.UnencodedDigestIssue,
+            UnencodedDigestIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.ConnectionAllowlistIssue,
+            ConnectionAllowlistIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.PermissionElementIssue,
+            PermissionElementIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.SelectivePermissionsInterventionIssue,
+            SelectivePermissionsInterventionIssue.fromInspectorIssue,
+          ],
+        ]);
 
 export function isIssueCodeSupported(code: Protocol.Audits.InspectorIssueCode): boolean {
   return issueCodeHandlers.has(code);
@@ -169,10 +165,11 @@ export function isIssueCodeSupported(code: Protocol.Audits.InspectorIssueCode):
  * Handlers are simple functions hard-coded into a map.
  */
 export function createIssuesFromProtocolIssue(
-    issuesModel: SDK.IssuesModel.IssuesModel|null, inspectorIssue: Protocol.Audits.InspectorIssue): Issue[] {
+    issuesModel: SDK.IssuesModel.IssuesModel|null, inspectorIssue: Protocol.Audits.InspectorIssue,
+    frameManager: SDK.FrameManager.FrameManager = SDK.FrameManager.FrameManager.instance()): Issue[] {
   const handler = issueCodeHandlers.get(inspectorIssue.code);
   if (handler) {
-    return handler(issuesModel, inspectorIssue);
+    return handler(issuesModel, inspectorIssue, frameManager);
   }
   console.warn(`No handler registered for issue code ${inspectorIssue.code}`);
   return [];
@@ -199,9 +196,9 @@ export function defaultHideIssueByCodeSetting(): HideIssueMenuSetting {
   return setting;
 }
 
-export function getHideIssueByCodeSetting(): Common.Settings.Setting<HideIssueMenuSetting> {
-  return Common.Settings.Settings.instance().createSetting(
-      'hide-issue-by-code-setting-experiment-2021', defaultHideIssueByCodeSetting());
+export function getHideIssueByCodeSetting(settings: Common.Settings.Settings = Common.Settings.Settings.instance()):
+    Common.Settings.Setting<HideIssueMenuSetting> {
+  return settings.createSetting('hide-issue-by-code-setting-experiment-2021', defaultHideIssueByCodeSetting());
 }
 
 /**
@@ -226,17 +223,20 @@ export class IssuesManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes
   #issuesById = new Map<string, Issue>();
   #issuesByOutermostTarget: WeakMap<SDK.Target.Target, Set<Issue>> = new Map();
   #frameManager: SDK.FrameManager.FrameManager;
+  #targetManager: SDK.TargetManager.TargetManager;
 
   constructor(private readonly showThirdPartyIssuesSetting?: Common.Settings.Setting<boolean>,
               private readonly hideIssueSetting?: Common.Settings.Setting<HideIssueMenuSetting>,
-              frameManager: SDK.FrameManager.FrameManager = SDK.FrameManager.FrameManager.instance()) {
+              frameManager: SDK.FrameManager.FrameManager = SDK.FrameManager.FrameManager.instance(),
+              targetManager: SDK.TargetManager.TargetManager = SDK.TargetManager.TargetManager.instance()) {
     super();
     this.#frameManager = frameManager;
+    this.#targetManager = targetManager;
     new SourceFrameIssuesManager(this);
-    SDK.TargetManager.TargetManager.instance().observeModels(SDK.IssuesModel.IssuesModel, this);
-    SDK.TargetManager.TargetManager.instance().addModelListener(
-        SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.PrimaryPageChanged,
-        this.#onPrimaryPageChanged, this);
+    this.#targetManager.observeModels(SDK.IssuesModel.IssuesModel, this);
+    this.#targetManager.addModelListener(SDK.ResourceTreeModel.ResourceTreeModel,
+                                         SDK.ResourceTreeModel.Events.PrimaryPageChanged, this.#onPrimaryPageChanged,
+                                         this);
     this.#frameManager.addEventListener(SDK.FrameManager.Events.FRAME_ADDED_TO_TARGET, this.#onFrameAddedToTarget,
                                         this);
 
@@ -244,37 +244,36 @@ export class IssuesManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes
     // a full update when the setting changes to get an up-to-date issues list.
     this.showThirdPartyIssuesSetting?.addChangeListener(() => this.#updateFilteredIssues());
     this.hideIssueSetting?.addChangeListener(() => this.#updateFilteredIssues());
-    SDK.TargetManager.TargetManager.instance().observeTargets(
-        {
-          targetAdded: (target: SDK.Target.Target) => {
-            if (target.outermostTarget() === target) {
-              this.#updateFilteredIssues();
-            }
-          },
-          targetRemoved: (_: SDK.Target.Target) => {},
-        },
-        {scoped: true});
+    this.#targetManager.observeTargets({
+      targetAdded: (target: SDK.Target.Target) => {
+        if (target.outermostTarget() === target) {
+          this.#updateFilteredIssues();
+        }
+      },
+      targetRemoved: (_: SDK.Target.Target) => {},
+    },
+                                       {scoped: true});
   }
 
   static instance(opts: IssuesManagerCreationOptions = {
     forceNew: false,
     ensureFirst: false,
   }): IssuesManager {
-    if (issuesManagerInstance && opts.ensureFirst) {
+    if (Root.DevToolsContext.globalInstance().has(IssuesManager) && opts.ensureFirst) {
       throw new Error(
           'IssuesManager was already created. Either set "ensureFirst" to false or make sure that this invocation is really the first one.');
     }
 
-    if (!issuesManagerInstance || opts.forceNew) {
-      issuesManagerInstance =
-          new IssuesManager(opts.showThirdPartyIssuesSetting, opts.hideIssueSetting, opts.frameManager);
+    if (!Root.DevToolsContext.globalInstance().has(IssuesManager) || opts.forceNew) {
+      Root.DevToolsContext.globalInstance().set(
+          IssuesManager, new IssuesManager(opts.showThirdPartyIssuesSetting, opts.hideIssueSetting, opts.frameManager));
     }
 
-    return issuesManagerInstance;
+    return Root.DevToolsContext.globalInstance().get(IssuesManager);
   }
 
   static removeInstance(): void {
-    issuesManagerInstance = null;
+    Root.DevToolsContext.globalInstance().delete(IssuesManager);
   }
 
   #onPrimaryPageChanged(
@@ -311,7 +310,7 @@ export class IssuesManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes
     // When DevTools is opened after navigation has completed, issues may be received
     // before the outermost frame is available. Thus, we trigger a recalcuation of third-party-ness
     // when we attach to the outermost frame.
-    if (frame.isOutermostFrame() && SDK.TargetManager.TargetManager.instance().isInScope(frame.resourceTreeModel())) {
+    if (frame.isOutermostFrame() && this.#targetManager.isInScope(frame.resourceTreeModel())) {
       this.#updateFilteredIssues();
     }
   }
@@ -331,7 +330,7 @@ export class IssuesManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes
   #onIssueAddedEvent(event: Common.EventTarget.EventTargetEvent<SDK.IssuesModel.IssueAddedEvent>): void {
     const {issuesModel, inspectorIssue} = event.data;
 
-    const issues = createIssuesFromProtocolIssue(issuesModel, inspectorIssue);
+    const issues = createIssuesFromProtocolIssue(issuesModel, inspectorIssue, this.#frameManager);
     for (const issue of issues) {
       this.addIssue(issuesModel, issue);
       const message = issue.maybeCreateConsoleMessage();
@@ -425,7 +424,7 @@ export class IssuesManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes
   }
 
   #issueFilter(issue: Issue): boolean {
-    const scopeTarget = SDK.TargetManager.TargetManager.instance().scopeTarget();
+    const scopeTarget = this.#targetManager.scopeTarget();
     if (!scopeTarget) {
       return false;
     }

package/front_end/models/issues_manager/issues_manager.ts

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import * as AttributionReportingIssue from './AttributionReportingIssue.js';
 import * as CheckFormsIssuesTrigger from './CheckFormsIssuesTrigger.js';
 import * as ClientHintIssue from './ClientHintIssue.js';
 import * as ConnectionAllowlistIssue from './ConnectionAllowlistIssue.js';
@@ -37,7 +36,6 @@ import * as StylesheetLoadingIssue from './StylesheetLoadingIssue.js';
 import * as UnencodedDigestIssue from './UnencodedDigestIssue.js';
 
 export {
-  AttributionReportingIssue,
   CheckFormsIssuesTrigger,
   ClientHintIssue,
   ConnectionAllowlistIssue,

package/front_end/models/persistence/AutomaticFileSystemWorkspaceBinding.ts

@@ -6,6 +6,7 @@ import * as Common from '../../core/common/common.js';
 import * as Host from '../../core/host/host.js';
 import type * as Platform from '../../core/platform/platform.js';
 import * as Root from '../../core/root/root.js';
+import type * as SDK from '../../core/sdk/sdk.js';
 import type {ContentDataOrError} from '../text_utils/ContentData.js';
 import type {SearchMatch} from '../text_utils/ContentProvider.js';
 import * as Workspace from '../workspace/workspace.js';
@@ -168,6 +169,10 @@ export class FileSystem implements Workspace.Workspace.Project {
   uiSourceCodes(): Iterable<Workspace.UISourceCode.UISourceCode> {
     return [];
   }
+
+  target(): SDK.Target.Target|null {
+    return null;
+  }
 }
 
 /**

package/front_end/models/source_map_scopes/FunctionCodeResolver.ts

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import type * as Common from '../../core/common/common.js';
 import type * as Platform from '../../core/platform/platform.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import * as Bindings from '../bindings/bindings.js';
@@ -41,8 +42,9 @@ interface InputData {
 
 const inputCache = new WeakMap<Workspace.UISourceCode.UISourceCode, Promise<InputData>>();
 
-async function prepareInput(uiSourceCode: Workspace.UISourceCode.UISourceCode, content: string): Promise<InputData> {
-  const formattedContent = await format(uiSourceCode, content);
+async function prepareInput(uiSourceCode: Workspace.UISourceCode.UISourceCode, content: string,
+                            settings: Common.Settings.Settings): Promise<InputData> {
+  const formattedContent = await format(uiSourceCode, content, settings);
   const text = new TextUtils.Text.Text(formattedContent ? formattedContent.formattedContent : content);
   let performanceData = uiSourceCode.getDecorationData(Workspace.UISourceCode.DecoratorType.PERFORMANCE) as
           Workspace.UISourceCode.LineColumnProfileMap |
@@ -59,14 +61,14 @@ async function prepareInput(uiSourceCode: Workspace.UISourceCode.UISourceCode, c
 }
 
 /** Formatting and parsing line endings for Text is expensive, so cache it. */
-async function prepareInputAndCache(
-    uiSourceCode: Workspace.UISourceCode.UISourceCode, content: string): Promise<InputData> {
+async function prepareInputAndCache(uiSourceCode: Workspace.UISourceCode.UISourceCode, content: string,
+                                    settings: Common.Settings.Settings): Promise<InputData> {
   let cachedPromise = inputCache.get(uiSourceCode);
   if (cachedPromise) {
     return await cachedPromise;
   }
 
-  cachedPromise = prepareInput(uiSourceCode, content);
+  cachedPromise = prepareInput(uiSourceCode, content, settings);
   inputCache.set(uiSourceCode, cachedPromise);
   return await cachedPromise;
 }
@@ -224,7 +226,7 @@ export async function getFunctionCodeFromLocation(
   const debuggerWorkspaceBinding = Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding.instance();
   const projects = debuggerWorkspaceBinding.workspace.projectsForType(Workspace.Workspace.projectTypes.Network);
   for (const project of projects) {
-    if (Bindings.NetworkProject.NetworkProject.getTargetForProject(project) !== target) {
+    if (project.target() !== target) {
       continue;
     }
     uiSourceCode = project.uiSourceCodeForURL(url);
@@ -246,8 +248,8 @@ export async function getFunctionCodeFromLocation(
   return await getFunctionCodeFromRawLocation(rawLocation, options);
 }
 
-async function format(uiSourceCode: Workspace.UISourceCode.UISourceCode, content: string):
-    Promise<Formatter.ScriptFormatter.FormattedContent|null> {
+async function format(uiSourceCode: Workspace.UISourceCode.UISourceCode, content: string,
+                      settings: Common.Settings.Settings): Promise<Formatter.ScriptFormatter.FormattedContent|null> {
   const contentType = uiSourceCode.contentType();
   const shouldFormat = !contentType.isFromSourceMap() && (contentType.isDocument() || contentType.isScript()) &&
       TextUtils.TextUtils.isMinified(content);
@@ -255,7 +257,7 @@ async function format(uiSourceCode: Workspace.UISourceCode.UISourceCode, content
     return null;
   }
 
-  return await Formatter.ScriptFormatter.formatScriptContent(contentType.canonicalMimeType(), content, '\t');
+  return await Formatter.ScriptFormatter.formatScriptContent(settings, contentType.canonicalMimeType(), content, '\t');
 }
 
 /**
@@ -275,6 +277,7 @@ export async function getFunctionCodeFromRawLocation(
     return null;
   }
 
-  const inputData = await prepareInputAndCache(functionBounds.uiSourceCode, content);
+  const settings = rawLocation.debuggerModel.target().targetManager().settings;
+  const inputData = await prepareInputAndCache(functionBounds.uiSourceCode, content, settings);
   return createFunctionCode(inputData, functionBounds, options);
 }

package/front_end/models/workspace/WorkspaceImpl.ts

@@ -5,6 +5,7 @@
 import * as Common from '../../core/common/common.js';
 import type * as Platform from '../../core/platform/platform.js';
 import * as Root from '../../core/root/root.js';
+import type * as SDK from '../../core/sdk/sdk.js';
 import type * as TextUtils from '../text_utils/text_utils.js';
 
 import type {SearchConfig} from './SearchConfig.js';
@@ -54,6 +55,7 @@ export interface Project {
    * @returns an iterator for the sources provided by this project.
    */
   uiSourceCodes(): Iterable<UISourceCode>;
+  target(): SDK.Target.Target|null;
 }
 
 /* eslint-disable @typescript-eslint/naming-convention -- Used by web_tests. */
@@ -74,12 +76,15 @@ export abstract class ProjectStore implements Project {
   readonly #type: projectTypes;
   readonly #displayName: string;
   readonly #uiSourceCodes = new Map<Platform.DevToolsPath.UrlString, UISourceCode>();
+  readonly #target: SDK.Target.Target|null = null;
 
-  constructor(workspace: WorkspaceImpl, id: string, type: projectTypes, displayName: string) {
+  constructor(workspace: WorkspaceImpl, id: string, type: projectTypes, displayName: string,
+              target: SDK.Target.Target|null = null) {
     this.#workspace = workspace;
     this.#id = id;
     this.#type = type;
     this.#displayName = displayName;
+    this.#target = target;
   }
 
   id(): string {
@@ -135,6 +140,10 @@ export abstract class ProjectStore implements Project {
     return this.#uiSourceCodes.values();
   }
 
+  target(): SDK.Target.Target|null {
+    return this.#target;
+  }
+
   renameUISourceCode(uiSourceCode: UISourceCode, newName: string): void {
     const oldPath = uiSourceCode.url();
     const newPath = uiSourceCode.parentURL() ?

package/front_end/models/workspace_diff/WorkspaceDiff.ts

@@ -19,6 +19,7 @@ interface DiffResponse {
 export class WorkspaceDiffImpl extends Common.ObjectWrapper.ObjectWrapper<EventTypes> {
   readonly #persistence: Persistence.Persistence.PersistenceImpl;
   readonly #networkPersistenceManager: Persistence.NetworkPersistenceManager.NetworkPersistenceManager;
+  readonly #settings: Common.Settings.Settings;
   readonly #diffs = new WeakMap<Workspace.UISourceCode.UISourceCode, UISourceCodeDiff>();
   /** used in web tests */
   private readonly loadingUISourceCodes =
@@ -30,10 +31,12 @@ export class WorkspaceDiffImpl extends Common.ObjectWrapper.ObjectWrapper<EventT
       persistence: Persistence.Persistence.PersistenceImpl = Persistence.Persistence.PersistenceImpl.instance(),
       networkPersistenceManager: Persistence.NetworkPersistenceManager.NetworkPersistenceManager =
           Persistence.NetworkPersistenceManager.NetworkPersistenceManager.instance(),
+      settings: Common.Settings.Settings = Common.Settings.Settings.instance(),
   ) {
     super();
     this.#persistence = persistence;
     this.#networkPersistenceManager = networkPersistenceManager;
+    this.#settings = settings;
     workspace.addEventListener(Workspace.Workspace.Events.WorkingCopyChanged, this.#uiSourceCodeChanged, this);
     workspace.addEventListener(Workspace.Workspace.Events.WorkingCopyCommitted, this.#uiSourceCodeChanged, this);
     workspace.addEventListener(Workspace.Workspace.Events.UISourceCodeAdded, this.#uiSourceCodeAdded, this);
@@ -63,7 +66,7 @@ export class WorkspaceDiffImpl extends Common.ObjectWrapper.ObjectWrapper<EventT
   #uiSourceCodeDiff(uiSourceCode: Workspace.UISourceCode.UISourceCode): UISourceCodeDiff {
     let diff = this.#diffs.get(uiSourceCode);
     if (!diff) {
-      diff = new UISourceCodeDiff(uiSourceCode, this.#networkPersistenceManager);
+      diff = new UISourceCodeDiff(uiSourceCode, this.#networkPersistenceManager, this.#settings);
       this.#diffs.set(uiSourceCode, diff);
     }
     return diff;
@@ -205,16 +208,19 @@ export interface EventTypes {
 export class UISourceCodeDiff extends Common.ObjectWrapper.ObjectWrapper<UISourceCodeDiffEventTypes> {
   #uiSourceCode: Workspace.UISourceCode.UISourceCode;
   readonly #networkPersistenceManager: Persistence.NetworkPersistenceManager.NetworkPersistenceManager;
+  readonly #settings: Common.Settings.Settings;
   #requestDiffPromise: Promise<DiffResponse|null>|null = null;
   #pendingChanges: number|null = null;
   dispose = false;
   constructor(
       uiSourceCode: Workspace.UISourceCode.UISourceCode,
       networkPersistenceManager: Persistence.NetworkPersistenceManager.NetworkPersistenceManager,
+      settings: Common.Settings.Settings = Common.Settings.Settings.instance(),
   ) {
     super();
     this.#uiSourceCode = uiSourceCode;
     this.#networkPersistenceManager = networkPersistenceManager;
+    this.#settings = settings;
     uiSourceCode.addEventListener(Workspace.UISourceCode.Events.WorkingCopyChanged, this.#uiSourceCodeChanged, this);
     uiSourceCode.addEventListener(Workspace.UISourceCode.Events.WorkingCopyCommitted, this.#uiSourceCodeChanged, this);
   }
@@ -293,11 +299,11 @@ export class UISourceCodeDiff extends Common.ObjectWrapper.ObjectWrapper<UISourc
       return null;
     }
 
-    baseline = (await FormatterModule.ScriptFormatter.format(
-                    this.#uiSourceCode.contentType(), this.#uiSourceCode.mimeType(), baseline))
+    baseline = (await FormatterModule.ScriptFormatter.format(this.#settings, this.#uiSourceCode.contentType(),
+                                                             this.#uiSourceCode.mimeType(), baseline))
                    .formattedContent;
     const formatCurrentResult = await FormatterModule.ScriptFormatter.format(
-        this.#uiSourceCode.contentType(), this.#uiSourceCode.mimeType(), current);
+        this.#settings, this.#uiSourceCode.contentType(), this.#uiSourceCode.mimeType(), current);
     current = formatCurrentResult.formattedContent;
     const formattedCurrentMapping = formatCurrentResult.formattedMapping;
     const reNewline = /\r\n?|\n/;

package/front_end/panels/ai_assistance/components/ChatMessage.ts

@@ -1409,7 +1409,8 @@ async function makeSourceCodeWidget(widgetData: SourceCodeAiWidget): Promise<Wid
   let code = widgetData.data.code;
   if (TextUtils.TextUtils.isMinified(code)) {
     const canonicalMimeType = uiSourceCode?.contentType().canonicalMimeType() || 'text/javascript';
-    const formatted = await Formatter.ScriptFormatter.formatScriptContent(canonicalMimeType, code, '  ');
+    const formatted = await Formatter.ScriptFormatter.formatScriptContent(Common.Settings.Settings.instance(),
+                                                                          canonicalMimeType, code, '  ');
     code = formatted.formattedContent;
   }
 

package/front_end/panels/application/FrameDetailsView.ts

@@ -932,7 +932,7 @@ export class FrameDetailsReportView extends UI.Widget.Widget {
 
   #uiSourceCodeForFrame(frame: SDK.ResourceTreeModel.ResourceTreeFrame): Workspace.UISourceCode.UISourceCode|null {
     for (const project of Workspace.Workspace.WorkspaceImpl.instance().projects()) {
-      const projectTarget = Bindings.NetworkProject.NetworkProject.getTargetForProject(project);
+      const projectTarget = project.target();
       if (projectTarget && projectTarget === frame.resourceTreeModel().target()) {
         const uiSourceCode = project.uiSourceCodeForURL(frame.url);
         if (uiSourceCode) {