chrome-devtools-frontend 1.0.1014346 → 1.0.1014853

package/.eslintignore

@@ -7,6 +7,7 @@ front_end/.eslintrc.js
 front_end/diff/diff_match_patch.js
 front_end/generated/protocol.ts
 front_end/javascript_metadata/NativeFunctions.js
+front_end/javascript_metadata/DOMPinnedProperties.ts
 front_end/third_party/
 node_modules
 scripts/migration/**/*.js

package/front_end/core/sdk/SourceMap.ts

@@ -66,6 +66,11 @@ export interface SourceMap {
       TextUtils.ContentProvider.ContentProvider;
   embeddedContentByURL(sourceURL: Platform.DevToolsPath.UrlString): string|null;
   findEntry(lineNumber: number, columnNumber: number): SourceMapEntry|null;
+  findEntryRanges(lineNumber: number, columnNumber: number): {
+    range: TextUtils.TextRange.TextRange,
+    sourceRange: TextUtils.TextRange.TextRange,
+    sourceURL: Platform.DevToolsPath.UrlString,
+  }|null;
   findReverseRanges(sourceURL: Platform.DevToolsPath.UrlString, lineNumber: number, columnNumber: number):
       TextUtils.TextRange.TextRange[];
   sourceLineMapping(sourceURL: Platform.DevToolsPath.UrlString, lineNumber: number, columnNumber: number):
@@ -233,6 +238,52 @@ export class TextSourceMap implements SourceMap {
     return index ? mappings[index - 1] : null;
   }
 
+  findEntryRanges(lineNumber: number, columnNumber: number): {
+    range: TextUtils.TextRange.TextRange,
+    sourceRange: TextUtils.TextRange.TextRange,
+    sourceURL: Platform.DevToolsPath.UrlString,
+  }|null {
+    const mappings = this.mappings();
+    const index = Platform.ArrayUtilities.upperBound(
+        mappings, undefined, (unused, entry) => lineNumber - entry.lineNumber || columnNumber - entry.columnNumber);
+    if (!index) {
+      // If the line and column are preceding all the entries, then there is nothing to map.
+      return null;
+    }
+    const sourceURL = mappings[index].sourceURL;
+    if (!sourceURL) {
+      return null;
+    }
+
+    // Let us compute the range that contains the source position in the compiled code.
+    const endLine = index < mappings.length ? mappings[index].lineNumber : 2 ** 31 - 1;
+    const endColumn = index < mappings.length ? mappings[index].columnNumber : 2 ** 31 - 1;
+    const range = new TextUtils.TextRange.TextRange(
+        mappings[index - 1].lineNumber, mappings[index - 1].columnNumber, endLine, endColumn);
+
+    // Now try to find the corresponding token in the original code.
+    const reverseMappings = this.reversedMappings(sourceURL);
+    const startSourceLine = mappings[index - 1].sourceLineNumber;
+    const startSourceColumn = mappings[index - 1].sourceColumnNumber;
+    const endReverseIndex = Platform.ArrayUtilities.upperBound(
+        reverseMappings, undefined,
+        (unused, i) =>
+            startSourceLine - mappings[i].sourceLineNumber || startSourceColumn - mappings[i].sourceColumnNumber);
+    if (!endReverseIndex) {
+      return null;
+    }
+    const endSourceLine = endReverseIndex < reverseMappings.length ?
+        mappings[reverseMappings[endReverseIndex]].sourceLineNumber :
+        2 ** 31 - 1;
+    const endSourceColumn = endReverseIndex < reverseMappings.length ?
+        mappings[reverseMappings[endReverseIndex]].sourceColumnNumber :
+        2 ** 31 - 1;
+
+    const sourceRange =
+        new TextUtils.TextRange.TextRange(startSourceLine, startSourceColumn, endSourceLine, endSourceColumn);
+    return {range, sourceRange, sourceURL};
+  }
+
   sourceLineMapping(sourceURL: Platform.DevToolsPath.UrlString, lineNumber: number, columnNumber: number):
       SourceMapEntry|null {
     const mappings = this.mappings();
@@ -315,42 +366,53 @@ export class TextSourceMap implements SourceMap {
   }
 
   mappings(): SourceMapEntry[] {
+    this.#ensureMappingsProcessed();
+    return this.#mappingsInternal ?? [];
+  }
+
+  private reversedMappings(sourceURL: Platform.DevToolsPath.UrlString): number[] {
+    this.#ensureMappingsProcessed();
+    return this.#sourceInfos.get(sourceURL)?.reverseMappings ?? [];
+  }
+
+  #ensureMappingsProcessed(): void {
     if (this.#mappingsInternal === null) {
       this.#mappingsInternal = [];
       this.eachSection(this.parseMap.bind(this));
+      this.#computeReverseMappings(this.#mappingsInternal);
       this.#json = null;
     }
-    return this.#mappingsInternal;
   }
 
-  private reversedMappings(sourceURL: Platform.DevToolsPath.UrlString): number[] {
-    const info = this.#sourceInfos.get(sourceURL);
-    if (!info) {
-      return [];
-    }
-    const mappings = this.mappings();
-    if (info.reverseMappings === null) {
-      const indexes = Array(mappings.length).fill(0).map((_, i) => i);
-      info.reverseMappings = indexes.filter(i => mappings[i].sourceURL === sourceURL).sort(sourceMappingComparator);
+  #computeReverseMappings(mappings: SourceMapEntry[]): void {
+    const reverseMappingsPerUrl = new Map<Platform.DevToolsPath.UrlString, number[]>();
+    for (let i = 0; i < mappings.length; i++) {
+      const entryUrl = mappings[i].sourceURL;
+      if (!entryUrl) {
+        continue;
+      }
+      let reverseMap = reverseMappingsPerUrl.get(entryUrl);
+      if (!reverseMap) {
+        reverseMap = [];
+        reverseMappingsPerUrl.set(entryUrl, reverseMap);
+      }
+      reverseMap.push(i);
     }
 
-    return info.reverseMappings;
+    for (const [url, reverseMap] of reverseMappingsPerUrl.entries()) {
+      const info = this.#sourceInfos.get(url);
+      if (!info) {
+        continue;
+      }
+      reverseMap.sort(sourceMappingComparator);
+      info.reverseMappings = reverseMap;
+    }
 
     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;
-      }
-      if (a.sourceColumnNumber !== b.sourceColumnNumber) {
-        return a.sourceColumnNumber - b.sourceColumnNumber;
-      }
-
-      if (a.lineNumber !== b.lineNumber) {
-        return a.lineNumber - b.lineNumber;
-      }
-
-      return a.columnNumber - b.columnNumber;
+      return a.sourceLineNumber - b.sourceLineNumber || a.sourceColumnNumber - b.sourceColumnNumber ||
+          a.lineNumber - b.lineNumber || a.columnNumber - b.columnNumber;
     }
   }
 
@@ -392,7 +454,7 @@ export class TextSourceMap implements SourceMap {
       if (this.#sourceInfos.has(url)) {
         continue;
       }
-      this.#sourceInfos.set(url, new TextSourceMap.SourceInfo(source || null, null));
+      this.#sourceInfos.set(url, new TextSourceMap.SourceInfo(source ?? null));
       sourcesList.push(url);
     }
     sourceMapToSourceList.set(sourceMap, sourcesList);
@@ -560,11 +622,10 @@ export namespace TextSourceMap {
 
   export class SourceInfo {
     content: string|null;
-    reverseMappings: number[]|null;
+    reverseMappings: number[]|null = null;
 
-    constructor(content: string|null, reverseMappings: number[]|null) {
+    constructor(content: string|null) {
       this.content = content;
-      this.reverseMappings = reverseMappings;
     }
   }
 }