chrome-devtools-frontend 1.0.980193 → 1.0.981004

package/front_end/core/common/ParsedURL.ts

@@ -64,6 +64,16 @@ export function normalizePath(path: string): string {
   return normalizedPath;
 }
 
+/**
+ * File paths in DevTools that are represented either as unencoded absolute or relative paths, or encoded paths, or URLs.
+ * @example
+ * RawPathString: “/Hello World/file.js”
+ * EncodedPathString: “/Hello%20World/file.js”
+ * UrlString: “file:///Hello%20World/file/js”
+ */
+type BrandedPathString =
+    Platform.DevToolsPath.UrlString|Platform.DevToolsPath.RawPathString|Platform.DevToolsPath.EncodedPathString;
+
 export class ParsedURL {
   isValid: boolean;
   url: string;
@@ -215,18 +225,41 @@ export class ParsedURL {
     return decodedFileURL.substr('file://'.length) as Platform.DevToolsPath.RawPathString;
   }
 
-  static substr<DevToolsPathType extends Platform.DevToolsPath.UrlString|Platform.DevToolsPath.RawPathString|
-                                         Platform.DevToolsPath.EncodedPathString>(
+  static sliceUrlToEncodedPathString(url: Platform.DevToolsPath.UrlString, start: number):
+      Platform.DevToolsPath.EncodedPathString {
+    return url.substring(start) as Platform.DevToolsPath.EncodedPathString;
+  }
+
+  static substr<DevToolsPathType extends BrandedPathString>(
       devToolsPath: DevToolsPathType, from: number, length?: number): DevToolsPathType {
     return devToolsPath.substr(from, length) as DevToolsPathType;
   }
 
-  static concatenate<DevToolsPathType extends Platform.DevToolsPath.UrlString|Platform.DevToolsPath
-                                                  .RawPathString|Platform.DevToolsPath.EncodedPathString>(
+  static substring<DevToolsPathType extends BrandedPathString>(
+      devToolsPath: DevToolsPathType, start: number, end?: number): DevToolsPathType {
+    return devToolsPath.substring(start, end) as DevToolsPathType;
+  }
+
+  static prepend<DevToolsPathType extends BrandedPathString>(prefix: string, devToolsPath: DevToolsPathType):
+      DevToolsPathType {
+    return prefix + devToolsPath as DevToolsPathType;
+  }
+
+  static concatenate<DevToolsPathType extends BrandedPathString>(
       devToolsPath: DevToolsPathType, ...appendage: string[]): DevToolsPathType {
     return devToolsPath.concat(...appendage) as DevToolsPathType;
   }
 
+  static trim<DevToolsPathType extends BrandedPathString>(devToolsPath: DevToolsPathType): DevToolsPathType {
+    return devToolsPath.trim() as DevToolsPathType;
+  }
+
+  static join<DevToolsPathType extends Platform.DevToolsPath.UrlString|Platform.DevToolsPath.RawPathString|
+                                       Platform.DevToolsPath.EncodedPathString>(
+      devToolsPaths: DevToolsPathType[], separator?: string): DevToolsPathType {
+    return devToolsPaths.join(separator) as DevToolsPathType;
+  }
+
   static urlWithoutHash(url: string): string {
     const hashIndex = url.indexOf('#');
     if (hashIndex !== -1) {

package/front_end/core/platform/DevToolsPath.ts

@@ -11,6 +11,7 @@ class UrlStringTag {
  * “file:///Hello%20World/file/js”
  */
 export type UrlString = string&UrlStringTag;
+export const EmptyUrlString = '' as UrlString;
 
 class RawPathStringTag {
   private rawPathTag: (string|undefined);
@@ -22,6 +23,7 @@ class RawPathStringTag {
  * “/Hello World/file.js”
  */
 export type RawPathString = string&RawPathStringTag;
+export const EmptyRawPathString = '' as RawPathString;
 
 class EncodedPathStringTag {
   private encodedPathTag: (string|undefined);
@@ -32,3 +34,4 @@ class EncodedPathStringTag {
  * “/Hello%20World/file.js”
  */
 export type EncodedPathString = string&EncodedPathStringTag;
+export const EmptyEncodedPathString = '' as EncodedPathString;

package/front_end/core/sdk/CSSRule.ts

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import type * as Platform from '../platform/platform.js';
 import * as Protocol from '../../generated/protocol.js';
 import * as TextUtils from '../../models/text_utils/text_utils.js';
+import * as Platform from '../platform/platform.js';
 
 import {CSSContainerQuery} from './CSSContainerQuery.js';
 import {CSSLayer} from './CSSLayer.js';
@@ -47,7 +47,7 @@ export class CSSRule {
 
   resourceURL(): Platform.DevToolsPath.UrlString {
     if (!this.styleSheetId) {
-      return '' as Platform.DevToolsPath.UrlString;
+      return Platform.DevToolsPath.EmptyUrlString;
     }
     const styleSheetHeader = this.getStyleSheetHeader(this.styleSheetId);
     return styleSheetHeader.resourceURL();

package/front_end/core/sdk/DOMDebuggerModel.ts

@@ -4,7 +4,7 @@
 
 import * as Common from '../common/common.js';
 import * as i18n from '../i18n/i18n.js';
-import type * as Platform from '../platform/platform.js';
+import * as Platform from '../platform/platform.js';
 import type * as ProtocolProxyApi from '../../generated/protocol-proxy-api.js';
 import * as Protocol from '../../generated/protocol.js';
 
@@ -534,7 +534,7 @@ export class EventListener {
     this.#originalHandlerInternal = originalHandler || handler;
     this.#locationInternal = location;
     const script = location.script();
-    this.#sourceURLInternal = script ? script.contentURL() : '' as Platform.DevToolsPath.UrlString;
+    this.#sourceURLInternal = script ? script.contentURL() : Platform.DevToolsPath.EmptyUrlString;
     this.#customRemoveFunction = customRemoveFunction;
     this.#originInternal = origin || EventListener.Origin.Raw;
   }

package/front_end/core/sdk/NetworkRequest.ts

@@ -379,7 +379,7 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
       backendRequestId: Protocol.Network.RequestId, requestURL: Platform.DevToolsPath.UrlString,
       initiator?: Protocol.Network.Initiator): NetworkRequest {
     return new NetworkRequest(
-        backendRequestId, backendRequestId, requestURL, '' as Platform.DevToolsPath.UrlString, null, null,
+        backendRequestId, backendRequestId, requestURL, Platform.DevToolsPath.EmptyUrlString, null, null,
         initiator || null);
   }
 

package/front_end/core/sdk/SourceMap.ts

@@ -296,10 +296,19 @@ export class TextSourceMap implements SourceMap {
         ++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));
+
+      // Source maps don't contain end positions for entries, but each entry is assumed to
+      // span until the following entry. This doesn't work however in case of the last
+      // entry, where there's no following entry. We also don't know the number of lines
+      // and columns in the original source code (which might not be available at all), so
+      // for that case we store the maximum signed 32-bit integer, which is definitely going
+      // to be larger than any script we can process and can safely be serialized as part of
+      // the skip list we send to V8 with `Debugger.stepOver` (http://crbug.com/1305956).
+      const startLine = mappings[startIndex].lineNumber;
+      const startColumn = mappings[startIndex].columnNumber;
+      const endLine = endIndex < mappings.length ? mappings[endIndex].lineNumber : 2 ** 31 - 1;
+      const endColumn = endIndex < mappings.length ? mappings[endIndex].columnNumber : 2 ** 31 - 1;
+      ranges.push(new TextUtils.TextRange.TextRange(startLine, startColumn, endLine, endColumn));
     }
 
     return ranges;
@@ -360,7 +369,7 @@ export class TextSourceMap implements SourceMap {
 
   private parseSources(sourceMap: SourceMapV3): void {
     const sourcesList = [];
-    let sourceRoot = sourceMap.sourceRoot || '' as Platform.DevToolsPath.UrlString;
+    let sourceRoot = sourceMap.sourceRoot || Platform.DevToolsPath.EmptyUrlString;
     if (sourceRoot && !sourceRoot.endsWith('/')) {
       sourceRoot = Common.ParsedURL.ParsedURL.concatenate(sourceRoot, '/');
     }

package/front_end/core/sdk/Target.ts

@@ -4,7 +4,7 @@
 
 import * as Common from '../common/common.js';
 import * as Host from '../host/host.js';
-import type * as Platform from '../platform/platform.js';
+import * as Platform from '../platform/platform.js';
 import * as ProtocolClient from '../protocol_client/protocol_client.js';
 import type * as Protocol from '../../generated/protocol.js';
 import type {TargetManager} from './TargetManager.js';
@@ -32,7 +32,7 @@ export class Target extends ProtocolClient.InspectorBackend.TargetBase {
     super(needsNodeJSPatching, parentTarget, sessionId, connection);
     this.#targetManagerInternal = targetManager;
     this.#nameInternal = name;
-    this.#inspectedURLInternal = '' as Platform.DevToolsPath.UrlString;
+    this.#inspectedURLInternal = Platform.DevToolsPath.EmptyUrlString;
     this.#inspectedURLName = '';
     this.#capabilitiesMask = 0;
     switch (type) {

package/front_end/entrypoints/formatter_worker/FormatterWorker.ts

@@ -87,19 +87,17 @@ export function createTokenizer(mimeType: string): (
 export const AbortTokenization = {};
 
 export function evaluatableJavaScriptSubstring(content: string): string {
-  const tokenizer = Acorn.tokenizer(content, {ecmaVersion: ECMA_VERSION});
-  let result = '';
   try {
+    const tokenizer = Acorn.tokenizer(content, {ecmaVersion: ECMA_VERSION});
     let token = tokenizer.getToken();
-    while (token.type !== Acorn.tokTypes.eof && AcornTokenizer.punctuator(token)) {
+    while (AcornTokenizer.punctuator(token)) {
       token = tokenizer.getToken();
     }
 
     const startIndex = token.start;
-    let endIndex: number = token.end;
-    let openBracketsCounter = 0;
+    let endIndex = token.end;
     while (token.type !== Acorn.tokTypes.eof) {
-      const isIdentifier = AcornTokenizer.identifier(token);
+      const isIdentifier = token.type === Acorn.tokTypes.name || token.type === Acorn.tokTypes.privateId;
       const isThis = AcornTokenizer.keyword(token, 'this');
       const isString = token.type === Acorn.tokTypes.string;
       if (!isThis && !isIdentifier && !isString) {
@@ -108,24 +106,35 @@ export function evaluatableJavaScriptSubstring(content: string): string {
 
       endIndex = token.end;
       token = tokenizer.getToken();
-      while (AcornTokenizer.punctuator(token, '.[]')) {
-        if (AcornTokenizer.punctuator(token, '[')) {
-          openBracketsCounter++;
-        }
 
-        if (AcornTokenizer.punctuator(token, ']')) {
-          endIndex = openBracketsCounter > 0 ? token.end : endIndex;
-          openBracketsCounter--;
-        }
+      while (AcornTokenizer.punctuator(token, '[')) {
+        let openBracketCounter = 0;
+        do {
+          if (AcornTokenizer.punctuator(token, '[')) {
+            ++openBracketCounter;
+          }
+          token = tokenizer.getToken();
+          if (AcornTokenizer.punctuator(token, ']')) {
+            if (--openBracketCounter === 0) {
+              endIndex = token.end;
+              token = tokenizer.getToken();
+              break;
+            }
+          }
+        } while (token.type !== Acorn.tokTypes.eof);
+      }
 
-        token = tokenizer.getToken();
+      if (!AcornTokenizer.punctuator(token, '.')) {
+        break;
       }
+
+      token = tokenizer.getToken();
     }
-    result = content.substring(startIndex, endIndex);
+    return content.substring(startIndex, endIndex);
   } catch (e) {
     console.error(e);
+    return '';
   }
-  return result;
 }
 
 export function javaScriptIdentifiers(content: string): {

package/front_end/legacy_test_runner/bindings_test_runner/BindingsTestRunner.js

@@ -236,3 +236,8 @@ BindingsTestRunner.dumpLocation = async function(liveLocation, hint) {
       prefix + BindingsTestRunner.cleanupURL(uiLocation.uiSourceCode.url()) + ':' + uiLocation.lineNumber + ':' +
       uiLocation.columnNumber);
 };
+
+BindingsTestRunner.GC = async () => {
+  await TestRunner.evaluateInPageAsync(`new Promise(resolve =>
+    GCController.asyncCollectAll(resolve))`);
+};

package/front_end/models/bindings/BreakpointManager.ts

@@ -28,8 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// TODO(crbug.com/1253323): All casts to RawPathString will be removed from this file when migration to branded types is complete.
-
 import * as Common from '../../core/common/common.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import type * as Platform from '../../core/platform/platform.js';

package/front_end/models/bindings/ContentProviderBasedProject.ts

@@ -30,6 +30,7 @@
 
 import type * as Common from '../../core/common/common.js';
 import * as i18n from '../../core/i18n/i18n.js';
+import type * as Platform from '../../core/platform/platform.js';
 import type * as TextUtils from '../text_utils/text_utils.js';
 import * as Workspace from '../workspace/workspace.js';
 
@@ -115,7 +116,7 @@ export class ContentProviderBasedProject extends Workspace.Workspace.ProjectStor
   }
 
   rename(
-      uiSourceCode: Workspace.UISourceCode.UISourceCode, newName: string,
+      uiSourceCode: Workspace.UISourceCode.UISourceCode, newName: Platform.DevToolsPath.RawPathString,
       callback:
           (arg0: boolean, arg1?: string|undefined, arg2?: string|undefined,
            arg3?: Common.ResourceType.ResourceType|undefined) => void): void {
@@ -139,12 +140,13 @@ export class ContentProviderBasedProject extends Workspace.Workspace.ProjectStor
   excludeFolder(_path: string): void {
   }
 
-  canExcludeFolder(_path: string): boolean {
+  canExcludeFolder(_path: Platform.DevToolsPath.EncodedPathString): boolean {
     return false;
   }
 
-  async createFile(_path: string, _name: string|null, _content: string, _isBase64?: boolean):
-      Promise<Workspace.UISourceCode.UISourceCode|null> {
+  async createFile(
+      _path: Platform.DevToolsPath.EncodedPathString, _name: string|null, _content: string,
+      _isBase64?: boolean): Promise<Workspace.UISourceCode.UISourceCode|null> {
     return null;
   }
 

package/front_end/models/persistence/EditFileSystemView.ts

@@ -30,6 +30,7 @@
 
 import * as Common from '../../core/common/common.js';
 import * as i18n from '../../core/i18n/i18n.js';
+import type * as Platform from '../../core/platform/platform.js';
 import * as UI from '../../ui/legacy/legacy.js';
 
 import editFileSystemViewStyles from './editFileSystemView.css.js';
@@ -152,7 +153,8 @@ export class EditFileSystemView extends UI.Widget.VBox implements UI.ListWidget.
     if (!isNew) {
       this.getFileSystem().removeExcludedFolder(item);
     }
-    this.getFileSystem().addExcludedFolder(this.normalizePrefix(editor.control('pathPrefix').value));
+    this.getFileSystem().addExcludedFolder(
+        this.normalizePrefix(editor.control('pathPrefix').value) as Platform.DevToolsPath.EncodedPathString);
     this.muteUpdate = false;
     this.update();
   }

package/front_end/models/persistence/FileSystemWorkspaceBinding.ts

@@ -28,6 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+// TODO(crbug.com/1253323): Cast to Branded Types will be removed from this file when migration to branded types is complete.
+
 import * as Common from '../../core/common/common.js';
 import * as Platform from '../../core/platform/platform.js';
 import * as TextUtils from '../text_utils/text_utils.js';
@@ -200,7 +202,8 @@ export class FileSystem extends Workspace.Workspace.ProjectStore {
 
   private filePathForUISourceCode(uiSourceCode: Workspace.UISourceCode.UISourceCode):
       Platform.DevToolsPath.EncodedPathString {
-    return uiSourceCode.url().substring(this.fileSystemPathInternal.length) as Platform.DevToolsPath.EncodedPathString;
+    return Common.ParsedURL.ParsedURL.sliceUrlToEncodedPathString(
+        uiSourceCode.url(), this.fileSystemPathInternal.length);
   }
 
   isServiceProject(): boolean {
@@ -257,7 +260,7 @@ export class FileSystem extends Workspace.Workspace.ProjectStore {
   }
 
   rename(
-      uiSourceCode: Workspace.UISourceCode.UISourceCode, newName: string,
+      uiSourceCode: Workspace.UISourceCode.UISourceCode, newName: Platform.DevToolsPath.RawPathString,
       callback:
           (arg0: boolean, arg1?: string|undefined, arg2?: string|undefined,
            arg3?: Common.ResourceType.ResourceType|undefined) => void): void {
@@ -339,12 +342,13 @@ export class FileSystem extends Workspace.Workspace.ProjectStore {
   }
 
   excludeFolder(url: string): void {
-    let relativeFolder = url.substring(this.fileSystemBaseURL.length);
+    let relativeFolder = Common.ParsedURL.ParsedURL.sliceUrlToEncodedPathString(
+        url as Platform.DevToolsPath.UrlString, this.fileSystemBaseURL.length);
     if (!relativeFolder.startsWith('/')) {
-      relativeFolder = '/' + relativeFolder;
+      relativeFolder = Common.ParsedURL.ParsedURL.prepend('/', relativeFolder);
     }
     if (!relativeFolder.endsWith('/')) {
-      relativeFolder += '/';
+      relativeFolder = Common.ParsedURL.ParsedURL.concatenate(relativeFolder, '/');
     }
     this.fileSystemInternal.addExcludedFolder(relativeFolder);
 
@@ -357,7 +361,7 @@ export class FileSystem extends Workspace.Workspace.ProjectStore {
     }
   }
 
-  canExcludeFolder(path: string): boolean {
+  canExcludeFolder(path: Platform.DevToolsPath.EncodedPathString): boolean {
     return this.fileSystemInternal.canExcludeFolder(path);
   }
 
@@ -365,8 +369,9 @@ export class FileSystem extends Workspace.Workspace.ProjectStore {
     return true;
   }
 
-  async createFile(path: string, name: string|null, content: string, isBase64?: boolean):
-      Promise<Workspace.UISourceCode.UISourceCode|null> {
+  async createFile(
+      path: Platform.DevToolsPath.EncodedPathString, name: Platform.DevToolsPath.RawPathString|null, content: string,
+      isBase64?: boolean): Promise<Workspace.UISourceCode.UISourceCode|null> {
     const guardFileName = this.fileSystemPathInternal + path + (!path.endsWith('/') ? '/' : '') + name;
     this.creatingFilesGuard.add(guardFileName);
     const filePath = await this.fileSystemInternal.createFile(path, name);
@@ -392,7 +397,7 @@ export class FileSystem extends Workspace.Workspace.ProjectStore {
     this.fileSystemWorkspaceBinding.isolatedFileSystemManager.removeFileSystem(this.fileSystemInternal);
   }
 
-  private addFile(filePath: string): Workspace.UISourceCode.UISourceCode {
+  private addFile(filePath: Platform.DevToolsPath.EncodedPathString): Workspace.UISourceCode.UISourceCode {
     const contentType = this.fileSystemInternal.contentType(filePath);
     const uiSourceCode = this.createUISourceCode(this.fileSystemBaseURL + filePath, contentType);
     this.addUISourceCode(uiSourceCode);