chrome-devtools-frontend 1.0.1006768 → 1.0.1007307

package/config/gni/devtools_grd_files.gni

@@ -93,6 +93,8 @@ grd_files_release_sources = [
   "front_end/Images/ic_request_response.svg",
   "front_end/Images/ic_response.svg",
   "front_end/Images/ic_show_node_16x16.svg",
+  "front_end/Images/ic_sources_authored.svg",
+  "front_end/Images/ic_sources_deployed.svg",
   "front_end/Images/ic_suggest_color.svg",
   "front_end/Images/ic_undo_16x16_icon.svg",
   "front_end/Images/ic_warning_black_18dp.svg",

package/config/gni/devtools_image_files.gni

@@ -103,6 +103,8 @@ devtools_svg_sources = [
   "ic_request_response.svg",
   "ic_response.svg",
   "ic_show_node_16x16.svg",
+  "ic_sources_authored.svg",
+  "ic_sources_deployed.svg",
   "ic_suggest_color.svg",
   "ic_undo_16x16_icon.svg",
   "ic_warning_black_18dp.svg",

package/front_end/Images/src/ic_sources_authored.svg

@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.939346 8L4.46968 4.46967C4.76257 4.17678 5.23744 4.17678 5.53034 4.46967C5.82323 4.76256 5.82323 5.23744 5.53034 5.53033L3.06067 8L5.53034 10.4697C5.82323 10.7626 5.82323 11.2374 5.53034 11.5303C5.23744 11.8232 4.76257 11.8232 4.46968 11.5303L0.939346 8Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.48821 2.44593C9.88831 2.55314 10.1257 2.96439 10.0185 3.36449L7.43035 13.0237C7.32314 13.4238 6.91189 13.6613 6.51179 13.5541C6.11169 13.4469 5.87425 13.0356 5.98146 12.6355L8.56965 2.97626C8.67686 2.57616 9.08811 2.33872 9.48821 2.44593Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.0607 8L11.5303 4.46967C11.2374 4.17678 10.7626 4.17678 10.4697 4.46967C10.1768 4.76256 10.1768 5.23744 10.4697 5.53033L12.9393 8L10.4697 10.4697C10.1768 10.7626 10.1768 11.2374 10.4697 11.5303C10.7626 11.8232 11.2374 11.8232 11.5303 11.5303L15.0607 8Z" fill="black"/>
+</svg>

package/front_end/Images/src/ic_sources_deployed.svg

@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 5L8 7.5L14 5L8 2.5L2 5Z" fill="black"/>
+<path d="M14 6L8.5 8.5V14.5L14 12V6Z" fill="black"/>
+<path d="M2 6L7.5 8.5V14.5L2 12V6Z" fill="black"/>
+</svg>

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

@@ -254,6 +254,9 @@
   "core/sdk/DebuggerModel.ts | block": {
     "message": "Block"
   },
+  "core/sdk/DebuggerModel.ts | catchBlock": {
+    "message": "Catch block"
+  },
   "core/sdk/DebuggerModel.ts | closure": {
     "message": "Closure"
   },
@@ -273,7 +276,7 @@
     "message": "Script"
   },
   "core/sdk/DebuggerModel.ts | withBlock": {
-    "message": "With Block"
+    "message": "With block"
   },
   "core/sdk/DOMDebuggerModel.ts | animation": {
     "message": "Animation"
@@ -2939,6 +2942,9 @@
   "panels/application/components/BackForwardCacheView.ts | mainFrame": {
     "message": "Main Frame"
   },
+  "panels/application/components/BackForwardCacheView.ts | neverUseUnload": {
+    "message": "Learn more: Never use unload handler"
+  },
   "panels/application/components/BackForwardCacheView.ts | normalNavigation": {
     "message": "Not served from back/forward cache: to trigger back/forward cache, use Chrome's back/forward buttons, or use the test button below to automatically navigate away and back."
   },
@@ -6626,18 +6632,27 @@
   "panels/network/components/RequestHeadersView.ts | general": {
     "message": "General"
   },
+  "panels/network/components/RequestHeadersView.ts | raw": {
+    "message": "Raw"
+  },
   "panels/network/components/RequestHeadersView.ts | referrerPolicy": {
     "message": "Referrer Policy"
   },
   "panels/network/components/RequestHeadersView.ts | remoteAddress": {
     "message": "Remote Address"
   },
+  "panels/network/components/RequestHeadersView.ts | requestHeaders": {
+    "message": "Request Headers"
+  },
   "panels/network/components/RequestHeadersView.ts | requestMethod": {
     "message": "Request Method"
   },
   "panels/network/components/RequestHeadersView.ts | requestUrl": {
     "message": "Request URL"
   },
+  "panels/network/components/RequestHeadersView.ts | responseHeaders": {
+    "message": "Response Headers"
+  },
   "panels/network/components/RequestHeadersView.ts | statusCode": {
     "message": "Status Code"
   },
@@ -9758,12 +9773,18 @@
   "panels/sources/NavigatorView.ts | areYouSureYouWantToRemoveThis": {
     "message": "Are you sure you want to remove this folder?"
   },
+  "panels/sources/NavigatorView.ts | authored": {
+    "message": "Authored"
+  },
   "panels/sources/NavigatorView.ts | delete": {
     "message": "Delete"
   },
   "panels/sources/NavigatorView.ts | deleteAllOverrides": {
     "message": "Delete all overrides"
   },
+  "panels/sources/NavigatorView.ts | deployed": {
+    "message": "Deployed"
+  },
   "panels/sources/NavigatorView.ts | excludeFolder": {
     "message": "Exclude folder"
   },
@@ -10193,6 +10214,9 @@
   "panels/sources/SourcesPanel.ts | dropWorkspaceFolderHere": {
     "message": "Drop workspace folder here"
   },
+  "panels/sources/SourcesPanel.ts | groupByAuthored": {
+    "message": "Group by Authored/Deployed (experimental)"
+  },
   "panels/sources/SourcesPanel.ts | groupByFolder": {
     "message": "Group by folder"
   },

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

@@ -254,6 +254,9 @@
   "core/sdk/DebuggerModel.ts | block": {
     "message": "B̂ĺôćk̂"
   },
+  "core/sdk/DebuggerModel.ts | catchBlock": {
+    "message": "Catch b̂ĺôćk̂"
+  },
   "core/sdk/DebuggerModel.ts | closure": {
     "message": "Ĉĺôśûŕê"
   },
@@ -273,7 +276,7 @@
     "message": "Ŝćr̂íp̂t́"
   },
   "core/sdk/DebuggerModel.ts | withBlock": {
-    "message": "With B̂ĺôćk̂"
+    "message": "With b̂ĺôćk̂"
   },
   "core/sdk/DOMDebuggerModel.ts | animation": {
     "message": "Âńîḿât́îón̂"
@@ -2939,6 +2942,9 @@
   "panels/application/components/BackForwardCacheView.ts | mainFrame": {
     "message": "M̂áîń F̂ŕâḿê"
   },
+  "panels/application/components/BackForwardCacheView.ts | neverUseUnload": {
+    "message": "L̂éâŕn̂ ḿôŕê: Ńêv́êŕ ûśê ún̂ĺôád̂ h́âńd̂ĺêŕ"
+  },
   "panels/application/components/BackForwardCacheView.ts | normalNavigation": {
     "message": "N̂ót̂ śêŕv̂éd̂ f́r̂óm̂ b́âćk̂/f́ôŕŵár̂d́ ĉáĉh́ê: t́ô t́r̂íĝǵêŕ b̂áĉḱ/f̂ór̂ẃâŕd̂ ćâćĥé, ûśê Ćĥŕôḿê'ś b̂áĉḱ/f̂ór̂ẃâŕd̂ b́ût́t̂ón̂ś, ôŕ ûśê t́ĥé t̂éŝt́ b̂út̂t́ôń b̂él̂óŵ t́ô áût́ôḿât́îćâĺl̂ý n̂áv̂íĝát̂é âẃâý âńd̂ b́âćk̂."
   },
@@ -6626,18 +6632,27 @@
   "panels/network/components/RequestHeadersView.ts | general": {
     "message": "Ĝén̂ér̂ál̂"
   },
+  "panels/network/components/RequestHeadersView.ts | raw": {
+    "message": "R̂áŵ"
+  },
   "panels/network/components/RequestHeadersView.ts | referrerPolicy": {
     "message": "R̂éf̂ér̂ŕêŕ P̂ól̂íĉý"
   },
   "panels/network/components/RequestHeadersView.ts | remoteAddress": {
     "message": "R̂ém̂ót̂é Âd́d̂ŕêśŝ"
   },
+  "panels/network/components/RequestHeadersView.ts | requestHeaders": {
+    "message": "R̂éq̂úêśt̂ H́êád̂ér̂ś"
+  },
   "panels/network/components/RequestHeadersView.ts | requestMethod": {
     "message": "R̂éq̂úêśt̂ Ḿêt́ĥód̂"
   },
   "panels/network/components/RequestHeadersView.ts | requestUrl": {
     "message": "R̂éq̂úêśt̂ ÚR̂Ĺ"
   },
+  "panels/network/components/RequestHeadersView.ts | responseHeaders": {
+    "message": "R̂éŝṕôńŝé Ĥéâd́êŕŝ"
+  },
   "panels/network/components/RequestHeadersView.ts | statusCode": {
     "message": "Ŝt́ât́ûś Ĉód̂é"
   },
@@ -9758,12 +9773,18 @@
   "panels/sources/NavigatorView.ts | areYouSureYouWantToRemoveThis": {
     "message": "Âŕê ýôú ŝúr̂é ŷóû ẃâńt̂ t́ô ŕêḿôv́ê t́ĥíŝ f́ôĺd̂ér̂?"
   },
+  "panels/sources/NavigatorView.ts | authored": {
+    "message": "Âút̂h́ôŕêd́"
+  },
   "panels/sources/NavigatorView.ts | delete": {
     "message": "D̂él̂ét̂é"
   },
   "panels/sources/NavigatorView.ts | deleteAllOverrides": {
     "message": "D̂él̂ét̂é âĺl̂ óv̂ér̂ŕîd́êś"
   },
+  "panels/sources/NavigatorView.ts | deployed": {
+    "message": "D̂ép̂ĺôýêd́"
+  },
   "panels/sources/NavigatorView.ts | excludeFolder": {
     "message": "Êx́ĉĺûd́ê f́ôĺd̂ér̂"
   },
@@ -10193,6 +10214,9 @@
   "panels/sources/SourcesPanel.ts | dropWorkspaceFolderHere": {
     "message": "D̂ŕôṕ ŵór̂ḱŝṕâćê f́ôĺd̂ér̂ h́êŕê"
   },
+  "panels/sources/SourcesPanel.ts | groupByAuthored": {
+    "message": "Ĝŕôúp̂ b́ŷ Áût́ĥór̂éd̂/D́êṕl̂óŷéd̂ (éx̂ṕêŕîḿêńt̂ál̂)"
+  },
   "panels/sources/SourcesPanel.ts | groupByFolder": {
     "message": "Ĝŕôúp̂ b́ŷ f́ôĺd̂ér̂"
   },

package/front_end/core/sdk/DebuggerModel.ts

@@ -70,9 +70,16 @@ const UIStrings = {
   script: 'Script',
   /**
   *@description Title of a section in the debugger showing JavaScript variables from the a 'with'
-  *block. Block here means section of code, 'with' refers to a JavaScript programming concept.
+  *block. Block here means section of code, 'with' refers to a JavaScript programming concept and
+  *is a fixed term.
   */
-  withBlock: '`With` Block',
+  withBlock: '`With` block',
+  /**
+  *@description Title of a section in the debugger showing JavaScript variables from the a 'catch'
+  *block. Block here means section of code, 'catch' refers to a JavaScript programming concept and
+  *is a fixed term.
+  */
+  catchBlock: '`Catch` block',
   /**
   *@description Title of a section in the debugger showing JavaScript variables from the global scope.
   */
@@ -1464,7 +1471,9 @@ export class Scope implements ScopeChainEntry {
       case Protocol.Debugger.ScopeType.Closure:
         return i18nString(UIStrings.closure);
       case Protocol.Debugger.ScopeType.Catch:
-        return i18n.i18n.lockedString('Catch');
+        return i18nString(UIStrings.catchBlock);
+      case Protocol.Debugger.ScopeType.Eval:
+        return i18n.i18n.lockedString('Eval');
       case Protocol.Debugger.ScopeType.Block:
         return i18nString(UIStrings.block);
       case Protocol.Debugger.ScopeType.Script:

package/front_end/core/sdk/NetworkManager.ts

@@ -255,6 +255,10 @@ export class NetworkManager extends SDKModel<EventTypes> {
     return this.dispatcher.requestForURL(url);
   }
 
+  requestforId(id: string): NetworkRequest|null {
+    return this.dispatcher.requestForId(id);
+  }
+
   private cacheDisabledSettingChanged({data: enabled}: Common.EventTarget.EventTargetEvent<boolean>): void {
     void this.#networkAgent.invoke_setCacheDisabled({cacheDisabled: enabled});
   }
@@ -520,8 +524,8 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
     }
   }
 
-  requestForId(url: string): NetworkRequest|null {
-    return this.#requestsById.get(url) || null;
+  requestForId(id: string): NetworkRequest|null {
+    return this.#requestsById.get(id) || null;
   }
 
   requestForURL(url: Platform.DevToolsPath.UrlString): NetworkRequest|null {

package/front_end/devtools_compatibility.js

@@ -1098,6 +1098,7 @@
       'messageLevelFilters',
       'messageURLFilters',
       'monitoringXHREnabled',
+      'navigatorGroupByAuthored',
       'navigatorGroupByFolder',
       'navigatorHidden',
       'networkColorCodeResourceTypes',

package/front_end/entrypoints/formatter_worker/FormatterActions.ts

@@ -9,6 +9,7 @@ export const enum FormatterActions {
   JAVASCRIPT_OUTLINE = 'javaScriptOutline',
   JAVASCRIPT_IDENTIFIERS = 'javaScriptIdentifiers',
   JAVASCRIPT_SUBSTITUTE = 'javaScriptSubstitute',
+  JAVASCRIPT_SCOPE_TREE = 'javaScriptScopeTree',
   EVALUATE_JAVASCRIPT_SUBSTRING = 'evaluatableJavaScriptSubstring',
   ARGUMENTS_LIST = 'argumentsList',
 }

package/front_end/entrypoints/formatter_worker/ScopeParser.ts

@@ -171,7 +171,12 @@ export class ScopeVariableAnalysis {
       case 'ArrowFunctionExpression': {
         this.#pushScope(node.start, node.end);
         node.params.forEach(this.#processNodeAsDefinition.bind(this, DefinitionKind.Var));
-        this.#processNode(node.body);
+        if (node.body.type === 'BlockStatement') {
+          // Include the body of the arrow function in the same scope as the arguments.
+          node.body.body.forEach(this.#processNode.bind(this));
+        } else {
+          this.#processNode(node.body);
+        }
         this.#popScope(true);
         break;
       }
@@ -199,7 +204,7 @@ export class ScopeVariableAnalysis {
       case 'CatchClause':
         this.#pushScope(node.start, node.end);
         this.#processNodeAsDefinition(DefinitionKind.Let, node.param);
-        node.body.body.forEach(this.#processNode.bind(this));
+        this.#processNode(node.body);
         this.#popScope(false);
         break;
       case 'ClassBody':
@@ -207,17 +212,13 @@ export class ScopeVariableAnalysis {
         break;
       case 'ClassDeclaration':
         this.#processNodeAsDefinition(DefinitionKind.Let, node.id);
-        this.#pushScope(node.start, node.end);
         this.#processNode(node.superClass ?? null);
         this.#processNode(node.body);
-        this.#popScope(false);
         break;
       case 'ClassExpression':
-        this.#pushScope(node.start, node.end);
         // Intentionally ignore the id.
         this.#processNode(node.superClass ?? null);
         this.#processNode(node.body);
-        this.#popScope(false);
         break;
       case 'ChainExpression':
         this.#processNode(node.expression);
@@ -253,16 +254,17 @@ export class ScopeVariableAnalysis {
         this.#addVariable('this', node.start, DefinitionKind.Fixed);
         this.#addVariable('arguments', node.start, DefinitionKind.Fixed);
         node.params.forEach(this.#processNodeAsDefinition.bind(this, DefinitionKind.Let));
-        this.#processNode(node.body);
+        // Process the body of the block statement directly to avoid creating new scope.
+        node.body.body.forEach(this.#processNode.bind(this));
         this.#popScope(true);
         break;
       case 'FunctionExpression':
-        // Id is intentionally ignored in function expressions.
-        this.#pushScope(node.start, node.end);
+        this.#pushScope(node.id?.end ?? node.start, node.end);
         this.#addVariable('this', node.start, DefinitionKind.Fixed);
         this.#addVariable('arguments', node.start, DefinitionKind.Fixed);
         node.params.forEach(this.#processNodeAsDefinition.bind(this, DefinitionKind.Let));
-        this.#processNode(node.body);
+        // Process the body of the block statement directly to avoid creating new scope.
+        node.body.body.forEach(this.#processNode.bind(this));
         this.#popScope(true);
         break;
       case 'Identifier':

package/front_end/entrypoints/formatter_worker/formatter_worker-entrypoint.ts

@@ -37,6 +37,10 @@ self.onmessage = function(event: MessageEvent): void {
       self.postMessage(FormatterWorker.Substitute.substituteExpression(params.content, mapping));
       break;
     }
+    case FormatterActions.JAVASCRIPT_SCOPE_TREE: {
+      self.postMessage(FormatterWorker.ScopeParser.parseScopes(params.content)?.export());
+      break;
+    }
     case FormatterActions.EVALUATE_JAVASCRIPT_SUBSTRING:
       self.postMessage(FormatterWorker.FormatterWorker.evaluatableJavaScriptSubstring(params.content));
       break;

package/front_end/models/formatter/FormatterWorkerPool.ts

@@ -4,6 +4,7 @@
 
 import * as Common from '../../core/common/common.js';
 import * as FormatterActions from '../../entrypoints/formatter_worker/FormatterActions.js';  // eslint-disable-line rulesdir/es_modules_import
+export {DefinitionKind, type ScopeTreeNode} from '../../entrypoints/formatter_worker/FormatterActions.js';
 
 const MAX_WORKERS = Math.min(2, navigator.hardwareConcurrency - 1);
 
@@ -140,6 +141,11 @@ export class FormatterWorkerPool {
         .then(result => result || '');
   }
 
+  javaScriptScopeTree(expression: string): Promise<FormatterActions.ScopeTreeNode|null> {
+    return this.runTask(FormatterActions.FormatterActions.JAVASCRIPT_SCOPE_TREE, {content: expression})
+        .then(result => result || null);
+  }
+
   evaluatableJavaScriptSubstring(content: string): Promise<string> {
     return this.runTask(FormatterActions.FormatterActions.EVALUATE_JAVASCRIPT_SUBSTRING, {content: content})
         .then(text => text || '');

package/front_end/models/javascript_metadata/JavaScriptMetadata.ts

@@ -10,8 +10,7 @@ let javaScriptMetadataInstance: JavaScriptMetadataImpl;
 
 export class JavaScriptMetadataImpl implements Common.JavaScriptMetaData.JavaScriptMetaData {
   private readonly uniqueFunctions: Map<string, string[][]>;
-  private readonly instanceMethods: Map<string, Map<string, string[][]>>;
-  private readonly staticMethods: Map<string, Map<string, string[][]>>;
+  private readonly receiverMethods: Map<string, Map<string, string[][]>>;
   static instance(opts: {
     forceNew: boolean|null,
   } = {forceNew: null}): JavaScriptMetadataImpl {
@@ -24,26 +23,20 @@ export class JavaScriptMetadataImpl implements Common.JavaScriptMetaData.JavaScr
   }
   constructor() {
     this.uniqueFunctions = new Map();
-    this.instanceMethods = new Map();
-    this.staticMethods = new Map();
+    this.receiverMethods = new Map();
 
     for (const nativeFunction of NativeFunctions) {
-      if (!nativeFunction.receiver) {
+      if (!nativeFunction.receivers) {
         this.uniqueFunctions.set(nativeFunction.name, nativeFunction.signatures);
-      } else if (nativeFunction.static) {
-        let staticMethod = this.staticMethods.get(nativeFunction.receiver);
-        if (!staticMethod) {
-          staticMethod = new Map();
-          this.staticMethods.set(nativeFunction.receiver, staticMethod);
-        }
-        staticMethod.set(nativeFunction.name, nativeFunction.signatures);
-      } else {
-        let instanceMethod = this.instanceMethods.get(nativeFunction.receiver);
-        if (!instanceMethod) {
-          instanceMethod = new Map();
-          this.instanceMethods.set(nativeFunction.receiver, instanceMethod);
+        continue;
+      }
+      for (const receiver of nativeFunction.receivers) {
+        let method = this.receiverMethods.get(receiver);
+        if (!method) {
+          method = new Map();
+          this.receiverMethods.set(receiver, method);
         }
-        instanceMethod.set(nativeFunction.name, nativeFunction.signatures);
+        method.set(nativeFunction.name, nativeFunction.signatures);
       }
     }
   }
@@ -53,7 +46,7 @@ export class JavaScriptMetadataImpl implements Common.JavaScriptMetaData.JavaScr
   }
 
   signaturesForInstanceMethod(name: string, receiverClassName: string): string[][]|null {
-    const instanceMethod = this.instanceMethods.get(receiverClassName);
+    const instanceMethod = this.receiverMethods.get(receiverClassName);
     if (!instanceMethod) {
       return null;
     }
@@ -61,7 +54,7 @@ export class JavaScriptMetadataImpl implements Common.JavaScriptMetaData.JavaScr
   }
 
   signaturesForStaticMethod(name: string, receiverConstructorName: string): string[][]|null {
-    const staticMethod = this.staticMethods.get(receiverConstructorName);
+    const staticMethod = this.receiverMethods.get(receiverConstructorName + 'Constructor');
     if (!staticMethod) {
       return null;
     }