chrome-devtools-frontend 1.0.970391 → 1.0.972361

package/front_end/panels/snippets/ScriptSnippetFileSystem.ts

@@ -28,12 +28,12 @@ const UIStrings = {
 const str_ = i18n.i18n.registerUIStrings('panels/snippets/ScriptSnippetFileSystem.ts', UIStrings);
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 
-function escapeSnippetName(name: string): string {
-  return escape(name);
+function escapeSnippetName(name: string): Platform.DevToolsPath.EncodedPathString {
+  return Common.ParsedURL.ParsedURL.rawPathToEncodedPathString(name as Platform.DevToolsPath.RawPathString);
 }
 
 function unescapeSnippetName(name: string): string {
-  return unescape(name);
+  return Common.ParsedURL.ParsedURL.encodedPathToRawPathString(name as Platform.DevToolsPath.EncodedPathString);
 }
 
 export class SnippetFileSystem extends Persistence.PlatformFileSystem.PlatformFileSystem {
@@ -47,7 +47,7 @@ export class SnippetFileSystem extends Persistence.PlatformFileSystem.PlatformFi
     this.snippetsSetting = Common.Settings.Settings.instance().createSetting('scriptSnippets', []);
   }
 
-  initialFilePaths(): string[] {
+  initialFilePaths(): Platform.DevToolsPath.EncodedPathString[] {
     const savedSnippets: Snippet[] = this.snippetsSetting.get();
     return savedSnippets.map(snippet => escapeSnippetName(snippet.name));
   }
@@ -126,7 +126,7 @@ export class SnippetFileSystem extends Persistence.PlatformFileSystem.PlatformFi
     return Common.ResourceType.resourceTypes.Script;
   }
 
-  tooltipForURL(url: string): string {
+  tooltipForURL(url: Platform.DevToolsPath.UrlString): string {
     return i18nString(UIStrings.linkedTo, {PH1: unescapeSnippetName(url.substring(this.path().length))});
   }
 

package/front_end/panels/snippets/SnippetsQuickOpen.ts

@@ -77,7 +77,7 @@ export class SnippetsQuickOpen extends QuickOpen.FilteredListWidget.Provider {
   }
 
   renderItem(itemIndex: number, query: string, titleElement: Element, _subtitleElement: Element): void {
-    titleElement.textContent = unescape(this.snippets[itemIndex].name());
+    titleElement.textContent = this.snippets[itemIndex].name();
     titleElement.classList.add('monospace');
     QuickOpen.FilteredListWidget.FilteredListWidget.highlightRanges(titleElement, query, true);
   }

package/front_end/panels/sources/DebuggerPlugin.ts

@@ -36,6 +36,7 @@ import * as Root from '../../core/root/root.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import * as Protocol from '../../generated/protocol.js';
 import * as Bindings from '../../models/bindings/bindings.js';
+import * as SourceMapScopes from '../../models/source_map_scopes/source_map_scopes.js';
 import * as TextUtils from '../../models/text_utils/text_utils.js';
 import * as Workspace from '../../models/workspace/workspace.js';
 import * as CodeMirror from '../../third_party/codemirror.next/codemirror.next.js';
@@ -48,7 +49,6 @@ import {AddSourceMapURLDialog} from './AddSourceMapURLDialog.js';
 import {BreakpointEditDialog, LogpointPrefix} from './BreakpointEditDialog.js';
 import {Plugin} from './Plugin.js';
 import {ScriptFormatterEditorAction} from './ScriptFormatterEditorAction.js';
-import {resolveExpression, resolveScopeInObject} from './SourceMapNamesResolver.js';
 import {SourcesPanel} from './SourcesPanel.js';
 import {getRegisteredEditorActions} from './SourcesView.js';
 
@@ -476,7 +476,7 @@ export class DebuggerPlugin extends Plugin {
       if (!url) {
         return;
       }
-      scriptFile.addSourceMapURL(url);
+      scriptFile.addSourceMapURL(url as Platform.DevToolsPath.UrlString);
     }
 
     if (this.uiSourceCode.project().type() === Workspace.Workspace.projectTypes.Network &&
@@ -650,7 +650,7 @@ export class DebuggerPlugin extends Plugin {
     }|{
       error: string,
     }|null> {
-      const resolvedText = await resolveExpression(
+      const resolvedText = await SourceMapScopes.NamesResolver.resolveExpression(
           selectedCallFrame, evaluationText, uiSourceCode, highlightLine.number - 1,
           highlightRange.from - highlightLine.from, highlightRange.to - highlightLine.from);
       return await selectedCallFrame.evaluate({
@@ -887,7 +887,8 @@ export class DebuggerPlugin extends Plugin {
       return null;
     }
 
-    const {properties} = await resolveScopeInObject(localScope).getAllProperties(false, false);
+    const {properties} =
+        await SourceMapScopes.NamesResolver.resolveScopeInObject(localScope).getAllProperties(false, false);
     if (!properties || !properties.length || properties.length > 500) {
       return null;
     }

package/front_end/panels/sources/NavigatorView.ts

@@ -400,7 +400,9 @@ export class NavigatorView extends UI.Widget.VBox implements SDK.TargetManager.O
 
     const removedFrame = (event.data.frame as SDK.ResourceTreeModel.ResourceTreeFrame | null);
     const node = Array.from(this.uiSourceCodeNodes.get(uiSourceCode)).find(node => node.frame() === removedFrame);
-    this.removeUISourceCodeNode((node as NavigatorUISourceCodeTreeNode));
+    if (node) {
+      this.removeUISourceCodeNode(node);
+    }
   }
 
   private acceptsUISourceCode(uiSourceCode: Workspace.UISourceCode.UISourceCode): boolean {
@@ -428,9 +430,12 @@ export class NavigatorView extends UI.Widget.VBox implements SDK.TargetManager.O
     const isFromSourceMap = uiSourceCode.contentType().isFromSourceMap();
     let path;
     if (uiSourceCode.project().type() === Workspace.Workspace.projectTypes.FileSystem) {
-      path = Persistence.FileSystemWorkspaceBinding.FileSystemWorkspaceBinding.relativePath(uiSourceCode).slice(0, -1);
+      path =
+          Persistence.FileSystemWorkspaceBinding.FileSystemWorkspaceBinding.relativePath(uiSourceCode).slice(0, -1) as
+          Platform.DevToolsPath.EncodedPathString[];
     } else {
-      path = Common.ParsedURL.ParsedURL.extractPath(uiSourceCode.url()).split('/').slice(1, -1);
+      path = Common.ParsedURL.ParsedURL.extractPath(uiSourceCode.url()).split('/').slice(1, -1) as
+          Platform.DevToolsPath.EncodedPathString[];
     }
 
     const project = uiSourceCode.project();
@@ -503,7 +508,8 @@ export class NavigatorView extends UI.Widget.VBox implements SDK.TargetManager.O
       const commonPrefix = reversedIndex.longestPrefix(reversedPath, false /* fullWordOnly */);
       reversedIndex.add(reversedPath);
       const prefixPath = reversedPath.substring(0, commonPrefix.length + 1);
-      const path = encoder.decode(Platform.StringUtilities.reverse(prefixPath));
+      const path = Common.ParsedURL.ParsedURL.encodedPathToRawPathString(
+          encoder.decode(Platform.StringUtilities.reverse(prefixPath)) as Platform.DevToolsPath.EncodedPathString);
 
       const fileSystemNode = this.rootNode.child(project.id());
       if (fileSystemNode) {
@@ -539,7 +545,7 @@ export class NavigatorView extends UI.Widget.VBox implements SDK.TargetManager.O
   private folderNode(
       uiSourceCode: Workspace.UISourceCode.UISourceCode, project: Workspace.Workspace.Project,
       target: SDK.Target.Target|null, frame: SDK.ResourceTreeModel.ResourceTreeFrame|null, projectOrigin: string,
-      path: string[], fromSourceMap: boolean): NavigatorTreeNode {
+      path: Platform.DevToolsPath.EncodedPathString[], fromSourceMap: boolean): NavigatorTreeNode {
     if (Snippets.ScriptSnippetFileSystem.isSnippetsUISourceCode(uiSourceCode)) {
       return this.rootNode;
     }
@@ -568,7 +574,7 @@ export class NavigatorView extends UI.Widget.VBox implements SDK.TargetManager.O
     if (project.type() === Workspace.Workspace.projectTypes.FileSystem) {
       type = Types.FileSystemFolder;
     }
-    const name = path[path.length - 1];
+    const name = Common.ParsedURL.ParsedURL.encodedPathToRawPathString(path[path.length - 1]);
 
     folderNode = new NavigatorFolderTreeNode(this, project, folderId, type, folderPath, name);
     this.subfolderNodes.set(folderId, folderNode);
@@ -1360,7 +1366,7 @@ export class NavigatorUISourceCodeTreeNode extends NavigatorTreeNode {
     this.treeElement.title = titleText;
     this.treeElement.updateIcon();
 
-    let tooltip = this.uiSourceCodeInternal.url();
+    let tooltip: string = this.uiSourceCodeInternal.url();
     if (this.uiSourceCodeInternal.contentType().isFromSourceMap()) {
       tooltip = i18nString(UIStrings.sFromSourceMap, {PH1: this.uiSourceCodeInternal.displayName()});
     }

package/front_end/panels/sources/ScopeChainSidebarPane.ts

@@ -34,13 +34,13 @@ import * as i18n from '../../core/i18n/i18n.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import * as Protocol from '../../generated/protocol.js';
 import * as Bindings from '../../models/bindings/bindings.js';
+import * as SourceMapScopes from '../../models/source_map_scopes/source_map_scopes.js';
 import * as LinearMemoryInspector from '../../ui/components/linear_memory_inspector/linear_memory_inspector.js';
 import * as ObjectUI from '../../ui/legacy/components/object_ui/object_ui.js';
 import * as Components from '../../ui/legacy/components/utils/utils.js';
 import * as UI from '../../ui/legacy/legacy.js';
 
 import scopeChainSidebarPaneStyles from './scopeChainSidebarPane.css.js';
-import {resolveScopeChain, resolveScopeInObject, resolveThisObject} from './SourceMapNamesResolver.js';
 
 const UIStrings = {
   /**
@@ -168,7 +168,10 @@ export class ScopeChainSidebarPane extends UI.Widget.VBox implements UI.ContextF
 
     const callFrame = UI.Context.Context.instance().flavor(SDK.DebuggerModel.CallFrame);
     this.setScopeSourceMapSubscription(callFrame);
-    const [thisObject, scopeChain] = await Promise.all([resolveThisObject(callFrame), resolveScopeChain(callFrame)]);
+    const [thisObject, scopeChain] = await Promise.all([
+      SourceMapScopes.NamesResolver.resolveThisObject(callFrame),
+      SourceMapScopes.NamesResolver.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.
     if (callFrame === UI.Context.Context.instance().flavor(SDK.DebuggerModel.CallFrame)) {
@@ -243,7 +246,7 @@ export class ScopeChainSidebarPane extends UI.Widget.VBox implements UI.ContextF
     titleElement.createChild('div', 'scope-chain-sidebar-pane-section-title').textContent = title;
 
     const section = new ObjectUI.ObjectPropertiesSection.RootElement(
-        resolveScopeInObject(scope), this.linkifier, emptyPlaceholder,
+        SourceMapScopes.NamesResolver.resolveScopeInObject(scope), this.linkifier, emptyPlaceholder,
         ObjectUI.ObjectPropertiesSection.ObjectPropertiesMode.All, extraProperties);
     section.title = titleElement;
     section.listItemElement.classList.add('scope-chain-sidebar-pane-section');

package/front_end/panels/sources/SourcesNavigator.ts

@@ -33,6 +33,7 @@ import * as Host from '../../core/host/host.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import * as Persistence from '../../models/persistence/persistence.js';
+import type * as Platform from '../../core/platform/platform.js';
 import * as Workspace from '../../models/workspace/workspace.js';
 import * as UI from '../../ui/legacy/legacy.js';
 import * as Snippets from '../snippets/snippets.js';
@@ -378,9 +379,14 @@ export class SnippetsNavigatorView extends NavigatorView {
   private async handleSaveAs(uiSourceCode: Workspace.UISourceCode.UISourceCode): Promise<void> {
     uiSourceCode.commitWorkingCopy();
     const {content} = await uiSourceCode.requestContent();
-    void Workspace.FileManager.FileManager.instance().save(uiSourceCode.url(), content || '', true);
+    void Workspace.FileManager.FileManager.instance().save(
+        this.addJSExtension(uiSourceCode.url()), content || '', true);
     Workspace.FileManager.FileManager.instance().close(uiSourceCode.url());
   }
+
+  private addJSExtension(url: Platform.DevToolsPath.UrlString): Platform.DevToolsPath.UrlString {
+    return Common.ParsedURL.ParsedURL.concatenate(url, '.js');
+  }
 }
 
 let actionDelegateInstance: ActionDelegate;

package/front_end/panels/sources/TabbedEditorContainer.ts

@@ -584,6 +584,15 @@ export class TabbedEditorContainer extends Common.ObjectWrapper.ObjectWrapper<Ev
     const uiSourceCode = event.data;
     this.updateFileTitle(uiSourceCode);
     this.updateHistory();
+
+    // Remove from map under old url if it has changed.
+    for (const [k, v] of this.uriToUISourceCode) {
+      if (v === uiSourceCode && k !== v.url()) {
+        this.uriToUISourceCode.delete(k);
+      }
+    }
+    // Ensure it is mapped under current url.
+    this.canonicalUISourceCode(uiSourceCode);
   }
 
   private uiSourceCodeWorkingCopyChanged(

package/front_end/panels/sources/sources-legacy.ts

@@ -4,6 +4,8 @@
 
 // @ts-nocheck
 
+import * as SourceMapScopesModule from '../../models/source_map_scopes/source_map_scopes.js';
+
 import * as SourcesModule from './sources.js';
 
 self.Sources = self.Sources || {};
@@ -139,26 +141,13 @@ Sources.SnippetsPlugin = SourcesModule.SnippetsPlugin.SnippetsPlugin;
 
 Sources.SourceMapNamesResolver = {};
 
-Sources.SourceMapNamesResolver.setScopeResolvedForTest = SourcesModule.SourceMapNamesResolver.setScopeResolvedForTest;
-
 // Tests can override this global symbol and therefore can't be exported
 Object.defineProperty(Sources.SourceMapNamesResolver, '_scopeResolvedForTest', {
-  get: SourcesModule.SourceMapNamesResolver.getScopeResolvedForTest,
-  set: SourcesModule.SourceMapNamesResolver.setScopeResolvedForTest,
+  get: SourceMapScopesModule.NamesResolver.getScopeResolvedForTest,
+  set: SourceMapScopesModule.NamesResolver.setScopeResolvedForTest,
 });
 
-Sources.SourceMapNamesResolver._scopeIdentifiers = SourcesModule.SourceMapNamesResolver.scopeIdentifiers;
-Sources.SourceMapNamesResolver._resolveScope = SourcesModule.SourceMapNamesResolver.resolveScope;
-Sources.SourceMapNamesResolver._allVariablesInCallFrame = SourcesModule.SourceMapNamesResolver.allVariablesInCallFrame;
-Sources.SourceMapNamesResolver.resolveExpression = SourcesModule.SourceMapNamesResolver.resolveExpression;
-Sources.SourceMapNamesResolver.resolveThisObject = SourcesModule.SourceMapNamesResolver.resolveThisObject;
-Sources.SourceMapNamesResolver.resolveScopeInObject = SourcesModule.SourceMapNamesResolver.resolveScopeInObject;
-
-/** @constructor */
-Sources.SourceMapNamesResolver.Identifier = SourcesModule.SourceMapNamesResolver.Identifier;
-
-/** @constructor */
-Sources.SourceMapNamesResolver.RemoteObject = SourcesModule.SourceMapNamesResolver.RemoteObject;
+Sources.SourceMapNamesResolver.resolveExpression = SourceMapScopesModule.NamesResolver.resolveExpression;
 
 /** @constructor */
 Sources.NetworkNavigatorView = SourcesModule.SourcesNavigator.NetworkNavigatorView;

package/front_end/panels/sources/sources.ts

@@ -24,7 +24,6 @@ import * as ScriptFormatterEditorAction from './ScriptFormatterEditorAction.js';
 import * as ScriptOriginPlugin from './ScriptOriginPlugin.js';
 import * as SearchSourcesView from './SearchSourcesView.js';
 import * as SnippetsPlugin from './SnippetsPlugin.js';
-import * as SourceMapNamesResolver from './SourceMapNamesResolver.js';
 import * as SourcesNavigator from './SourcesNavigator.js';
 import * as SourcesPanel from './SourcesPanel.js';
 import * as SourcesSearchScope from './SourcesSearchScope.js';
@@ -57,7 +56,6 @@ export {
   ScriptOriginPlugin,
   SearchSourcesView,
   SnippetsPlugin,
-  SourceMapNamesResolver,
   SourcesNavigator,
   SourcesPanel,
   SourcesSearchScope,

package/front_end/panels/sources/sourcesView.css

@@ -45,10 +45,6 @@
   z-index: 0;
 }
 
-.sources-toolbar .toolbar {
-  cursor: default;
-}
-
 .source-frame-debugger-script {
   --override-debugger-background-tint: rgb(255 255 194 / 50%);
 

package/front_end/panels/timeline/TimelineUIUtils.ts

@@ -1871,15 +1871,8 @@ export class TimelineUIUtils {
         if (url) {
           const options = {
             tabStop: true,
-            className: undefined,
-            columnNumber: undefined,
             showColumnNumber: false,
             inlineFrameIndex: 0,
-            text: undefined,
-            lineNumber: undefined,
-            preventClick: undefined,
-            maxLength: undefined,
-            bypassURLTrimming: undefined,
           };
           details = Components.Linkifier.Linkifier.linkifyURL(url, options);
         }
@@ -2126,15 +2119,8 @@ export class TimelineUIUtils {
         if (url) {
           const options = {
             tabStop: true,
-            className: undefined,
-            columnNumber: undefined,
             showColumnNumber: false,
             inlineFrameIndex: 0,
-            lineNumber: undefined,
-            text: undefined,
-            preventClick: undefined,
-            maxLength: undefined,
-            bypassURLTrimming: undefined,
           };
           contentHelper.appendElementRow(
               i18nString(UIStrings.resource), Components.Linkifier.Linkifier.linkifyURL(url, options));
@@ -2264,15 +2250,8 @@ export class TimelineUIUtils {
         if (url) {
           const options = {
             tabStop: true,
-            className: undefined,
-            columnNumber: undefined,
             showColumnNumber: false,
-            lineNumber: undefined,
             inlineFrameIndex: 0,
-            text: undefined,
-            preventClick: undefined,
-            maxLength: undefined,
-            bypassURLTrimming: undefined,
           };
           contentHelper.appendElementRow(
               i18nString(UIStrings.imageUrl), Components.Linkifier.Linkifier.linkifyURL(url, options));
@@ -2285,15 +2264,8 @@ export class TimelineUIUtils {
         if (url) {
           const options = {
             tabStop: true,
-            className: undefined,
-            columnNumber: undefined,
             showColumnNumber: false,
             inlineFrameIndex: 0,
-            lineNumber: undefined,
-            text: undefined,
-            preventClick: undefined,
-            maxLength: undefined,
-            bypassURLTrimming: undefined,
           };
           contentHelper.appendElementRow(
               i18nString(UIStrings.stylesheetUrl), Components.Linkifier.Linkifier.linkifyURL(url, options));
@@ -2641,15 +2613,8 @@ export class TimelineUIUtils {
     if (request.url) {
       const options = {
         tabStop: true,
-        className: undefined,
-        columnNumber: undefined,
         showColumnNumber: false,
-        text: undefined,
         inlineFrameIndex: 0,
-        lineNumber: undefined,
-        preventClick: undefined,
-        maxLength: undefined,
-        bypassURLTrimming: undefined,
       };
       contentHelper.appendElementRow(
           i18n.i18n.lockedString('URL'), Components.Linkifier.Linkifier.linkifyURL(request.url, options));
@@ -2711,7 +2676,7 @@ export class TimelineUIUtils {
     const topFrame = TimelineModel.TimelineModel.TimelineData.forEvent(sendRequest).topFrame();
     if (topFrame) {
       const link = linkifier.maybeLinkifyConsoleCallFrame(
-          target, topFrame, {tabStop: true, className: undefined, inlineFrameIndex: 0, showColumnNumber: true});
+          target, topFrame, {tabStop: true, inlineFrameIndex: 0, showColumnNumber: true});
       if (link) {
         contentHelper.appendElementRow(title, link);
       }
@@ -2720,9 +2685,8 @@ export class TimelineUIUtils {
       if (initiator) {
         const initiatorURL = TimelineModel.TimelineModel.TimelineData.forEvent(initiator).url;
         if (initiatorURL) {
-          const link = linkifier.maybeLinkifyScriptLocation(
-              target, null, initiatorURL, 0,
-              {tabStop: true, className: undefined, inlineFrameIndex: 0, columnNumber: undefined});
+          const link =
+              linkifier.maybeLinkifyScriptLocation(target, null, initiatorURL, 0, {tabStop: true, inlineFrameIndex: 0});
           if (link) {
             contentHelper.appendElementRow(title, link);
           }
@@ -3714,15 +3678,9 @@ export class TimelineDetailsContentHelper {
 
     const options = {
       tabStop: true,
-      className: undefined,
       columnNumber: startColumn,
       showColumnNumber: true,
       inlineFrameIndex: 0,
-      text: undefined,
-      lineNumber: undefined,
-      preventClick: undefined,
-      maxLength: undefined,
-      bypassURLTrimming: undefined,
     };
     const link = this.linkifierInternal.maybeLinkifyScriptLocation(this.target, null, url, startLine, options);
     if (!link) {
@@ -3737,8 +3695,7 @@ export class TimelineDetailsContentHelper {
     }
     const locationContent = document.createElement('span');
     const link = this.linkifierInternal.maybeLinkifyScriptLocation(
-        this.target, null, url, startLine,
-        {tabStop: true, className: undefined, inlineFrameIndex: 0, columnNumber: undefined});
+        this.target, null, url, startLine, {tabStop: true, inlineFrameIndex: 0});
     if (!link) {
       return;
     }