npm - chrome-devtools-frontend - Versions diffs - 1.0.969882 → 1.0.971140 - Mend

chrome-devtools-frontend 1.0.969882 → 1.0.971140

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (70) hide show

package/config/gni/devtools_grd_files.gni CHANGED Viewed

@@ -59,6 +59,7 @@ grd_files_release_sources = [
   "front_end/Images/flex-nowrap-icon.svg",
   "front_end/Images/flex-wrap-icon.svg",
   "front_end/Images/help_outline.svg",
+  "front_end/Images/ic_changes.svg",
   "front_end/Images/ic_checkmark_16x16.svg",
   "front_end/Images/ic_command_go_to_line.svg",
   "front_end/Images/ic_command_go_to_symbol.svg",
@@ -569,6 +570,7 @@ grd_files_debug_sources = [
   "front_end/core/i18n/time-utilities.js",
   "front_end/core/platform/DevToolsPath.js",
   "front_end/core/platform/UIString.js",
+  "front_end/core/platform/UserVisibleError.js",
   "front_end/core/platform/array-utilities.js",
   "front_end/core/platform/date-utilities.js",
   "front_end/core/platform/dcheck.js",
@@ -1044,6 +1046,7 @@ grd_files_debug_sources = [
   "front_end/panels/lighthouse/LighthouseReportSelector.js",
   "front_end/panels/lighthouse/LighthouseReporterTypes.js",
   "front_end/panels/lighthouse/LighthouseStartView.js",
+  "front_end/panels/lighthouse/LighthouseStartViewFR.js",
   "front_end/panels/lighthouse/LighthouseStatusView.js",
   "front_end/panels/lighthouse/RadioSetting.js",
   "front_end/panels/lighthouse/lighthouseDialog.css.js",

package/config/gni/devtools_image_files.gni CHANGED Viewed

@@ -69,6 +69,7 @@ devtools_svg_sources = [
   "flex-nowrap-icon.svg",
   "flex-wrap-icon.svg",
   "help_outline.svg",
+  "ic_changes.svg",
   "ic_checkmark_16x16.svg",
   "ic_command_go_to_line.svg",
   "ic_command_go_to_symbol.svg",

package/front_end/Images/src/ic_changes.svg ADDED Viewed

@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.75 16.75V6.74572L12.4599 3.25H5.25V16.75H15.75ZM13 2L17 6.25V17C17 17.5523 16.5523 18 16 18H5C4.44772 18 4 17.5523 4 17V3C4 2.44772 4.44772 2 5 2H13Z" fill="black"/>
+<path d="M11 6H10V8H8V9H10V11H11V9H13V8H11V6Z" fill="black"/>
+<path d="M13 13L13 14L8 14L8 13L13 13Z" fill="black"/>
+</svg>

package/front_end/core/common/ParsedURL.ts CHANGED Viewed

@@ -162,6 +162,22 @@ export class ParsedURL {
     return new URL('/' + partiallyEncoded, 'file:///').pathname.substr(1) as Platform.DevToolsPath.EncodedPathString;
   }
+  /**
+   * @param name Must not be encoded
+   */
+  static encodedFromParentPathAndName(parentPath: Platform.DevToolsPath.EncodedPathString, name: string):
+      Platform.DevToolsPath.EncodedPathString {
+    return parentPath + '/' + encodeURIComponent(name) as Platform.DevToolsPath.EncodedPathString;
+  }
+  /**
+   * @param name Must not be encoded
+   */
+  static urlFromParentUrlAndName(parentUrl: Platform.DevToolsPath.UrlString, name: string):
+      Platform.DevToolsPath.UrlString {
+    return parentUrl + '/' + encodeURIComponent(name) as Platform.DevToolsPath.UrlString;
+  }
   static encodedPathToRawPathString(encPath: Platform.DevToolsPath.EncodedPathString):
       Platform.DevToolsPath.RawPathString {
     return decodeURIComponent(encPath) as Platform.DevToolsPath.RawPathString;
@@ -181,8 +197,9 @@ export class ParsedURL {
     return new URL(preEncodedPath).toString() as Platform.DevToolsPath.UrlString;
   }
-  static relativePathToUrlString(relativePath: string, baseURL: Platform.DevToolsPath.UrlString):
-      Platform.DevToolsPath.UrlString {
+  static relativePathToUrlString(
+      relativePath: Platform.DevToolsPath.RawPathString,
+      baseURL: Platform.DevToolsPath.UrlString): Platform.DevToolsPath.UrlString {
     const preEncodedPath: string = ParsedURL.preEncodeSpecialCharactersInPath(
         relativePath.replace(/\\/g, '/') as Platform.DevToolsPath.RawPathString);
     return new URL(preEncodedPath, baseURL).toString() as Platform.DevToolsPath.UrlString;
@@ -198,6 +215,12 @@ 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>(
+      devToolsPath: DevToolsPathType, from: number, length?: number): DevToolsPathType {
+    return devToolsPath.substr(from, length) as typeof devToolsPath;
+  }
   static urlWithoutHash(url: string): string {
     const hashIndex = url.indexOf('#');
     if (hashIndex !== -1) {
@@ -233,9 +256,9 @@ export class ParsedURL {
     return ParsedURL.urlRegexInstance;
   }
-  static extractPath(url: string): string {
+  static extractPath(url: string): Platform.DevToolsPath.EncodedPathString {
     const parsedURL = this.fromString(url);
-    return parsedURL ? parsedURL.path : '';
+    return (parsedURL ? parsedURL.path : '') as Platform.DevToolsPath.EncodedPathString;
   }
   static extractOrigin(url: string): string {

package/front_end/core/host/UserMetrics.ts CHANGED Viewed

@@ -586,7 +586,9 @@ export enum DevtoolsExperiments {
   'bfcacheDisplayTree' = 54,
   'stylesPaneCSSChanges' = 55,
   'headerOverrides' = 56,
-  'MaxValue' = 57,
+  'lighthousePanelFR' = 57,
+  // Increment this when new experiments are added.
+  'MaxValue' = 58,
 }
 /* eslint-enable @typescript-eslint/naming-convention */

package/front_end/core/i18n/locales/en-US.json CHANGED Viewed

@@ -1421,9 +1421,6 @@
   "models/logs/NetworkLog.ts | anonymous": {
     "message": "<anonymous>"
   },
-  "models/persistence/Automapping.ts | theAttemptToBindSInTheWorkspace": {
-    "message": "The attempt to bind \"{PH1}\" in the workspace failed as this URI is malformed."
-  },
   "models/persistence/EditFileSystemView.ts | add": {
     "message": "Add"
   },
@@ -4838,6 +4835,12 @@
   "panels/elements/StylesSidebarPane.ts | constructedStylesheet": {
     "message": "constructed stylesheet"
   },
+  "panels/elements/StylesSidebarPane.ts | copiedToClipboard": {
+    "message": "Copied to clipboard"
+  },
+  "panels/elements/StylesSidebarPane.ts | copyAllCSSChanges": {
+    "message": "Copy all the CSS changes"
+  },
   "panels/elements/StylesSidebarPane.ts | copyAllDeclarations": {
     "message": "Copy all declarations"
   },
@@ -5768,6 +5771,9 @@
   "panels/lighthouse/LighthouseController.ts | legacyNavigation": {
     "message": "Legacy navigation"
   },
+  "panels/lighthouse/LighthouseController.ts | lighthouseMode": {
+    "message": "Lighthouse mode"
+  },
   "panels/lighthouse/LighthouseController.ts | localStorage": {
     "message": "Local Storage"
   },
@@ -5777,6 +5783,9 @@
   "panels/lighthouse/LighthouseController.ts | multipleTabsAreBeingControlledBy": {
     "message": "Multiple tabs are being controlled by the same service worker. Close your other tabs on the same origin to audit this page."
   },
+  "panels/lighthouse/LighthouseController.ts | navigation": {
+    "message": "Navigation"
+  },
   "panels/lighthouse/LighthouseController.ts | performance": {
     "message": "Performance"
   },
@@ -5789,6 +5798,9 @@
   "panels/lighthouse/LighthouseController.ts | resetStorageLocalstorage": {
     "message": "Reset storage (cache, service workers, etc) before auditing. (Good for performance & PWA testing)"
   },
+  "panels/lighthouse/LighthouseController.ts | runLighthouseInMode": {
+    "message": "Run Lighthouse in navigation, timespan, or snapshot mode"
+  },
   "panels/lighthouse/LighthouseController.ts | seo": {
     "message": "SEO"
   },
@@ -5798,6 +5810,9 @@
   "panels/lighthouse/LighthouseController.ts | simulatedThrottling": {
     "message": "Simulated throttling"
   },
+  "panels/lighthouse/LighthouseController.ts | snapshot": {
+    "message": "Snapshot"
+  },
   "panels/lighthouse/LighthouseController.ts | thereMayBeStoredDataAffectingLoadingPlural": {
     "message": "There may be stored data affecting loading performance in these locations: {PH1}. Audit this page in an incognito window to prevent those resources from affecting your scores."
   },
@@ -5864,6 +5879,9 @@
   "panels/lighthouse/LighthouseStartView.ts | learnMore": {
     "message": "Learn more"
   },
+  "panels/lighthouse/LighthouseStartViewFR.ts | mode": {
+    "message": "Mode"
+  },
   "panels/lighthouse/LighthouseStatusView.ts | ahSorryWeRanIntoAnError": {
     "message": "Ah, sorry! We ran into an error."
   },

package/front_end/core/i18n/locales/en-XL.json CHANGED Viewed

@@ -1421,9 +1421,6 @@
   "models/logs/NetworkLog.ts | anonymous": {
     "message": "<âńôńŷḿôúŝ>"
   },
-  "models/persistence/Automapping.ts | theAttemptToBindSInTheWorkspace": {
-    "message": "T̂h́ê át̂t́êḿp̂t́ t̂ó b̂ín̂d́ \"{PH1}\" îń t̂h́ê ẃôŕk̂śp̂áĉé f̂áîĺêd́ âś t̂h́îś ÛŔÎ íŝ ḿâĺf̂ór̂ḿêd́."
-  },
   "models/persistence/EditFileSystemView.ts | add": {
     "message": "Âd́d̂"
   },
@@ -4838,6 +4835,12 @@
   "panels/elements/StylesSidebarPane.ts | constructedStylesheet": {
     "message": "ĉón̂śt̂ŕûćt̂éd̂ śt̂ýl̂éŝh́êét̂"
   },
+  "panels/elements/StylesSidebarPane.ts | copiedToClipboard": {
+    "message": "Ĉóp̂íêd́ t̂ó ĉĺîṕb̂óâŕd̂"
+  },
+  "panels/elements/StylesSidebarPane.ts | copyAllCSSChanges": {
+    "message": "Ĉóp̂ý âĺl̂ t́ĥé ĈŚŜ ćĥán̂ǵêś"
+  },
   "panels/elements/StylesSidebarPane.ts | copyAllDeclarations": {
     "message": "Ĉóp̂ý âĺl̂ d́êćl̂ár̂át̂íôńŝ"
   },
@@ -5768,6 +5771,9 @@
   "panels/lighthouse/LighthouseController.ts | legacyNavigation": {
     "message": "L̂éĝáĉý n̂áv̂íĝát̂íôń"
   },
+  "panels/lighthouse/LighthouseController.ts | lighthouseMode": {
+    "message": "L̂íĝh́t̂h́ôúŝé m̂ód̂é"
+  },
   "panels/lighthouse/LighthouseController.ts | localStorage": {
     "message": "L̂óĉál̂ Śt̂ór̂áĝé"
   },
@@ -5777,6 +5783,9 @@
   "panels/lighthouse/LighthouseController.ts | multipleTabsAreBeingControlledBy": {
     "message": "M̂úl̂t́îṕl̂é t̂áb̂ś âŕê b́êín̂ǵ ĉón̂t́r̂ól̂ĺêd́ b̂ý t̂h́ê śâḿê service worker. Ćl̂óŝé ŷóûŕ ôt́ĥér̂ t́âb́ŝ ón̂ t́ĥé ŝám̂é ôŕîǵîń t̂ó âúd̂ít̂ t́ĥíŝ ṕâǵê."
   },
+  "panels/lighthouse/LighthouseController.ts | navigation": {
+    "message": "N̂áv̂íĝát̂íôń"
+  },
   "panels/lighthouse/LighthouseController.ts | performance": {
     "message": "P̂ér̂f́ôŕm̂án̂ćê"
   },
@@ -5789,6 +5798,9 @@
   "panels/lighthouse/LighthouseController.ts | resetStorageLocalstorage": {
     "message": "R̂éŝét̂ śt̂ór̂áĝé (cache, service workers, êt́ĉ) b́êf́ôŕê áûd́ît́îńĝ. (Ǵôód̂ f́ôŕ p̂ér̂f́ôŕm̂án̂ćê & PWA t́êśt̂ín̂ǵ)"
   },
+  "panels/lighthouse/LighthouseController.ts | runLighthouseInMode": {
+    "message": "R̂ún̂ Ĺîǵĥt́ĥóûśê ín̂ ńâv́îǵât́îón̂, t́îḿêśp̂án̂, ór̂ śn̂áp̂śĥót̂ ḿôd́ê"
+  },
   "panels/lighthouse/LighthouseController.ts | seo": {
     "message": "ŜÉÔ"
   },
@@ -5798,6 +5810,9 @@
   "panels/lighthouse/LighthouseController.ts | simulatedThrottling": {
     "message": "Ŝím̂úl̂át̂éd̂ t́ĥŕôt́t̂ĺîńĝ"
   },
+  "panels/lighthouse/LighthouseController.ts | snapshot": {
+    "message": "Ŝńâṕŝh́ôt́"
+  },
   "panels/lighthouse/LighthouseController.ts | thereMayBeStoredDataAffectingLoadingPlural": {
     "message": "T̂h́êŕê ḿâý b̂é ŝt́ôŕêd́ d̂át̂á âf́f̂éĉt́îńĝ ĺôád̂ín̂ǵ p̂ér̂f́ôŕm̂án̂ćê ín̂ t́ĥéŝé l̂óĉát̂íôńŝ: {PH1}. Áûd́ît́ t̂h́îś p̂áĝé îń âń îńĉóĝńît́ô ẃîńd̂óŵ t́ô ṕr̂év̂én̂t́ t̂h́ôśê ŕêśôúr̂ćêś f̂ŕôḿ âf́f̂éĉt́îńĝ ýôúr̂ śĉór̂éŝ."
   },
@@ -5864,6 +5879,9 @@
   "panels/lighthouse/LighthouseStartView.ts | learnMore": {
     "message": "L̂éâŕn̂ ḿôŕê"
   },
+  "panels/lighthouse/LighthouseStartViewFR.ts | mode": {
+    "message": "M̂ód̂é"
+  },
   "panels/lighthouse/LighthouseStatusView.ts | ahSorryWeRanIntoAnError": {
     "message": "Âh́, ŝór̂ŕŷ! Ẃê ŕâń îńt̂ó âń êŕr̂ór̂."
   },

package/front_end/core/platform/UserVisibleError.ts ADDED Viewed

@@ -0,0 +1,28 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+import type {LocalizedString} from './UIString.js';
+/**
+ * Represents an error that might become visible to the user. Where errors
+ * might be surfaced to the user (such as by displaying the message to the
+ * console), this class should be used to enforce that the message is
+ * localized on the way in.
+ */
+export class UserVisibleError extends Error {
+  readonly message: LocalizedString;
+  constructor(message: LocalizedString) {
+    super(message);
+    this.message = message;
+  }
+}
+export function isUserVisibleError(error: unknown): error is UserVisibleError {
+  if (typeof error === 'object' && error !== null) {
+    return error instanceof UserVisibleError;
+  }
+  return false;
+}

package/front_end/core/platform/platform.ts CHANGED Viewed

@@ -38,6 +38,7 @@ import * as SetUtilities from './set-utilities.js';
 import * as StringUtilities from './string-utilities.js';
 import * as TypeScriptUtilities from './typescript-utilities.js';
 import * as UIString from './UIString.js';
+import * as UserVisibleError from './UserVisibleError.js';
 export {DCHECK} from './dcheck.js';
 /* `assertNotNull` also need to be exposed, as TypeScript does not
@@ -57,4 +58,5 @@ export {
   StringUtilities,
   TypeScriptUtilities,
   UIString,
+  UserVisibleError,
 };

package/front_end/core/sdk/ChildTargetManager.ts CHANGED Viewed

@@ -140,7 +140,6 @@ export class ChildTargetManager extends SDKModel<EventTypes> implements Protocol
     } else if (targetInfo.type === 'auction_worklet') {
       type = Type.AuctionWorklet;
     }
     const target = this.#targetManager.createTarget(
         targetInfo.targetId, targetName, type, this.#parentTarget, sessionId, undefined, undefined, targetInfo);
     target.setInspectedURL(this.#parentTarget.inspectedURL());

package/front_end/core/sdk/DebuggerModel.ts CHANGED Viewed

@@ -428,6 +428,10 @@ export class DebuggerModel extends SDKModel<EventTypes> {
           Common.ParsedURL.ParsedURL.urlToRawPathString(url as Platform.DevToolsPath.UrlString, Host.Platform.isWin());
       urlRegex =
           `${Platform.StringUtilities.escapeForRegExp(platformPath)}|${Platform.StringUtilities.escapeForRegExp(url)}`;
+      if (Host.Platform.isWin() && platformPath.match(/^.:\\/)) {
+        // Match upper or lower case drive letter
+        urlRegex = `[${platformPath[0].toUpperCase()}${platformPath[0].toLowerCase()}]` + urlRegex.substr(1);
+      }
     }
     // Adjust column if needed.
     let minColumnNumber = 0;

package/front_end/core/sdk/NetworkManager.ts CHANGED Viewed

@@ -412,6 +412,16 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
      * once it is created in `requestWillBeSent`.
      */
     this.#requestIdToTrustTokenEvent = new Map();
+    MultitargetNetworkManager.instance().addEventListener(
+        MultitargetNetworkManager.Events.RequestIntercepted, this.#markAsIntercepted.bind(this));
+  }
+  #markAsIntercepted(event: Common.EventTarget.EventTargetEvent<string>): void {
+    const request = this.requestForURL(event.data);
+    if (request) {
+      request.setWasIntercepted(true);
+    }
   }
   private headersMapToHeadersArray(headersMap: Protocol.Network.Headers): NameValue[] {
@@ -446,7 +456,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
     if (!networkRequest.statusText) {
       networkRequest.statusText = response.statusText;
     }
-    if (!networkRequest.hasExtraResponseInfo()) {
+    if (!networkRequest.hasExtraResponseInfo() || networkRequest.wasIntercepted()) {
       networkRequest.responseHeaders = this.headersMapToHeadersArray(response.headers);
     }
@@ -1401,6 +1411,8 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
     for (const requestInterceptor of this.#urlsForRequestInterceptor.keysArray()) {
       await requestInterceptor(interceptedRequest);
       if (interceptedRequest.hasResponded()) {
+        this.dispatchEventToListeners(
+            MultitargetNetworkManager.Events.RequestIntercepted, interceptedRequest.request.url);
         return;
       }
     }
@@ -1467,6 +1479,7 @@ export namespace MultitargetNetworkManager {
     UserAgentChanged = 'UserAgentChanged',
     InterceptorsChanged = 'InterceptorsChanged',
     AcceptedEncodingsChanged = 'AcceptedEncodingsChanged',
+    RequestIntercepted = 'RequestIntercepted',
   }
   export type EventTypes = {
@@ -1475,6 +1488,7 @@ export namespace MultitargetNetworkManager {
     [Events.UserAgentChanged]: void,
     [Events.InterceptorsChanged]: void,
     [Events.AcceptedEncodingsChanged]: void,
+    [Events.RequestIntercepted]: string,
   };
 }

package/front_end/core/sdk/NetworkRequest.ts CHANGED Viewed

@@ -290,6 +290,7 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
   #parsedQueryParameters?: NameValue[];
   #contentDataProvider?: (() => Promise<ContentData>);
   #isSameSiteInternal: boolean|null;
+  #wasIntercepted: boolean;
   private constructor(
       requestId: string, backendRequestId: Protocol.Network.RequestId|undefined, url: string, documentURL: string,
@@ -363,6 +364,8 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
     this.localizedFailDescription = null;
     this.#isSameSiteInternal = null;
+    this.#wasIntercepted = false;
   }
   static create(
@@ -964,6 +967,14 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
     return this.#responseHeaderValues[headerName];
   }
+  wasIntercepted(): boolean {
+    return this.#wasIntercepted;
+  }
+  setWasIntercepted(wasIntercepted: boolean): void {
+    this.#wasIntercepted = wasIntercepted;
+  }
   get responseCookies(): Cookie[] {
     if (!this.#responseCookiesInternal) {
       this.#responseCookiesInternal =

package/front_end/entrypoints/lighthouse_worker/LighthouseService.ts CHANGED Viewed

@@ -103,7 +103,7 @@ async function start(method: string, params: any): Promise<unknown> {
     const url = params.url;
     // Handle legacy Lighthouse runner path.
-    if (method === 'start') {
+    if (method === 'legacyNavigation') {
       // @ts-expect-error https://github.com/GoogleChrome/lighthouse/issues/11628
       const connection = self.setUpWorkerConnection(port);
       // @ts-expect-error https://github.com/GoogleChrome/lighthouse/issues/11628
@@ -115,14 +115,21 @@ async function start(method: string, params: any): Promise<unknown> {
     puppeteerConnection =
         await Puppeteer.PuppeteerConnection.getPuppeteerConnection(rawConnection, mainFrameId, mainTargetId);
+    if (method === 'snapshot') {
+      // @ts-expect-error https://github.com/GoogleChrome/lighthouse/issues/11628
+      return await self.runLighthouseSnapshot({
+        url,
+        config,
+        page: puppeteerConnection.page,
+      });
+    }
     // @ts-expect-error https://github.com/GoogleChrome/lighthouse/issues/11628
-    const result = await self.runLighthouseNavigation({
+    return await self.runLighthouseNavigation({
       url,
       config,
       page: puppeteerConnection.page,
     });
-    return result;
   } catch (err) {
     return ({
       fatal: true,
@@ -179,8 +186,10 @@ function notifyFrontendViaWorkerMessage(method: string, params: any): void {
 self.onmessage = async(event: MessageEvent): Promise<void> => {
   const messageFromFrontend = JSON.parse(event.data);
   switch (messageFromFrontend.method) {
-    case 'navigate':
-    case 'start': {
+    case 'navigation':
+    case 'timespan':
+    case 'snapshot':
+    case 'legacyNavigation': {
       const result = await start(messageFromFrontend.method, messageFromFrontend.params);
       self.postMessage(JSON.stringify({id: messageFromFrontend.id, result}));
       break;

package/front_end/entrypoints/main/MainImpl.ts CHANGED Viewed

@@ -376,6 +376,9 @@ export class MainImpl {
     Root.Runtime.experiments.register(
         Root.Runtime.ExperimentName.HEADER_OVERRIDES, 'Local overrides for response headers');
+    // New Lighthouse panel with timespan and snapshot mode
+    Root.Runtime.experiments.register('lighthousePanelFR', 'Use Lighthouse panel with timespan and snapshot modes');
     Root.Runtime.experiments.enableExperimentsByDefault([
       'sourceOrderViewer',
       'hideIssuesFeature',

package/front_end/models/bindings/CSSWorkspaceBinding.ts CHANGED Viewed

@@ -100,6 +100,27 @@ export class CSSWorkspaceBinding implements SDK.TargetManager.SDKModelObserver<S
     return locationPromise;
   }
+  propertyRawLocation(cssProperty: SDK.CSSProperty.CSSProperty, forName: boolean): SDK.CSSModel.CSSLocation|null {
+    const style = cssProperty.ownerStyle;
+    if (!style || style.type !== SDK.CSSStyleDeclaration.Type.Regular || !style.styleSheetId) {
+      return null;
+    }
+    const header = style.cssModel().styleSheetHeaderForId(style.styleSheetId);
+    if (!header) {
+      return null;
+    }
+    const range = forName ? cssProperty.nameRange() : cssProperty.valueRange();
+    if (!range) {
+      return null;
+    }
+    const lineNumber = range.startLine;
+    const columnNumber = range.startColumn;
+    return new SDK.CSSModel.CSSLocation(
+        header, header.lineNumberInSource(lineNumber), header.columnNumberInSource(lineNumber, columnNumber));
+  }
   propertyUILocation(cssProperty: SDK.CSSProperty.CSSProperty, forName: boolean): Workspace.UISourceCode.UILocation
       |null {
     const style = cssProperty.ownerStyle;

package/front_end/models/persistence/Automapping.ts CHANGED Viewed

@@ -4,7 +4,6 @@
 import * as Common from '../../core/common/common.js';
 import * as Host from '../../core/host/host.js';
-import * as i18n from '../../core/i18n/i18n.js';
 import * as Platform from '../../core/platform/platform.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import * as Bindings from '../bindings/bindings.js';
@@ -14,16 +13,6 @@ import type {FileSystem} from './FileSystemWorkspaceBinding.js';
 import {FileSystemWorkspaceBinding} from './FileSystemWorkspaceBinding.js';
 import {PathEncoder, PersistenceImpl} from './PersistenceImpl.js';
-const UIStrings = {
-  /**
-  *@description Error message when attempting to create a binding from a malformed URI.
-  *@example {file://%E0%A4%A} PH1
-  */
-  theAttemptToBindSInTheWorkspace: 'The attempt to bind "{PH1}" in the workspace failed as this URI is malformed.',
-};
-const str_ = i18n.i18n.registerUIStrings('models/persistence/Automapping.ts', UIStrings);
-const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 export class Automapping {
   private readonly workspace: Workspace.Workspace.WorkspaceImpl;
   private readonly onStatusAdded: (arg0: AutomappingStatus) => Promise<void>;
@@ -323,11 +312,7 @@ export class Automapping {
   private createBinding(networkSourceCode: Workspace.UISourceCode.UISourceCode): Promise<AutomappingStatus|null> {
     const url = networkSourceCode.url();
     if (url.startsWith('file://') || url.startsWith('snippet://')) {
-      const decodedUrl = sanitizeSourceUrl(url);
-      if (!decodedUrl) {
-        return Promise.resolve(null as AutomappingStatus | null);
-      }
-      const fileSourceCode = this.fileSystemUISourceCodes.get(decodedUrl);
+      const fileSourceCode = this.fileSystemUISourceCodes.get(url);
       const status = fileSourceCode ? new AutomappingStatus(networkSourceCode, fileSourceCode, false) : null;
       return Promise.resolve(status);
     }
@@ -338,16 +323,11 @@ export class Automapping {
     }
     if (networkPath.endsWith('/')) {
-      networkPath += 'index.html';
-    }
-    const urlDecodedNetworkPath = sanitizeSourceUrl(networkPath);
-    if (!urlDecodedNetworkPath) {
-      return Promise.resolve(null as AutomappingStatus | null);
+      networkPath = networkPath + 'index.html' as Platform.DevToolsPath.EncodedPathString;
     }
     const similarFiles =
-        this.filesIndex.similarFiles(urlDecodedNetworkPath).map(path => this.fileSystemUISourceCodes.get(path)) as
+        this.filesIndex.similarFiles(networkPath).map(path => this.fileSystemUISourceCodes.get(path)) as
         Workspace.UISourceCode.UISourceCode[];
     if (!similarFiles.length) {
       return Promise.resolve(null as AutomappingStatus | null);
@@ -355,16 +335,6 @@ export class Automapping {
     return this.pullMetadatas(similarFiles.concat(networkSourceCode)).then(onMetadatas.bind(this));
-    function sanitizeSourceUrl(url: string): string|null {
-      try {
-        const decodedUrl = decodeURI(url);
-        return decodedUrl;
-      } catch (error) {
-        Common.Console.Console.instance().error(i18nString(UIStrings.theAttemptToBindSInTheWorkspace, {PH1: url}));
-        return null;
-      }
-    }
     function onMetadatas(this: Automapping): AutomappingStatus|null {
       const activeFiles =
           similarFiles.filter(

package/front_end/models/persistence/FileSystemWorkspaceBinding.ts CHANGED Viewed

@@ -59,9 +59,9 @@ export class FileSystemWorkspaceBinding {
     return fileSystemPath;
   }
-  static relativePath(uiSourceCode: Workspace.UISourceCode.UISourceCode): string[] {
+  static relativePath(uiSourceCode: Workspace.UISourceCode.UISourceCode): Platform.DevToolsPath.EncodedPathString[] {
     const baseURL = (uiSourceCode.project() as FileSystem).fileSystemBaseURL;
-    return uiSourceCode.url().substring(baseURL.length).split('/');
+    return uiSourceCode.url().substring(baseURL.length).split('/') as Platform.DevToolsPath.EncodedPathString[];
   }
   static tooltipForUISourceCode(uiSourceCode: Workspace.UISourceCode.UISourceCode): string {
@@ -193,12 +193,14 @@ export class FileSystem extends Workspace.Workspace.ProjectStore {
     return this.fileSystemInternal.mimeFromPath(uiSourceCode.url());
   }
-  initialGitFolders(): string[] {
-    return this.fileSystemInternal.initialGitFolders().map(folder => this.fileSystemPathInternal + '/' + folder);
+  initialGitFolders(): Platform.DevToolsPath.EncodedPathString[] {
+    return this.fileSystemInternal.initialGitFolders().map(folder => this.fileSystemPathInternal + '/' + folder) as
+        Platform.DevToolsPath.EncodedPathString[];
   }
-  private filePathForUISourceCode(uiSourceCode: Workspace.UISourceCode.UISourceCode): string {
-    return uiSourceCode.url().substring(this.fileSystemPathInternal.length);
+  private filePathForUISourceCode(uiSourceCode: Workspace.UISourceCode.UISourceCode):
+      Platform.DevToolsPath.EncodedPathString {
+    return uiSourceCode.url().substring(this.fileSystemPathInternal.length) as Platform.DevToolsPath.EncodedPathString;
   }
   isServiceProject(): boolean {
@@ -274,9 +276,9 @@ export class FileSystem extends Workspace.Workspace.ProjectStore {
       }
       console.assert(Boolean(newName));
       const slash = filePath.lastIndexOf('/');
-      const parentPath = filePath.substring(0, slash);
-      filePath = parentPath + '/' + newName;
-      filePath = filePath.substr(1);
+      const parentPath = Common.ParsedURL.ParsedURL.substr(filePath, 0, slash);
+      filePath = Common.ParsedURL.ParsedURL.encodedFromParentPathAndName(parentPath, newName);
+      filePath = Common.ParsedURL.ParsedURL.substr(filePath, 1);
       const newURL = this.fileSystemBaseURL + filePath;
       const newContentType = this.fileSystemInternal.contentType(newName);
       this.renameUISourceCode(uiSourceCode, newName);