chrome-devtools-frontend 1.0.1664496 → 1.0.1665921

package/front_end/models/bindings/DebuggerLanguagePlugins.ts

@@ -20,39 +20,38 @@ import {NetworkProject} from './NetworkProject.js';
 
 const UIStrings = {
   /**
-   * @description Error message that is displayed in the Console when language #plugins report errors
+   * @description Error message displayed in the Console panel when language plugins report errors.
    * @example {File not found} PH1
    */
   errorInDebuggerLanguagePlugin: 'Error in debugger language plugin: {PH1}',
   /**
-   * @description Status message that is shown in the Console when debugging information is being
-   *loaded. The 2nd and 3rd placeholders are URLs.
+   * @description Status message shown in the Console panel when debugging information is being loaded. PH2 and PH3 are URLs.
    * @example {C/C++ DevTools Support (DWARF)} PH1
    * @example {http://web.dev/file.wasm} PH2
    * @example {http://web.dev/file.wasm.debug.wasm} PH3
    */
   loadingDebugSymbolsForVia: '[{PH1}] Loading debug symbols for {PH2} (via {PH3})…',
   /**
-   * @description Status message that is shown in the Console when debugging information is being loaded
+   * @description Status message shown in the Console panel when debugging information is being loaded.
    * @example {C/C++ DevTools Support (DWARF)} PH1
    * @example {http://web.dev/file.wasm} PH2
    */
   loadingDebugSymbolsFor: '[{PH1}] Loading debug symbols for {PH2}…',
   /**
-   * @description Warning message that is displayed in the Console when debugging information was loaded, but no source files were found
+   * @description Warning message displayed in the Console panel when debugging information was loaded, but no source files were found.
    * @example {C/C++ DevTools Support (DWARF)} PH1
    * @example {http://web.dev/file.wasm} PH2
    */
   loadedDebugSymbolsForButDidnt: '[{PH1}] Loaded debug symbols for {PH2}, but didn’t find any source files',
   /**
-   * @description Status message that is shown in the Console when debugging information is successfully loaded
+   * @description Status message shown in the Console panel when debugging information is successfully loaded.
    * @example {C/C++ DevTools Support (DWARF)} PH1
    * @example {http://web.dev/file.wasm} PH2
    * @example {42} PH3
    */
   loadedDebugSymbolsForFound: '[{PH1}] Loaded debug symbols for {PH2}, found {PH3} source file(s)',
   /**
-   * @description Error message that is displayed in the Console when debugging information cannot be loaded
+   * @description Error message displayed in the Console panel when debugging information cannot be loaded.
    * @example {C/C++ DevTools Support (DWARF)} PH1
    * @example {http://web.dev/file.wasm} PH2
    * @example {File not found} PH3

package/front_end/models/bindings/DebuggerWorkspaceBinding.ts

@@ -18,7 +18,7 @@ import {DebuggerLanguagePluginManager} from './DebuggerLanguagePlugins.js';
 import {DefaultScriptMapping} from './DefaultScriptMapping.js';
 import {type LiveLocation, type LiveLocationPool, LiveLocationWithPool} from './LiveLocation.js';
 import {NetworkProject} from './NetworkProject.js';
-import type {ResourceMapping} from './ResourceMapping.js';
+import type {DebuggerLocationUpdater, ResourceMapping} from './ResourceMapping.js';
 import {type ResourceScriptFile, ResourceScriptMapping} from './ResourceScriptMapping.js';
 import {
   isErrorLike,
@@ -27,7 +27,8 @@ import {
   UnparsableError,
 } from './SymbolizedError.js';
 
-export class DebuggerWorkspaceBinding implements SDK.TargetManager.SDKModelObserver<SDK.DebuggerModel.DebuggerModel> {
+export class DebuggerWorkspaceBinding implements SDK.TargetManager.SDKModelObserver<SDK.DebuggerModel.DebuggerModel>,
+                                                 DebuggerLocationUpdater {
   readonly resourceMapping: ResourceMapping;
   readonly #debuggerModelToData: Map<SDK.DebuggerModel.DebuggerModel, ModelData>;
   readonly #liveLocationPromises: Set<unknown>;
@@ -40,7 +41,7 @@ export class DebuggerWorkspaceBinding implements SDK.TargetManager.SDKModelObser
       resourceMapping: ResourceMapping, targetManager: SDK.TargetManager.TargetManager,
       ignoreListManager: Workspace.IgnoreListManager.IgnoreListManager, workspace: Workspace.Workspace.WorkspaceImpl) {
     this.resourceMapping = resourceMapping;
-    this.resourceMapping.debuggerWorkspaceBinding = this;
+    this.resourceMapping.debuggerLocationUpdater = this;
     this.ignoreListManager = ignoreListManager;
     this.workspace = workspace;
     this.#settings = targetManager.settings;
@@ -661,7 +662,7 @@ class ModelData {
           uiSourceCode: uiLocation.uiSourceCode,
           name: functionName,
           line: uiLocation.lineNumber,
-          column: uiLocation.columnNumber ?? -1
+          column: uiLocation.columnNumber ?? -1,
         }]);
         return;
       }

package/front_end/models/bindings/PresentationConsoleMessageHelper.ts

@@ -9,8 +9,8 @@ import * as TextUtils from '../../core/text_utils/text_utils.js';
 import * as Protocol from '../../generated/protocol.js';
 import * as Workspace from '../workspace/workspace.js';
 
-import {CSSWorkspaceBinding} from './CSSWorkspaceBinding.js';
-import {DebuggerWorkspaceBinding} from './DebuggerWorkspaceBinding.js';
+import type {CSSWorkspaceBinding} from './CSSWorkspaceBinding.js';
+import type {DebuggerWorkspaceBinding} from './DebuggerWorkspaceBinding.js';
 import {type LiveLocation, LiveLocationPool, LiveLocationWithPool} from './LiveLocation.js';
 
 export interface MessageSource {
@@ -25,14 +25,28 @@ export class PresentationSourceFrameMessageManager implements
     SDK.TargetManager.SDKModelObserver<SDK.DebuggerModel.DebuggerModel>,
     SDK.TargetManager.SDKModelObserver<SDK.CSSModel.CSSModel> {
   #targetToMessageHelperMap = new WeakMap<SDK.Target.Target, PresentationSourceFrameMessageHelper>();
-  constructor() {
-    SDK.TargetManager.TargetManager.instance().observeModels(SDK.DebuggerModel.DebuggerModel, this);
-    SDK.TargetManager.TargetManager.instance().observeModels(SDK.CSSModel.CSSModel, this);
+  #targetManager: SDK.TargetManager.TargetManager;
+  readonly #workspace: Workspace.Workspace.WorkspaceImpl;
+  readonly #debuggerWorkspaceBinding: DebuggerWorkspaceBinding;
+  readonly #cssWorkspaceBinding: CSSWorkspaceBinding;
+  constructor(targetManager: SDK.TargetManager.TargetManager, workspace: Workspace.Workspace.WorkspaceImpl,
+              debuggerWorkspaceBinding: DebuggerWorkspaceBinding, cssWorkspaceBinding: CSSWorkspaceBinding) {
+    this.#workspace = workspace;
+    this.#targetManager = targetManager;
+    this.#debuggerWorkspaceBinding = debuggerWorkspaceBinding;
+    this.#cssWorkspaceBinding = cssWorkspaceBinding;
+  }
+
+  enable(): void {
+    this.#targetManager.observeModels(SDK.DebuggerModel.DebuggerModel, this);
+    this.#targetManager.observeModels(SDK.CSSModel.CSSModel, this);
   }
 
   modelAdded(model: SDK.DebuggerModel.DebuggerModel|SDK.CSSModel.CSSModel): void {
     const target = model.target();
-    const helper = this.#targetToMessageHelperMap.get(target) ?? new PresentationSourceFrameMessageHelper();
+    const helper = this.#targetToMessageHelperMap.get(target) ??
+        new PresentationSourceFrameMessageHelper(this.#workspace, this.#debuggerWorkspaceBinding,
+                                                 this.#cssWorkspaceBinding);
     if (model instanceof SDK.DebuggerModel.DebuggerModel) {
       helper.setDebuggerModel(model);
     } else {
@@ -53,7 +67,7 @@ export class PresentationSourceFrameMessageManager implements
   }
 
   clear(): void {
-    for (const target of SDK.TargetManager.TargetManager.instance().targets()) {
+    for (const target of this.#targetManager.targets()) {
       const helper = this.#targetToMessageHelperMap.get(target);
       helper?.clear();
     }
@@ -61,9 +75,20 @@ export class PresentationSourceFrameMessageManager implements
 }
 
 export class PresentationConsoleMessageManager {
-  #sourceFrameMessageManager = new PresentationSourceFrameMessageManager();
+  #sourceFrameMessageManager: PresentationSourceFrameMessageManager;
 
-  constructor(targetManager: SDK.TargetManager.TargetManager) {
+  constructor(
+      targetManager: SDK.TargetManager.TargetManager,
+      workspace: Workspace.Workspace.WorkspaceImpl,
+      debuggerWorkspaceBinding: DebuggerWorkspaceBinding,
+      cssWorkspaceBinding: CSSWorkspaceBinding,
+  ) {
+    this.#sourceFrameMessageManager = new PresentationSourceFrameMessageManager(
+        targetManager,
+        workspace,
+        debuggerWorkspaceBinding,
+        cssWorkspaceBinding,
+    );
     targetManager.addModelListener(SDK.ConsoleModel.ConsoleModel, SDK.ConsoleModel.Events.MessageAdded,
                                    event => this.consoleMessageAdded(event.data));
     SDK.ConsoleModel.ConsoleModel.allMessagesUnordered(targetManager).forEach(this.consoleMessageAdded, this);
@@ -71,6 +96,10 @@ export class PresentationConsoleMessageManager {
                                    () => this.#sourceFrameMessageManager.clear());
   }
 
+  enable(): void {
+    this.#sourceFrameMessageManager.enable();
+  }
+
   private consoleMessageAdded(consoleMessage: SDK.ConsoleModel.ConsoleMessage): void {
     const runtimeModel = consoleMessage.runtimeModel();
     if (!consoleMessage.isErrorOrWarning() || !consoleMessage.runtimeModel() ||
@@ -80,8 +109,8 @@ export class PresentationConsoleMessageManager {
     const level = consoleMessage.level === Protocol.Log.LogEntryLevel.Error ?
         Workspace.UISourceCode.Message.Level.ERROR :
         Workspace.UISourceCode.Message.Level.WARNING;
-    this.#sourceFrameMessageManager.addMessage(
-        new Workspace.UISourceCode.Message(level, consoleMessage.messageText), consoleMessage, runtimeModel.target());
+    this.#sourceFrameMessageManager.addMessage(new Workspace.UISourceCode.Message(level, consoleMessage.messageText),
+                                               consoleMessage, runtimeModel.target());
   }
 }
 
@@ -93,12 +122,18 @@ export class PresentationSourceFrameMessageHelper {
                                     presentation: PresentationSourceFrameMessage,
                                   }>>();
   readonly #locationPool: LiveLocationPool;
-
-  constructor() {
+  readonly #workspace: Workspace.Workspace.WorkspaceImpl;
+  readonly #debuggerWorkspaceBinding: DebuggerWorkspaceBinding;
+  readonly #cssWorkspaceBinding: CSSWorkspaceBinding;
+
+  constructor(workspace: Workspace.Workspace.WorkspaceImpl, debuggerWorkspaceBinding: DebuggerWorkspaceBinding,
+              cssWorkspaceBinding: CSSWorkspaceBinding) {
+    this.#workspace = workspace;
+    this.#debuggerWorkspaceBinding = debuggerWorkspaceBinding;
+    this.#cssWorkspaceBinding = cssWorkspaceBinding;
     this.#locationPool = new LiveLocationPool();
 
-    Workspace.Workspace.WorkspaceImpl.instance().addEventListener(
-        Workspace.Workspace.Events.UISourceCodeAdded, this.#uiSourceCodeAdded.bind(this));
+    this.#workspace.addEventListener(Workspace.Workspace.Events.UISourceCodeAdded, this.#uiSourceCodeAdded.bind(this));
   }
 
   setDebuggerModel(debuggerModel: SDK.DebuggerModel.DebuggerModel): void {
@@ -120,12 +155,13 @@ export class PresentationSourceFrameMessageHelper {
       throw new Error('Cannot set CSSModel twice');
     }
     this.#cssModel = cssModel;
-    cssModel.addEventListener(
-        SDK.CSSModel.Events.StyleSheetAdded, event => queueMicrotask(() => this.#styleSheetAdded(event)));
+    cssModel.addEventListener(SDK.CSSModel.Events.StyleSheetAdded,
+                              event => queueMicrotask(() => this.#styleSheetAdded(event)));
   }
 
   async addMessage(message: Workspace.UISourceCode.Message, source: MessageSource): Promise<void> {
-    const presentation = new PresentationSourceFrameMessage(message, this.#locationPool);
+    const presentation = new PresentationSourceFrameMessage(message, this.#locationPool, this.#debuggerWorkspaceBinding,
+                                                            this.#cssWorkspaceBinding);
     const location = this.#rawLocation(source) ?? this.#cssLocation(source) ?? this.#uiLocation(source);
     if (location) {
       await presentation.updateLocationSource(location);
@@ -145,7 +181,7 @@ export class PresentationSourceFrameMessageHelper {
       return null;
     }
 
-    const uiSourceCode = Workspace.Workspace.WorkspaceImpl.instance().uiSourceCodeForURL(source.url);
+    const uiSourceCode = this.#workspace.uiSourceCodeForURL(source.url);
     if (!uiSourceCode) {
       return null;
     }
@@ -169,8 +205,8 @@ export class PresentationSourceFrameMessageHelper {
     }
     const callFrame = source.stackTrace?.callFrames ? source.stackTrace.callFrames[0] : null;
     if (callFrame) {
-      return this.#debuggerModel.createRawLocationByScriptId(
-          callFrame.scriptId, callFrame.lineNumber, callFrame.columnNumber);
+      return this.#debuggerModel.createRawLocationByScriptId(callFrame.scriptId, callFrame.lineNumber,
+                                                             callFrame.columnNumber);
     }
     if (source.url) {
       return this.#debuggerModel.createRawLocationByURL(source.url, source.line, source.column);
@@ -245,9 +281,8 @@ export class PresentationSourceFrameMessageHelper {
 
 class FrozenLiveLocation extends LiveLocationWithPool {
   #uiLocation: Workspace.UISourceCode.UILocation;
-  constructor(
-      uiLocation: Workspace.UISourceCode.UILocation, updateDelegate: (arg0: LiveLocation) => Promise<void>,
-      locationPool: LiveLocationPool) {
+  constructor(uiLocation: Workspace.UISourceCode.UILocation, updateDelegate: (arg0: LiveLocation) => Promise<void>,
+              locationPool: LiveLocationPool) {
     super(updateDelegate, locationPool);
     this.#uiLocation = uiLocation;
   }
@@ -262,8 +297,17 @@ export class PresentationSourceFrameMessage {
   #liveLocation?: LiveLocation;
   readonly #locationPool: LiveLocationPool;
   readonly #message: Workspace.UISourceCode.Message;
+  readonly #debuggerWorkspaceBinding: DebuggerWorkspaceBinding;
+  readonly #cssWorkspaceBinding: CSSWorkspaceBinding;
 
-  constructor(message: Workspace.UISourceCode.Message, locationPool: LiveLocationPool) {
+  constructor(
+      message: Workspace.UISourceCode.Message,
+      locationPool: LiveLocationPool,
+      debuggerWorkspaceBinding: DebuggerWorkspaceBinding,
+      cssWorkspaceBinding: CSSWorkspaceBinding,
+  ) {
+    this.#debuggerWorkspaceBinding = debuggerWorkspaceBinding;
+    this.#cssWorkspaceBinding = cssWorkspaceBinding;
     this.#message = message;
     this.#locationPool = locationPool;
   }
@@ -271,11 +315,10 @@ export class PresentationSourceFrameMessage {
   async updateLocationSource(source: SDK.DebuggerModel.Location|Workspace.UISourceCode.UILocation|
                              SDK.CSSModel.CSSLocation): Promise<void> {
     if (source instanceof SDK.DebuggerModel.Location) {
-      await DebuggerWorkspaceBinding.instance().createLiveLocation(
-          source, this.#updateLocation.bind(this), this.#locationPool);
+      await this.#debuggerWorkspaceBinding.createLiveLocation(source, this.#updateLocation.bind(this),
+                                                              this.#locationPool);
     } else if (source instanceof SDK.CSSModel.CSSLocation) {
-      await CSSWorkspaceBinding.instance().createLiveLocation(
-          source, this.#updateLocation.bind(this), this.#locationPool);
+      await this.#cssWorkspaceBinding.createLiveLocation(source, this.#updateLocation.bind(this), this.#locationPool);
     } else if (source instanceof Workspace.UISourceCode.UILocation) {
       if (!this.#liveLocation) {  // Don't "downgrade" the location if a debugger or css mapping was already successful
         this.#liveLocation = new FrozenLiveLocation(source, this.#updateLocation.bind(this), this.#locationPool);

package/front_end/models/bindings/ResourceMapping.ts

@@ -10,8 +10,6 @@ import * as Formatter from '../formatter/formatter.js';
 import * as Workspace from '../workspace/workspace.js';
 
 import {ContentProviderBasedProject} from './ContentProviderBasedProject.js';
-import type {CSSWorkspaceBinding} from './CSSWorkspaceBinding.js';
-import type {DebuggerWorkspaceBinding} from './DebuggerWorkspaceBinding.js';
 import {NetworkProject} from './NetworkProject.js';
 import {resourceMetadata} from './ResourceUtils.js';
 
@@ -27,46 +25,54 @@ function computeStyleSheetRange(header: SDK.CSSStyleSheetHeader.CSSStyleSheetHea
   return new TextUtils.TextRange.TextRange(header.startLine, header.startColumn, header.endLine, header.endColumn);
 }
 
+export interface DebuggerLocationUpdater {
+  updateLocations(script: SDK.Script.Script): Promise<void>;
+}
+
+export interface CSSLocationUpdater {
+  updateLocations(header: SDK.CSSStyleSheetHeader.CSSStyleSheetHeader): Promise<void>;
+}
+
 export class ResourceMapping implements SDK.TargetManager.SDKModelObserver<SDK.ResourceTreeModel.ResourceTreeModel> {
   readonly workspace: Workspace.Workspace.WorkspaceImpl;
   readonly #modelToInfo = new Map<SDK.ResourceTreeModel.ResourceTreeModel, ModelInfo>();
 
-  #debuggerWorkspaceBinding: DebuggerWorkspaceBinding|null = null;
-  #cssWorkspaceBinding: CSSWorkspaceBinding|null = null;
+  #debuggerLocationUpdater: DebuggerLocationUpdater|null = null;
+  #cssLocationUpdater: CSSLocationUpdater|null = null;
 
   constructor(targetManager: SDK.TargetManager.TargetManager, workspace: Workspace.Workspace.WorkspaceImpl) {
     this.workspace = workspace;
     targetManager.observeModels(SDK.ResourceTreeModel.ResourceTreeModel, this);
   }
 
-  get debuggerWorkspaceBinding(): DebuggerWorkspaceBinding|null {
-    // TODO(crbug.com/458180550): Throw when this.#debuggerWorkspaceBinding is null and never return null.
+  get debuggerLocationUpdater(): DebuggerLocationUpdater|null {
+    // TODO(crbug.com/458180550): Throw when this.#debuggerLocationUpdater is null and never return null.
     //                            The only reason we don't throw and return an instance unconditionally
-    //                            is that unit tests often don't set-up both the *WorkspaceBindings.
-    return this.#debuggerWorkspaceBinding;
+    //                            is that unit tests often don't set-up both updaters.
+    return this.#debuggerLocationUpdater;
   }
 
-  /* {@link DebuggerWorkspaceBinding} and ResourceMapping form a cycle so we can't wire it up at ctor time. */
-  set debuggerWorkspaceBinding(debuggerWorkspaceBinding: DebuggerWorkspaceBinding) {
-    if (this.#debuggerWorkspaceBinding) {
-      throw new Error('DebuggerWorkspaceBinding already set');
+  /* The concrete DebuggerWorkspaceBinding requires ResourceMapping during construction, so we must wire up this updater afterward. */
+  set debuggerLocationUpdater(debuggerLocationUpdater: DebuggerLocationUpdater) {
+    if (this.#debuggerLocationUpdater) {
+      throw new Error('DebuggerLocationUpdater already set');
     }
-    this.#debuggerWorkspaceBinding = debuggerWorkspaceBinding;
+    this.#debuggerLocationUpdater = debuggerLocationUpdater;
   }
 
-  get cssWorkspaceBinding(): CSSWorkspaceBinding|null {
-    // TODO(crbug.com/458180550): Throw when this.#cssWorkspaceBinding is null and never return null.
+  get cssLocationUpdater(): CSSLocationUpdater|null {
+    // TODO(crbug.com/458180550): Throw when this.#cssLocationUpdater is null and never return null.
     //                            The only reason we don't throw and return an instance unconditionally
-    //                            is that unit tests often don't set-up both the *WorkspaceBindings.
-    return this.#cssWorkspaceBinding;
+    //                            is that unit tests often don't set-up both updaters.
+    return this.#cssLocationUpdater;
   }
 
-  /* {@link CSSWorkspaceBinding} and ResourceMapping form a cycle so we can't wire it up at ctor time. */
-  set cssWorkspaceBinding(cssWorkspaceBinding: CSSWorkspaceBinding) {
-    if (this.#cssWorkspaceBinding) {
-      throw new Error('CSSWorkspaceBinding already set');
+  /* The concrete CSSWorkspaceBinding requires ResourceMapping during construction, so we must wire up this updater afterward. */
+  set cssLocationUpdater(cssLocationUpdater: CSSLocationUpdater) {
+    if (this.#cssLocationUpdater) {
+      throw new Error('CSSLocationUpdater already set');
     }
-    this.#cssWorkspaceBinding = cssWorkspaceBinding;
+    this.#cssLocationUpdater = cssLocationUpdater;
   }
 
   modelAdded(resourceTreeModel: SDK.ResourceTreeModel.ResourceTreeModel): void {
@@ -505,14 +511,14 @@ class Binding implements TextUtils.ContentProvider.ContentProvider {
     edit: SDK.CSSModel.Edit|null,
   }> = [];
 
-  readonly #debuggerWorkspaceBinding: DebuggerWorkspaceBinding|null;
-  readonly #cssWorkspaceBinding: CSSWorkspaceBinding|null;
+  readonly #debuggerLocationUpdater: DebuggerLocationUpdater|null;
+  readonly #cssLocationUpdater: CSSLocationUpdater|null;
 
   constructor(modelInfo: ModelInfo, resource: SDK.Resource.Resource) {
     this.resources = new Set([resource]);
     this.#project = modelInfo.project;
-    this.#debuggerWorkspaceBinding = modelInfo.resourceMapping.debuggerWorkspaceBinding;
-    this.#cssWorkspaceBinding = modelInfo.resourceMapping.cssWorkspaceBinding;
+    this.#debuggerLocationUpdater = modelInfo.resourceMapping.debuggerLocationUpdater;
+    this.#cssLocationUpdater = modelInfo.resourceMapping.cssLocationUpdater;
 
     this.#uiSourceCode = this.#project.createUISourceCode(resource.url, resource.contentType());
     boundUISourceCodes.add(this.#uiSourceCode);
@@ -522,8 +528,8 @@ class Binding implements TextUtils.ContentProvider.ContentProvider {
     this.#project.addUISourceCodeWithProvider(this.#uiSourceCode, this, resourceMetadata(resource), resource.mimeType);
 
     void Promise.all([
-      ...this.inlineScripts().map(script => this.#debuggerWorkspaceBinding?.updateLocations(script)),
-      ...this.inlineStyles().map(style => this.#cssWorkspaceBinding?.updateLocations(style)),
+      ...this.inlineScripts().map(script => this.#debuggerLocationUpdater?.updateLocations(script)),
+      ...this.inlineStyles().map(style => this.#cssLocationUpdater?.updateLocations(style)),
     ]);
   }
 
@@ -593,7 +599,7 @@ class Binding implements TextUtils.ContentProvider.ContentProvider {
           continue;
         }
         scriptRangeMap.set(script, range.rebaseAfterTextEdit(oldRange, newRange));
-        updatePromises.push(this.#debuggerWorkspaceBinding?.updateLocations(script));
+        updatePromises.push(this.#debuggerLocationUpdater?.updateLocations(script));
       }
       for (const style of styles) {
         const range = styleSheetRangeMap.get(style) ?? computeStyleSheetRange(style);
@@ -601,7 +607,7 @@ class Binding implements TextUtils.ContentProvider.ContentProvider {
           continue;
         }
         styleSheetRangeMap.set(style, range.rebaseAfterTextEdit(oldRange, newRange));
-        updatePromises.push(this.#cssWorkspaceBinding?.updateLocations(style));
+        updatePromises.push(this.#cssLocationUpdater?.updateLocations(style));
       }
       await Promise.all(updatePromises);
     }
@@ -625,8 +631,8 @@ class Binding implements TextUtils.ContentProvider.ContentProvider {
   dispose(): void {
     this.#project.removeUISourceCode(this.#uiSourceCode.url());
     void Promise.all([
-      ...this.inlineScripts().map(script => this.#debuggerWorkspaceBinding?.updateLocations(script)),
-      ...this.inlineStyles().map(style => this.#cssWorkspaceBinding?.updateLocations(style)),
+      ...this.inlineScripts().map(script => this.#debuggerLocationUpdater?.updateLocations(script)),
+      ...this.inlineStyles().map(style => this.#cssLocationUpdater?.updateLocations(style)),
     ]);
   }
 

package/front_end/models/bindings/ResourceScriptMapping.ts

@@ -19,14 +19,12 @@ import {metadataForURL} from './ResourceUtils.js';
 
 const UIStrings = {
   /**
-   * @description Error text displayed in the console when editing a live script fails. LiveEdit is
-   *the name of the feature for editing code that is already running.
+   * @description Error text displayed in the Console panel when editing a live script fails. LiveEdit is the name of the feature for editing code that is already running.
    * @example {warning} PH1
    */
   liveEditFailed: '`LiveEdit` failed: {PH1}',
   /**
-   * @description Error text displayed in the console when compiling a live-edited script fails. LiveEdit is
-   *the name of the feature for editing code that is already running.
+   * @description Error text displayed in the Console panel when compiling a live-edited script fails. LiveEdit is the name of the feature for editing code that is already running.
    * @example {connection lost} PH1
    */
   liveEditCompileFailed: '`LiveEdit` compile failed: {PH1}',
@@ -422,11 +420,11 @@ export class ResourceScriptFile extends Common.ObjectWrapper.ObjectWrapper<Resou
     function getErrorText(status: Protocol.Debugger.SetScriptSourceResponseStatus): string {
       switch (status) {
         case Protocol.Debugger.SetScriptSourceResponseStatus.BlockedByActiveFunction:
-          return 'Functions that are on the stack (currently being executed) can not be edited';
+          return 'Functions that are on the stack (currently being executed) can’t be edited';
         case Protocol.Debugger.SetScriptSourceResponseStatus.BlockedByActiveGenerator:
-          return 'Async functions/generators that are active can not be edited';
+          return 'Async functions/generators that are active can’t be edited';
         case Protocol.Debugger.SetScriptSourceResponseStatus.BlockedByTopLevelEsModuleChange:
-          return 'The top-level of ES modules can not be edited';
+          return 'The top level of JavaScript modules can’t be edited';
         case Protocol.Debugger.SetScriptSourceResponseStatus.CompileError:
         case Protocol.Debugger.SetScriptSourceResponseStatus.Ok:
           throw new Error('Compile errors and Ok status must not be reported on the console');

package/front_end/models/breakpoints/BreakpointManager.ts

@@ -837,7 +837,8 @@ export class Breakpoint implements SDK.TargetManager.SDKModelObserver<SDK.Debugg
     };
 
     if (location) {
-      return SourceMapScopes.NamesResolver.allVariablesAtPosition(location)
+      return SourceMapScopes.NamesResolver
+          .allVariablesAtPosition(location, this.breakpointManager.debuggerWorkspaceBinding)
           .then(nameMap => Formatter.FormatterWorkerPool.formatterWorkerPool().javaScriptSubstitute(condition, nameMap))
           .catch(() => condition)
           .then(subsitutedCondition => addSourceUrl(subsitutedCondition), () => addSourceUrl(condition));

package/front_end/models/har/Writer.ts

@@ -42,11 +42,11 @@ import {type BuildOptions, type EntryDTO, Log} from './Log.js';
 
 const UIStrings = {
   /**
-   * @description Title of progress in harwriter of the network panel
+   * @description Title of progress in HAR writer of the Network panel.
    */
   collectingContent: 'Collecting content…',
   /**
-   * @description Text to indicate DevTools is writing to a file
+   * @description Text to indicate DevTools is writing to a file.
    */
   writingFile: 'Writing file…',
 } as const;

package/front_end/models/issues_manager/ElementAccessibilityIssue.ts

@@ -9,7 +9,7 @@ import {Issue, IssueCategory, IssueKind} from './Issue.js';
 import {
   type LazyMarkdownIssueDescription,
   type MarkdownIssueDescription,
-  resolveLazyDescription
+  resolveLazyDescription,
 } from './MarkdownIssueDescription.js';
 
 export class ElementAccessibilityIssue extends Issue<Protocol.Audits.ElementAccessibilityIssueDetails> {

package/front_end/models/issues_manager/GenericIssue.ts

@@ -241,7 +241,7 @@ const issueDescriptions = new Map<Protocol.Audits.GenericIssueErrorType, LazyMar
   [Protocol.Audits.GenericIssueErrorType.FormDuplicateIdForInputError, genericFormDuplicateIdForInputError],
   [
     Protocol.Audits.GenericIssueErrorType.FormAriaLabelledByToNonExistingIdError,
-    genericFormAriaLabelledByToNonExistingIdError
+    genericFormAriaLabelledByToNonExistingIdError,
   ],
   [
     Protocol.Audits.GenericIssueErrorType.FormEmptyIdAndNameAttributesForInputError,

package/front_end/models/issues_manager/IssuesManager.ts

@@ -6,6 +6,8 @@ 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 * as Bindings from '../bindings/bindings.js';
+import * as Workspace from '../workspace/workspace.js';
 
 import {BounceTrackingIssue} from './BounceTrackingIssue.js';
 import {ClientHintIssue} from './ClientHintIssue.js';
@@ -230,14 +232,21 @@ export class IssuesManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes
   #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(),
-              targetManager: SDK.TargetManager.TargetManager = SDK.TargetManager.TargetManager.instance()) {
+  constructor(
+      private readonly showThirdPartyIssuesSetting?: Common.Settings.Setting<boolean>,
+      private readonly hideIssueSetting?: Common.Settings.Setting<HideIssueMenuSetting>,
+      frameManager: SDK.FrameManager.FrameManager = SDK.FrameManager.FrameManager.instance(),
+      targetManager: SDK.TargetManager.TargetManager = SDK.TargetManager.TargetManager.instance(),
+      workspace: Workspace.Workspace.WorkspaceImpl = Workspace.Workspace.WorkspaceImpl.instance(),
+      debuggerWorkspaceBinding: Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding =
+          Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding.instance(),
+      cssWorkspaceBinding: Bindings.CSSWorkspaceBinding.CSSWorkspaceBinding =
+          Bindings.CSSWorkspaceBinding.CSSWorkspaceBinding.instance(),
+  ) {
     super();
     this.#frameManager = frameManager;
     this.#targetManager = targetManager;
-    new SourceFrameIssuesManager(this);
+    new SourceFrameIssuesManager(this, targetManager, workspace, debuggerWorkspaceBinding, cssWorkspaceBinding);
     this.#targetManager.observeModels(SDK.IssuesModel.IssuesModel, this);
     this.#targetManager.addModelListener(SDK.ResourceTreeModel.ResourceTreeModel,
                                          SDK.ResourceTreeModel.Events.PrimaryPageChanged, this.#onPrimaryPageChanged,

package/front_end/models/issues_manager/PartitioningBlobURLIssue.ts

@@ -17,7 +17,7 @@ const UIStrings = {
   /**
    * @description Title for Chrome Status entry URL link.
    */
-  chromeStatusEntry: 'Chrome Status entry'
+  chromeStatusEntry: 'Chrome Status entry',
 } as const;
 
 const str_ = i18n.i18n.registerUIStrings('models/issues_manager/PartitioningBlobURLIssue.ts', UIStrings);

package/front_end/models/issues_manager/SRIMessageSignatureIssue.ts

@@ -69,9 +69,9 @@ export class SRIMessageSignatureIssue extends Issue<Protocol.Audits.SRIMessageSi
         {
           link: 'https://wicg.github.io/signature-based-sri/',
           linkTitle: i18nLazyString(UIStrings.signatureBasedIntegrity),
-        }
+        },
       ],
-      substitutions: new Map()
+      substitutions: new Map(),
     };
     if (details.error === Protocol.Audits.SRIMessageSignatureError.ValidationFailedSignatureMismatch) {
       description.substitutions?.set('PLACEHOLDER_signatureBase', () => details.signatureBase);

package/front_end/models/issues_manager/SourceFrameIssuesManager.ts

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import * as Common from '../../core/common/common.js';
+import type * as SDK from '../../core/sdk/sdk.js';
 import * as Bindings from '../../models/bindings/bindings.js';
 import * as Workspace from '../../models/workspace/workspace.js';
 
@@ -19,8 +20,18 @@ import {PropertyRuleIssue} from './PropertyRuleIssue.js';
 import {lateImportStylesheetLoadingCode, type StylesheetLoadingIssue} from './StylesheetLoadingIssue.js';
 
 export class SourceFrameIssuesManager {
-  #sourceFrameMessageManager = new Bindings.PresentationConsoleMessageHelper.PresentationSourceFrameMessageManager();
-  constructor(private readonly issuesManager: IssuesManager) {
+  #sourceFrameMessageManager: Bindings.PresentationConsoleMessageHelper.PresentationSourceFrameMessageManager;
+  constructor(
+      private readonly issuesManager: IssuesManager,
+      targetManager: SDK.TargetManager.TargetManager,
+      workspace: Workspace.Workspace.WorkspaceImpl,
+      debuggerWorkspaceBinding: Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding,
+      cssWorkspaceBinding: Bindings.CSSWorkspaceBinding.CSSWorkspaceBinding,
+  ) {
+    this.#sourceFrameMessageManager =
+        new Bindings.PresentationConsoleMessageHelper.PresentationSourceFrameMessageManager(
+            targetManager, workspace, debuggerWorkspaceBinding, cssWorkspaceBinding);
+    this.#sourceFrameMessageManager.enable();
     this.issuesManager.addEventListener(Events.ISSUE_ADDED, this.#onIssueAdded, this);
     this.issuesManager.addEventListener(Events.FULL_UPDATE_REQUIRED, this.#onFullUpdateRequired, this);
   }

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 CheckFormsIssuesTrigger from './CheckFormsIssuesTrigger.js';
 import * as ClientHintIssue from './ClientHintIssue.js';
 import * as ConnectionAllowlistIssue from './ConnectionAllowlistIssue.js';
 import * as ContentSecurityPolicyIssue from './ContentSecurityPolicyIssue.js';
@@ -37,7 +36,6 @@ import * as StylesheetLoadingIssue from './StylesheetLoadingIssue.js';
 import * as UnencodedDigestIssue from './UnencodedDigestIssue.js';
 
 export {
-  CheckFormsIssuesTrigger,
   ClientHintIssue,
   ConnectionAllowlistIssue,
   ContentSecurityPolicyIssue,