chrome-devtools-frontend 1.0.923319 → 1.0.923788

package/front_end/core/common/EventTarget.ts

@@ -11,7 +11,7 @@ export interface EventDescriptor<Events = any, T extends EventType<Events> = any
   eventTarget: EventTarget<Events>;
   eventType: T;
   thisObject?: Object;
-  listener: (arg0: EventTargetEvent<EventPayload<Events, T>>) => void;
+  listener: EventListener<Events, T>;
 }
 
 export function removeEventListeners(eventList: EventDescriptor[]): void {
@@ -22,24 +22,18 @@ export function removeEventListeners(eventList: EventDescriptor[]): void {
   eventList.splice(0);
 }
 
-// TODO(crbug.com/1228674): Once all event emitters and sinks have been migrated
-// we can use:
-//    export type EventType<Events> = keyof Events;
-//    export type EventPayload<Events, T> = Events[T];
 export type EventType<Events> = Events extends Object ? keyof Events : Events extends void ? never : string|symbol;
 export type EventPayload<Events, T> = T extends keyof Events ? Events[T] : unknown;
 export type EventPayloadToRestParameters<T> = T extends void ? [] : [T];
 
-// TODO(crbug.com/1228674) Remove defaults for generic type parameters once
-//                         all event emitters and sinks have been migrated.
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export interface EventTarget<Events = any> {
-  addEventListener<T extends EventType<Events>>(
-      eventType: T, listener: (arg0: EventTargetEvent<EventPayload<Events, T>>) => void,
-      thisObject?: Object): EventDescriptor<Events, T>;
+export type EventListener<Events, T> = (arg0: EventTargetEvent<EventPayload<Events, T>>) => void;
+
+export interface EventTarget<Events> {
+  addEventListener<T extends EventType<Events>>(eventType: T, listener: EventListener<Events, T>, thisObject?: Object):
+      EventDescriptor<Events, T>;
   once<T extends EventType<Events>>(eventType: T): Promise<EventPayload<Events, T>>;
   removeEventListener<T extends EventType<Events>>(
-      eventType: T, listener: (arg0: EventTargetEvent<EventPayload<Events, T>>) => void, thisObject?: Object): void;
+      eventType: T, listener: EventListener<Events, T>, thisObject?: Object): void;
   hasEventListeners(eventType: EventType<Events>): boolean;
   dispatchEventToListeners<T extends EventType<Events>>(
       eventType: Platform.TypeScriptUtilities.NoUnion<T>,

package/front_end/core/common/Object.ts

@@ -28,7 +28,7 @@
  */
 
 import type * as Platform from '../platform/platform.js';
-import type {EventDescriptor, EventTarget, EventTargetEvent, EventType, EventPayload, EventPayloadToRestParameters} from './EventTarget.js';
+import type {EventDescriptor, EventListener, EventTarget, EventTargetEvent, EventType, EventPayload, EventPayloadToRestParameters} from './EventTarget.js';
 
 export interface ListenerCallbackTuple {
   thisObject?: Object;
@@ -36,15 +36,11 @@ export interface ListenerCallbackTuple {
   disposed?: boolean;
 }
 
-// TODO(crbug.com/1228674) Remove defaults for generic type parameters once
-//                         all event emitters and sinks have been migrated.
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export class ObjectWrapper<Events = any> implements EventTarget<Events> {
+export class ObjectWrapper<Events> implements EventTarget<Events> {
   listeners?: Map<EventType<Events>, Set<ListenerCallbackTuple>>;
 
-  addEventListener<T extends EventType<Events>>(
-      eventType: T, listener: (arg0: EventTargetEvent<EventPayload<Events, T>>) => void,
-      thisObject?: Object): EventDescriptor<Events, T> {
+  addEventListener<T extends EventType<Events>>(eventType: T, listener: EventListener<Events, T>, thisObject?: Object):
+      EventDescriptor<Events, T> {
     if (!this.listeners) {
       this.listeners = new Map();
     }
@@ -68,7 +64,7 @@ export class ObjectWrapper<Events = any> implements EventTarget<Events> {
   }
 
   removeEventListener<T extends EventType<Events>>(
-      eventType: T, listener: (arg0: EventTargetEvent<EventPayload<Events, T>>) => void, thisObject?: Object): void {
+      eventType: T, listener: EventListener<Events, T>, thisObject?: Object): void {
     const listeners = this.listeners?.get(eventType);
     if (!listeners) {
       return;

package/front_end/core/common/Settings.ts

@@ -46,7 +46,7 @@ export class Settings {
   private readonly sessionStorage: SettingsStorage;
   settingNameSet: Set<string>;
   orderValuesBySettingCategory: Map<SettingCategory, Set<number>>;
-  private eventSupport: ObjectWrapper;
+  private eventSupport: ObjectWrapper<unknown>;
   private registry: Map<string, Setting<unknown>>;
   readonly moduleSettings: Map<string, Setting<unknown>>;
 
@@ -59,7 +59,7 @@ export class Settings {
 
     this.orderValuesBySettingCategory = new Map();
 
-    this.eventSupport = new ObjectWrapper();
+    this.eventSupport = new ObjectWrapper<unknown>();
     this.registry = new Map();
     this.moduleSettings = new Map();
 
@@ -276,7 +276,7 @@ function removeSetting(setting: Setting<unknown>): void {
 export class Setting<V> {
   private nameInternal: string;
   private defaultValueInternal: V;
-  private readonly eventSupport: ObjectWrapper;
+  private readonly eventSupport: ObjectWrapper<unknown>;
   private storage: SettingsStorage;
   private titleFunction!: () => Platform.UIString.LocalizedString;
   private titleInternal!: string;
@@ -287,7 +287,7 @@ export class Setting<V> {
   private serializer: Serializer<unknown, V> = JSON;
   private hadUserAction?: boolean;
 
-  constructor(name: string, defaultValue: V, eventSupport: ObjectWrapper, storage: SettingsStorage) {
+  constructor(name: string, defaultValue: V, eventSupport: ObjectWrapper<unknown>, storage: SettingsStorage) {
     this.nameInternal = name;
     this.defaultValueInternal = defaultValue;
     this.eventSupport = eventSupport;
@@ -299,12 +299,14 @@ export class Setting<V> {
     this.serializer = serializer;
   }
 
-  addChangeListener(listener: (arg0: EventTargetEvent) => void, thisObject?: Object): EventDescriptor {
-    return this.eventSupport.addEventListener(this.nameInternal, listener, thisObject);
+  addChangeListener(listener: (arg0: EventTargetEvent<V>) => void, thisObject?: Object): EventDescriptor {
+    return this.eventSupport.addEventListener(
+        this.nameInternal, listener as (arg0: EventTargetEvent<unknown>) => void, thisObject);
   }
 
-  removeChangeListener(listener: (arg0: EventTargetEvent) => void, thisObject?: Object): void {
-    this.eventSupport.removeEventListener(this.nameInternal, listener, thisObject);
+  removeChangeListener(listener: (arg0: EventTargetEvent<V>) => void, thisObject?: Object): void {
+    this.eventSupport.removeEventListener(
+        this.nameInternal, listener as (arg0: EventTargetEvent<unknown>) => void, thisObject);
   }
 
   get name(): string {
@@ -449,7 +451,8 @@ export class RegExpSetting extends Setting<any> {
   private regex?: RegExp|null;
 
   constructor(
-      name: string, defaultValue: string, eventSupport: ObjectWrapper, storage: SettingsStorage, regexFlags?: string) {
+      name: string, defaultValue: string, eventSupport: ObjectWrapper<unknown>, storage: SettingsStorage,
+      regexFlags?: string) {
     super(name, defaultValue ? [{pattern: defaultValue}] : [], eventSupport, storage);
     this.regexFlags = regexFlags;
   }

package/front_end/core/sdk/RuntimeModel.ts

@@ -487,7 +487,7 @@ export interface QueryObjectRequestedEvent {
 
 export type EventTypes = {
   [Events.BindingCalled]: Protocol.Runtime.BindingCalledEvent,
-  [Events.ExecutionContextCreated]: Protocol.Runtime.ExecutionContextDescription,
+  [Events.ExecutionContextCreated]: ExecutionContext,
   [Events.ExecutionContextDestroyed]: ExecutionContext,
   [Events.ExecutionContextChanged]: ExecutionContext,
   [Events.ExecutionContextOrderChanged]: RuntimeModel,

package/front_end/core/sdk/SourceMap.ts

@@ -62,6 +62,7 @@ export interface SourceMap {
       TextUtils.ContentProvider.ContentProvider;
   embeddedContentByURL(sourceURL: string): string|null;
   findEntry(lineNumber: number, columnNumber: number): SourceMapEntry|null;
+  findReverseRanges(sourceURL: string, lineNumber: number, columnNumber: number): TextUtils.TextRange.TextRange[];
   sourceLineMapping(sourceURL: string, lineNumber: number, columnNumber: number): SourceMapEntry|null;
   mappings(): SourceMapEntry[];
   mapsOrigin(): boolean;
@@ -225,37 +226,71 @@ export class TextSourceMap implements SourceMap {
   }
 
   sourceLineMapping(sourceURL: string, lineNumber: number, columnNumber: number): SourceMapEntry|null {
-    const mappings = this.reversedMappings(sourceURL);
-    const first = Platform.ArrayUtilities.lowerBound(mappings, lineNumber, lineComparator);
-    const last = Platform.ArrayUtilities.upperBound(mappings, lineNumber, lineComparator);
-    if (first >= mappings.length || mappings[first].sourceLineNumber !== lineNumber) {
+    const mappings = this.mappings();
+    const reverseMappings = this.reversedMappings(sourceURL);
+    const first = Platform.ArrayUtilities.lowerBound(reverseMappings, lineNumber, lineComparator);
+    const last = Platform.ArrayUtilities.upperBound(reverseMappings, lineNumber, lineComparator);
+    if (first >= reverseMappings.length || mappings[reverseMappings[first]].sourceLineNumber !== lineNumber) {
       return null;
     }
-    const columnMappings = mappings.slice(first, last);
+    const columnMappings = reverseMappings.slice(first, last);
     if (!columnMappings.length) {
       return null;
     }
     const index = Platform.ArrayUtilities.lowerBound(
-        columnMappings, columnNumber, (columnNumber, mapping) => columnNumber - mapping.sourceColumnNumber);
-    return index >= columnMappings.length ? columnMappings[columnMappings.length - 1] : columnMappings[index];
+        columnMappings, columnNumber, (columnNumber, i) => columnNumber - mappings[i].sourceColumnNumber);
+    return index >= columnMappings.length ? mappings[columnMappings[columnMappings.length - 1]] :
+                                            mappings[columnMappings[index]];
 
-    function lineComparator(lineNumber: number, mapping: SourceMapEntry): number {
-      return lineNumber - mapping.sourceLineNumber;
+    function lineComparator(lineNumber: number, i: number): number {
+      return lineNumber - mappings[i].sourceLineNumber;
     }
   }
 
-  findReverseEntries(sourceURL: string, lineNumber: number, columnNumber: number): SourceMapEntry[] {
-    const mappings = this.reversedMappings(sourceURL);
+  private findReverseIndices(sourceURL: string, lineNumber: number, columnNumber: number): number[] {
+    const mappings = this.mappings();
+    const reverseMappings = this.reversedMappings(sourceURL);
     const endIndex = Platform.ArrayUtilities.upperBound(
-        mappings, undefined,
-        (unused, entry) => lineNumber - entry.sourceLineNumber || columnNumber - entry.sourceColumnNumber);
+        reverseMappings, undefined,
+        (unused, i) => lineNumber - mappings[i].sourceLineNumber || columnNumber - mappings[i].sourceColumnNumber);
     let startIndex = endIndex;
-    while (startIndex > 0 && mappings[startIndex - 1].sourceLineNumber === mappings[endIndex - 1].sourceLineNumber &&
-           mappings[startIndex - 1].sourceColumnNumber === mappings[endIndex - 1].sourceColumnNumber) {
+    while (startIndex > 0 &&
+           mappings[reverseMappings[startIndex - 1]].sourceLineNumber ===
+               mappings[reverseMappings[endIndex - 1]].sourceLineNumber &&
+           mappings[reverseMappings[startIndex - 1]].sourceColumnNumber ===
+               mappings[reverseMappings[endIndex - 1]].sourceColumnNumber) {
       --startIndex;
     }
 
-    return mappings.slice(startIndex, endIndex);
+    return reverseMappings.slice(startIndex, endIndex);
+  }
+
+  findReverseEntries(sourceURL: string, lineNumber: number, columnNumber: number): SourceMapEntry[] {
+    const mappings = this.mappings();
+    return this.findReverseIndices(sourceURL, lineNumber, columnNumber).map(i => mappings[i]);
+  }
+
+  findReverseRanges(sourceURL: string, lineNumber: number, columnNumber: number): TextUtils.TextRange.TextRange[] {
+    const mappings = this.mappings();
+    const indices = this.findReverseIndices(sourceURL, lineNumber, columnNumber);
+    const ranges: TextUtils.TextRange.TextRange[] = [];
+
+    for (let i = 0; i < indices.length; ++i) {
+      const startIndex = indices[i];
+
+      // Merge adjacent ranges.
+      let endIndex = startIndex + 1;
+      while (i + 1 < indices.length && endIndex === indices[i + 1]) {
+        ++endIndex;
+        ++i;
+      }
+      const endLine = endIndex < mappings.length ? mappings[endIndex].lineNumber : Infinity;
+      const endColumn = endIndex < mappings.length ? mappings[endIndex].columnNumber : 0;
+      ranges.push(new TextUtils.TextRange.TextRange(
+          mappings[startIndex].lineNumber, mappings[startIndex].columnNumber, endLine, endColumn));
+    }
+
+    return ranges;
   }
 
   mappings(): SourceMapEntry[] {
@@ -267,19 +302,22 @@ export class TextSourceMap implements SourceMap {
     return /** @type {!Array<!SourceMapEntry>} */ this.mappingsInternal as SourceMapEntry[];
   }
 
-  private reversedMappings(sourceURL: string): SourceMapEntry[] {
+  private reversedMappings(sourceURL: string): number[] {
     const info = this.sourceInfos.get(sourceURL);
     if (!info) {
       return [];
     }
     const mappings = this.mappings();
     if (info.reverseMappings === null) {
-      info.reverseMappings = mappings.filter(mapping => mapping.sourceURL === sourceURL).sort(sourceMappingComparator);
+      const indexes = Array(mappings.length).fill(0).map((_, i) => i);
+      info.reverseMappings = indexes.filter(i => mappings[i].sourceURL === sourceURL).sort(sourceMappingComparator);
     }
 
     return info.reverseMappings;
 
-    function sourceMappingComparator(a: SourceMapEntry, b: SourceMapEntry): number {
+    function sourceMappingComparator(indexA: number, indexB: number): number {
+      const a = mappings[indexA];
+      const b = mappings[indexB];
       if (a.sourceLineNumber !== b.sourceLineNumber) {
         return a.sourceLineNumber - b.sourceLineNumber;
       }
@@ -415,25 +453,30 @@ export class TextSourceMap implements SourceMap {
           lineNumber: number,
           columnNumber: number,
         },
-        mapping: SourceMapEntry): number {
-      if (position.lineNumber !== mapping.sourceLineNumber) {
-        return position.lineNumber - mapping.sourceLineNumber;
+        mappingIndex: number): number {
+      if (position.lineNumber !== mappings[mappingIndex].sourceLineNumber) {
+        return position.lineNumber - mappings[mappingIndex].sourceLineNumber;
       }
 
-      return position.columnNumber - mapping.sourceColumnNumber;
+      return position.columnNumber - mappings[mappingIndex].sourceColumnNumber;
     }
 
-    const mappings = this.reversedMappings(url);
-    if (!mappings.length) {
+    const reverseMappings = this.reversedMappings(url);
+    const mappings = this.mappings();
+    if (!reverseMappings.length) {
       return null;
     }
     const startIndex = Platform.ArrayUtilities.lowerBound(
-        mappings, {lineNumber: textRange.startLine, columnNumber: textRange.startColumn}, comparator);
+        reverseMappings, {lineNumber: textRange.startLine, columnNumber: textRange.startColumn}, comparator);
     const endIndex = Platform.ArrayUtilities.upperBound(
-        mappings, {lineNumber: textRange.endLine, columnNumber: textRange.endColumn}, comparator);
+        reverseMappings, {lineNumber: textRange.endLine, columnNumber: textRange.endColumn}, comparator);
+
+    if (endIndex >= reverseMappings.length) {
+      return null;
+    }
 
-    const startMapping = mappings[startIndex];
-    const endMapping = mappings[endIndex];
+    const startMapping = mappings[reverseMappings[startIndex]];
+    const endMapping = mappings[reverseMappings[endIndex]];
     return new TextUtils.TextRange.TextRange(
         startMapping.lineNumber, startMapping.columnNumber, endMapping.lineNumber, endMapping.columnNumber);
   }
@@ -483,9 +526,9 @@ export namespace TextSourceMap {
 
   export class SourceInfo {
     content: string|null;
-    reverseMappings: SourceMapEntry[]|null;
+    reverseMappings: number[]|null;
 
-    constructor(content: string|null, reverseMappings: SourceMapEntry[]|null) {
+    constructor(content: string|null, reverseMappings: number[]|null) {
       this.content = content;
       this.reverseMappings = reverseMappings;
     }

package/front_end/core/sdk/TargetManager.ts

@@ -17,7 +17,7 @@ let targetManagerInstance: TargetManager|undefined;
 export class TargetManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes> {
   private targetsInternal: Set<Target>;
   private readonly observers: Set<Observer>;
-  private modelListeners: Platform.MapUtilities.Multimap<string|symbol, {
+  private modelListeners: Platform.MapUtilities.Multimap<string|symbol|number, {
     modelClass: new(arg1: Target) => SDKModel,
     thisObject: (Object|undefined),
     listener: (arg0: Common.EventTarget.EventTargetEvent) => void,
@@ -124,18 +124,18 @@ export class TargetManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes
     }
   }
 
-  addModelListener(
-      modelClass: new(arg1: Target) => SDKModel, eventType: string|symbol,
-      listener: (arg0: Common.EventTarget.EventTargetEvent) => void, thisObject?: Object): void {
+  addModelListener<Events, T extends Common.EventTarget.EventType<Events>>(
+      modelClass: new(arg1: Target) => SDKModel<Events>, eventType: T,
+      listener: Common.EventTarget.EventListener<Events, T>, thisObject?: Object): void {
     for (const model of this.models(modelClass)) {
       model.addEventListener(eventType, listener, thisObject);
     }
     this.modelListeners.set(eventType, {modelClass: modelClass, thisObject: thisObject, listener: listener});
   }
 
-  removeModelListener(
-      modelClass: new(arg1: Target) => SDKModel, eventType: string|symbol,
-      listener: (arg0: Common.EventTarget.EventTargetEvent) => void, thisObject?: Object): void {
+  removeModelListener<Events, T extends Common.EventTarget.EventType<Events>>(
+      modelClass: new(arg1: Target) => SDKModel<Events>, eventType: T,
+      listener: Common.EventTarget.EventListener<Events, T>, thisObject?: Object): void {
     if (!this.modelListeners.has(eventType)) {
       return;
     }

package/front_end/models/bindings/CompilerScriptMapping.ts

@@ -35,7 +35,7 @@ import * as TextUtils from '../text_utils/text_utils.js';
 import * as Workspace from '../workspace/workspace.js';
 
 import {ContentProviderBasedProject} from './ContentProviderBasedProject.js';
-import type {DebuggerSourceMapping, DebuggerWorkspaceBinding} from './DebuggerWorkspaceBinding.js';
+import type {DebuggerSourceMapping, DebuggerWorkspaceBinding, RawLocationRange} from './DebuggerWorkspaceBinding.js';
 import {IgnoreListManager} from './IgnoreListManager.js';
 import {NetworkProject} from './NetworkProject.js';
 
@@ -131,15 +131,33 @@ export class CompilerScriptMapping implements DebuggerSourceMapping {
     return [];
   }
 
-  mapsToSourceCode(rawLocation: SDK.DebuggerModel.Location): boolean {
+  getLocationRangesForSameSourceLocation(rawLocation: SDK.DebuggerModel.Location): RawLocationRange[] {
+    const debuggerModel = rawLocation.debuggerModel;
     const script = rawLocation.script();
-    const sourceMap = script ? this.sourceMapManager.sourceMapForClient(script) : null;
+    if (!script) {
+      return [];
+    }
+    const sourceMap = this.sourceMapManager.sourceMapForClient(script);
     if (!sourceMap) {
-      return true;
+      return [];
     }
+
+    // Find the source location for the raw location.
     const entry = sourceMap.findEntry(rawLocation.lineNumber, rawLocation.columnNumber);
-    return entry !== null && entry.lineNumber === rawLocation.lineNumber &&
-        entry.columnNumber === rawLocation.columnNumber;
+    if (!entry || !entry.sourceURL) {
+      return [];
+    }
+
+    // Map the source location back to raw location ranges.
+    const ranges = sourceMap.findReverseRanges(entry.sourceURL, entry.sourceLineNumber, entry.sourceColumnNumber);
+    return ranges.map(textRangeToLocationRange);
+
+    function textRangeToLocationRange(t: TextUtils.TextRange.TextRange): RawLocationRange {
+      return {
+        start: debuggerModel.createRawLocation(script as SDK.Script.Script, t.startLine, t.startColumn),
+        end: debuggerModel.createRawLocation(script as SDK.Script.Script, t.endLine, t.endColumn),
+      };
+    }
   }
 
   uiSourceCodeForURL(url: string, isContentScript: boolean): Workspace.UISourceCode.UISourceCode|null {

package/front_end/models/bindings/DebuggerWorkspaceBinding.ts

@@ -72,14 +72,8 @@ export class DebuggerWorkspaceBinding implements SDK.TargetManager.SDKModelObser
   }
 
   private async computeAutoStepRanges(mode: SDK.DebuggerModel.StepMode, callFrame: SDK.DebuggerModel.CallFrame):
-      Promise<{
-        start: SDK.DebuggerModel.Location,
-        end: SDK.DebuggerModel.Location,
-      }[]> {
-    function contained(location: SDK.DebuggerModel.Location, range: {
-      start: SDK.DebuggerModel.Location,
-      end: SDK.DebuggerModel.Location,
-    }): boolean {
+      Promise<RawLocationRange[]> {
+    function contained(location: SDK.DebuggerModel.Location, range: RawLocationRange): boolean {
       const {start, end} = range;
       if (start.scriptId !== location.scriptId) {
         return false;
@@ -98,20 +92,17 @@ export class DebuggerWorkspaceBinding implements SDK.TargetManager.SDKModelObser
 
     // TODO(crbug.com/1018234): Also take into account source maps here and remove the auto-stepping
     // logic in the front-end (which is currently still an experiment) completely.
+    const rawLocation = callFrame.location();
+    if (!rawLocation) {
+      return [];
+    }
     const pluginManager = this.pluginManager;
+    let ranges: RawLocationRange[] = [];
     if (pluginManager) {
-      const rawLocation = callFrame.location();
       if (mode === SDK.DebuggerModel.StepMode.StepOut) {
         // Step out of inline function.
         return await pluginManager.getInlinedFunctionRanges(rawLocation);
       }
-      let ranges: {
-        start: SDK.DebuggerModel.Location,
-        end: SDK.DebuggerModel.Location,
-      }[]|{
-        start: SDK.DebuggerModel.Location,
-        end: SDK.DebuggerModel.Location,
-      }[] = [];
       const uiLocation = await pluginManager.rawLocationToUILocation(rawLocation);
       if (uiLocation) {
         ranges = await pluginManager.uiLocationToRawLocationRanges(
@@ -119,14 +110,25 @@ export class DebuggerWorkspaceBinding implements SDK.TargetManager.SDKModelObser
             [];
         // TODO(bmeurer): Remove the {rawLocation} from the {ranges}?
         ranges = ranges.filter(range => contained(rawLocation, range));
+        if (mode === SDK.DebuggerModel.StepMode.StepOver) {
+          // Step over an inlined function.
+          ranges = ranges.concat(await pluginManager.getInlinedCalleesRanges(rawLocation));
+        }
+        return ranges;
       }
-      if (mode === SDK.DebuggerModel.StepMode.StepOver) {
-        // Step over an inlined function.
-        ranges = ranges.concat(await pluginManager.getInlinedCalleesRanges(rawLocation));
-      }
-      return ranges;
     }
-    return [];
+
+    if (!Root.Runtime.experiments.isEnabled('emptySourceMapAutoStepping')) {
+      return [];
+    }
+
+    const compilerMapping = this.debuggerModelToData.get(rawLocation.debuggerModel)?.compilerMapping;
+    if (!compilerMapping) {
+      return [];
+    }
+    ranges = compilerMapping.getLocationRangesForSameSourceLocation(rawLocation);
+    ranges = ranges.filter(range => contained(rawLocation, range));
+    return ranges;
   }
 
   modelAdded(debuggerModel: SDK.DebuggerModel.DebuggerModel): void {
@@ -445,14 +447,7 @@ class ModelData {
   }
 
   private beforePaused(debuggerPausedDetails: SDK.DebuggerModel.DebuggerPausedDetails): boolean {
-    const callFrame = debuggerPausedDetails.callFrames[0];
-    if (!callFrame) {
-      return false;
-    }
-    if (!Root.Runtime.experiments.isEnabled('emptySourceMapAutoStepping')) {
-      return true;
-    }
-    return Boolean(this.compilerMapping.mapsToSourceCode(callFrame.location()));
+    return Boolean(debuggerPausedDetails.callFrames[0]);
   }
 
   dispose(): void {
@@ -566,6 +561,11 @@ class StackTraceTopFrameLocation extends LiveLocationWithPool {
   }
 }
 
+export interface RawLocationRange {
+  start: SDK.DebuggerModel.Location;
+  end: SDK.DebuggerModel.Location;
+}
+
 /**
  * @interface
  */

package/front_end/models/extensions/ExtensionServer.ts

@@ -913,25 +913,22 @@ export class ExtensionServer extends Common.ObjectWrapper.ObjectWrapper<EventTyp
     this.subscriptionStopHandlers.set(eventTopic, onUnsubscribeLast);
   }
 
-  private registerAutosubscriptionHandler(
-      eventTopic: string, eventTarget: Common.EventTarget.EventTarget, frontendEventType: string,
-      handler: (arg0: Common.EventTarget.EventTargetEvent) => unknown): void {
+  private registerAutosubscriptionHandler<Events, T extends Common.EventTarget.EventType<Events>>(
+      eventTopic: string, eventTarget: Common.EventTarget.EventTarget<Events>, frontendEventType: T,
+      handler: Common.EventTarget.EventListener<Events, T>): void {
     this.registerSubscriptionHandler(
         eventTopic, () => eventTarget.addEventListener(frontendEventType, handler, this),
-        eventTarget.removeEventListener.bind(eventTarget, frontendEventType, handler, this));
+        () => eventTarget.removeEventListener(frontendEventType, handler, this));
   }
 
-  private registerAutosubscriptionTargetManagerHandler(
-      eventTopic: string, modelClass: new(arg1: SDK.Target.Target) => SDK.SDKModel.SDKModel, frontendEventType: string,
-      handler: (arg0: Common.EventTarget.EventTargetEvent) => unknown): void {
+  private registerAutosubscriptionTargetManagerHandler<Events, T extends Common.EventTarget.EventType<Events>>(
+      eventTopic: string, modelClass: new(arg1: SDK.Target.Target) => SDK.SDKModel.SDKModel<Events>,
+      frontendEventType: T, handler: Common.EventTarget.EventListener<Events, T>): void {
     this.registerSubscriptionHandler(
         eventTopic,
-
-        SDK.TargetManager.TargetManager.instance().addModelListener.bind(
-            SDK.TargetManager.TargetManager.instance(), modelClass, frontendEventType, handler, this),
-
-        SDK.TargetManager.TargetManager.instance().removeModelListener.bind(
-            SDK.TargetManager.TargetManager.instance(), modelClass, frontendEventType, handler, this));
+        () => SDK.TargetManager.TargetManager.instance().addModelListener(modelClass, frontendEventType, handler, this),
+        () => SDK.TargetManager.TargetManager.instance().removeModelListener(
+            modelClass, frontendEventType, handler, this));
   }
 
   private registerResourceContentCommittedHandler(

package/front_end/models/workspace/WorkspaceImpl.ts

@@ -194,7 +194,7 @@ export class ProjectStore {
 
 let workspaceInstance: WorkspaceImpl|undefined;
 
-export class WorkspaceImpl extends Common.ObjectWrapper.ObjectWrapper {
+export class WorkspaceImpl extends Common.ObjectWrapper.ObjectWrapper<EventTypes> {
   private projectsInternal: Map<string, Project>;
   private hasResourceContentTrackingExtensionsInternal: boolean;
 

package/front_end/models/workspace_diff/WorkspaceDiff.ts

@@ -33,16 +33,14 @@ export class WorkspaceDiffImpl extends Common.ObjectWrapper.ObjectWrapper<EventT
     return this.uiSourceCodeDiff(uiSourceCode).requestDiff();
   }
 
-  subscribeToDiffChange(
-      uiSourceCode: Workspace.UISourceCode.UISourceCode, callback: (arg0: Common.EventTarget.EventTargetEvent) => void,
-      thisObj?: Object): void {
-    this.uiSourceCodeDiff(uiSourceCode).addEventListener(Events.DiffChanged, callback, thisObj);
+  subscribeToDiffChange(uiSourceCode: Workspace.UISourceCode.UISourceCode, callback: () => void, thisObj?: Object):
+      void {
+    this.uiSourceCodeDiff(uiSourceCode).addEventListener(UISourceCodeDiffEvents.DiffChanged, callback, thisObj);
   }
 
-  unsubscribeFromDiffChange(
-      uiSourceCode: Workspace.UISourceCode.UISourceCode, callback: (arg0: Common.EventTarget.EventTargetEvent) => void,
-      thisObj?: Object): void {
-    this.uiSourceCodeDiff(uiSourceCode).removeEventListener(Events.DiffChanged, callback, thisObj);
+  unsubscribeFromDiffChange(uiSourceCode: Workspace.UISourceCode.UISourceCode, callback: () => void, thisObj?: Object):
+      void {
+    this.uiSourceCodeDiff(uiSourceCode).removeEventListener(UISourceCodeDiffEvents.DiffChanged, callback, thisObj);
   }
 
   modifiedUISourceCodes(): Workspace.UISourceCode.UISourceCode[] {
@@ -166,7 +164,20 @@ export class WorkspaceDiffImpl extends Common.ObjectWrapper.ObjectWrapper<EventT
   }
 }
 
-export class UISourceCodeDiff extends Common.ObjectWrapper.ObjectWrapper {
+export const enum Events {
+  ModifiedStatusChanged = 'ModifiedStatusChanged',
+}
+
+export interface ModifiedStatusChangedEvent {
+  uiSourceCode: Workspace.UISourceCode.UISourceCode;
+  isModified: boolean;
+}
+
+export type EventTypes = {
+  [Events.ModifiedStatusChanged]: ModifiedStatusChangedEvent,
+};
+
+export class UISourceCodeDiff extends Common.ObjectWrapper.ObjectWrapper<UISourceCodeDiffEventTypes> {
   private uiSourceCode: Workspace.UISourceCode.UISourceCode;
   private requestDiffPromise: Promise<Diff.Diff.DiffArray|null>|null;
   private pendingChanges: number|null;
@@ -196,7 +207,7 @@ export class UISourceCodeDiff extends Common.ObjectWrapper.ObjectWrapper {
       if (this.dispose) {
         return;
       }
-      this.dispatchEventToListeners(Events.DiffChanged);
+      this.dispatchEventToListeners(UISourceCodeDiffEvents.DiffChanged);
       this.pendingChanges = null;
     }
   }
@@ -259,19 +270,12 @@ export class UISourceCodeDiff extends Common.ObjectWrapper.ObjectWrapper {
 
 // TODO(crbug.com/1167717): Make this a const enum again
 // eslint-disable-next-line rulesdir/const_enum
-export enum Events {
+export enum UISourceCodeDiffEvents {
   DiffChanged = 'DiffChanged',
-  ModifiedStatusChanged = 'ModifiedStatusChanged',
-}
-
-export interface ModifiedStatusChangedEvent {
-  uiSourceCode: Workspace.UISourceCode.UISourceCode;
-  isModified: boolean;
 }
 
-export type EventTypes = {
-  [Events.DiffChanged]: void,
-  [Events.ModifiedStatusChanged]: ModifiedStatusChangedEvent,
+export type UISourceCodeDiffEventTypes = {
+  [UISourceCodeDiffEvents.DiffChanged]: void,
 };
 
 // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration