chrome-devtools-frontend 1.0.967610 → 1.0.969345

package/front_end/panels/sources/DebuggerPlugin.ts

@@ -607,7 +607,7 @@ export class DebuggerPlugin extends Plugin {
         return null;
       }
       while (
-          node && node.name !== 'VariableDefinition' && node.name !== 'VariableName' &&
+          node && node.name !== 'this' && node.name !== 'VariableDefinition' && node.name !== 'VariableName' &&
           node.name !== 'MemberExpression' &&
           !(node.name === 'PropertyName' && node.parent?.name === 'PatternProperty' &&
             node.nextSibling?.name !== ':') &&

package/front_end/panels/sources/ScopeChainSidebarPane.ts

@@ -90,6 +90,8 @@ export class ScopeChainSidebarPane extends UI.Widget.VBox implements UI.ContextF
   private readonly expandController: ObjectUI.ObjectPropertiesSection.ObjectPropertiesSectionsTreeExpandController;
   private readonly linkifier: Components.Linkifier.Linkifier;
   private infoElement: HTMLDivElement;
+  #scopesScript: SDK.Script.Script|null = null;
+
   private constructor() {
     super(true);
 
@@ -126,6 +128,34 @@ export class ScopeChainSidebarPane extends UI.Widget.VBox implements UI.ContextF
     }
   }
 
+  private sourceMapAttached(
+      event: Common.EventTarget.EventTargetEvent<{client: SDK.Script.Script, sourceMap: SDK.SourceMap.SourceMap}>):
+      void {
+    if (event.data.client === this.#scopesScript) {
+      void this.update();
+    }
+  }
+
+  private setScopeSourceMapSubscription(callFrame: SDK.DebuggerModel.CallFrame|null): void {
+    const oldScript = this.#scopesScript;
+    this.#scopesScript = callFrame?.script ?? null;
+
+    // Shortcut for the case when we are listening to the same model.
+    if (oldScript?.debuggerModel === this.#scopesScript?.debuggerModel) {
+      return;
+    }
+
+    if (oldScript) {
+      oldScript.debuggerModel.sourceMapManager().removeEventListener(
+          SDK.SourceMapManager.Events.SourceMapAttached, this.sourceMapAttached, this);
+    }
+
+    if (this.#scopesScript) {
+      this.#scopesScript.debuggerModel.sourceMapManager().addEventListener(
+          SDK.SourceMapManager.Events.SourceMapAttached, this.sourceMapAttached, this);
+    }
+  }
+
   private async update(): Promise<void> {
     // The `resolveThisObject(callFrame)` and `resolveScopeChain(callFrame)` calls
     // below may take a while to complete, so indicate to the user that something
@@ -137,6 +167,7 @@ export class ScopeChainSidebarPane extends UI.Widget.VBox implements UI.ContextF
     this.linkifier.reset();
 
     const callFrame = UI.Context.Context.instance().flavor(SDK.DebuggerModel.CallFrame);
+    this.setScopeSourceMapSubscription(callFrame);
     const [thisObject, scopeChain] = await Promise.all([resolveThisObject(callFrame), resolveScopeChain(callFrame)]);
     // By now the developer might have moved on, and we don't want to show stale
     // scope information, so check again that we're still on the same CallFrame.

package/front_end/panels/sources/SourceMapNamesResolver.ts

@@ -10,9 +10,14 @@ import * as TextUtils from '../../models/text_utils/text_utils.js';
 import type * as Workspace from '../../models/workspace/workspace.js';
 import * as Protocol from '../../generated/protocol.js';
 
-const scopeToCachedIdentifiersMap = new WeakMap<SDK.DebuggerModel.ScopeChainEntry, Promise<Map<string, string>>>();
+interface CachedScopeMap {
+  sourceMap: SDK.SourceMap.SourceMap|null;
+  identifiersPromise: Promise<Map<string, string>>;
+}
 
+const scopeToCachedIdentifiersMap = new WeakMap<SDK.DebuggerModel.ScopeChainEntry, CachedScopeMap>();
 const cachedMapByCallFrame = new WeakMap<SDK.DebuggerModel.CallFrame, Map<string, string>>();
+
 export class Identifier {
   name: string;
   lineNumber: number;
@@ -79,17 +84,17 @@ export const resolveScopeChain =
 };
 
 export const resolveScope = async(scope: SDK.DebuggerModel.ScopeChainEntry): Promise<Map<string, string>> => {
-  let identifiersPromise = scopeToCachedIdentifiersMap.get(scope);
-  if (!identifiersPromise) {
+  let cachedScopeMap = scopeToCachedIdentifiersMap.get(scope);
+  const script = scope.callFrame().script;
+  const sourceMap = Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding.instance().sourceMapForScript(script);
+
+  if (!cachedScopeMap || cachedScopeMap.sourceMap !== sourceMap) {
     // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration)
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration)
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    identifiersPromise = (async(): Promise<Map<any, any>> => {
+    const identifiersPromise = (async(): Promise<Map<any, any>> => {
       const namesMapping = new Map<string, string>();
-      const script = scope.callFrame().script;
-      const sourceMap =
-          Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding.instance().sourceMapForScript(script);
       if (sourceMap) {
         const textCache = new Map<string, TextUtils.Text.Text>();
         // Extract as much as possible from SourceMap and resolve
@@ -111,9 +116,10 @@ export const resolveScope = async(scope: SDK.DebuggerModel.ScopeChainEntry): Pro
       }
       return namesMapping;
     })();
-    scopeToCachedIdentifiersMap.set(scope, identifiersPromise);
+    cachedScopeMap = {sourceMap, identifiersPromise};
+    scopeToCachedIdentifiersMap.set(scope, {sourceMap, identifiersPromise});
   }
-  return await identifiersPromise;
+  return await cachedScopeMap.identifiersPromise;
 
   async function resolveSourceName(
       script: SDK.Script.Script, sourceMap: SDK.SourceMap.SourceMap, id: Identifier,

package/front_end/third_party/codemirror.next/README.chromium

@@ -16,3 +16,13 @@ To update this package, adjust the version ranges in package.json if necessary,
 ```
 
 It will use npm to locally install the necessary packages and their dependencies, and bundle them into a single file (codemirror.js and codemirror.d.ts) with rollup.
+
+If you want to easily obtain all the latest versions of the packages, run the following:
+
+```
+npm i
+npm outdated
+```
+
+This will show you a table with all the latest versions of each package.
+You will need to manually update the versions in the `package.json` file.