chrome-devtools-frontend 1.0.1512349 → 1.0.1514545

package/front_end/panels/sources/SourcesPanel.ts

@@ -1,4 +1,4 @@
-// Copyright 2021 The Chromium Authors. All rights reserved.
+// Copyright 2021 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 /* eslint-disable rulesdir/no-imperative-dom-api */
@@ -208,7 +208,7 @@ export class SourcesPanel extends UI.Panel.Panel implements
   private splitWidget: UI.SplitWidget.SplitWidget;
   editorView: UI.SplitWidget.SplitWidget;
   private navigatorTabbedLocation: UI.View.TabbedViewLocation;
-  sourcesViewInternal: SourcesView;
+  #sourcesView: SourcesView;
   private readonly toggleNavigatorSidebarButton: UI.Toolbar.ToolbarButton;
   private readonly toggleDebuggerSidebarButton: UI.Toolbar.ToolbarButton;
   private threadsSidebarPane: UI.View.View|null;
@@ -216,7 +216,7 @@ export class SourcesPanel extends UI.Panel.Panel implements
   private readonly callstackPane: CallStackSidebarPane;
   private liveLocationPool: Bindings.LiveLocation.LiveLocationPool;
   private lastModificationTime: number;
-  private pausedInternal?: boolean;
+  #paused?: boolean;
   private switchToPausedTargetTimeout?: number;
   private executionLineLocation?: Bindings.DebuggerWorkspaceBinding.Location|null;
   private sidebarPaneStack?: UI.View.ViewLocation;
@@ -290,8 +290,8 @@ export class SourcesPanel extends UI.Panel.Panel implements
       this.editorView.setSidebarWidget(tabbedPane);
     }
 
-    this.sourcesViewInternal = new SourcesView();
-    this.sourcesViewInternal.addEventListener(Events.EDITOR_SELECTED, this.editorSelected.bind(this));
+    this.#sourcesView = new SourcesView();
+    this.#sourcesView.addEventListener(Events.EDITOR_SELECTED, this.editorSelected.bind(this));
 
     this.toggleNavigatorSidebarButton = this.editorView.createShowHideSidebarButton(
         i18nString(UIStrings.showNavigator), i18nString(UIStrings.hideNavigator), i18nString(UIStrings.navigatorShown),
@@ -299,7 +299,7 @@ export class SourcesPanel extends UI.Panel.Panel implements
     this.toggleDebuggerSidebarButton = this.splitWidget.createShowHideSidebarButton(
         i18nString(UIStrings.showDebugger), i18nString(UIStrings.hideDebugger), i18nString(UIStrings.debuggerShown),
         i18nString(UIStrings.debuggerHidden), 'debugger');
-    this.editorView.setMainWidget(this.sourcesViewInternal);
+    this.editorView.setMainWidget(this.#sourcesView);
 
     this.threadsSidebarPane = null;
     this.watchSidebarPane = UI.ViewManager.ViewManager.instance().view('sources.watch');
@@ -350,22 +350,22 @@ export class SourcesPanel extends UI.Panel.Panel implements
   }
 
   static updateResizerAndSidebarButtons(panel: SourcesPanel): void {
-    panel.sourcesViewInternal.leftToolbar().removeToolbarItems();
-    panel.sourcesViewInternal.rightToolbar().removeToolbarItems();
-    panel.sourcesViewInternal.bottomToolbar().removeToolbarItems();
+    panel.#sourcesView.leftToolbar().removeToolbarItems();
+    panel.#sourcesView.rightToolbar().removeToolbarItems();
+    panel.#sourcesView.bottomToolbar().removeToolbarItems();
     const isInWrapper = UI.Context.Context.instance().flavor(QuickSourceView) &&
         !UI.InspectorView.InspectorView.instance().isDrawerMinimized();
     if (panel.splitWidget.isVertical() || isInWrapper) {
-      panel.splitWidget.uninstallResizer(panel.sourcesViewInternal.scriptViewToolbar());
+      panel.splitWidget.uninstallResizer(panel.#sourcesView.scriptViewToolbar());
     } else {
-      panel.splitWidget.installResizer(panel.sourcesViewInternal.scriptViewToolbar());
+      panel.splitWidget.installResizer(panel.#sourcesView.scriptViewToolbar());
     }
     if (!isInWrapper) {
-      panel.sourcesViewInternal.leftToolbar().appendToolbarItem(panel.toggleNavigatorSidebarButton);
+      panel.#sourcesView.leftToolbar().appendToolbarItem(panel.toggleNavigatorSidebarButton);
       if (panel.splitWidget.isVertical()) {
-        panel.sourcesViewInternal.rightToolbar().appendToolbarItem(panel.toggleDebuggerSidebarButton);
+        panel.#sourcesView.rightToolbar().appendToolbarItem(panel.toggleDebuggerSidebarButton);
       } else {
-        panel.sourcesViewInternal.bottomToolbar().appendToolbarItem(panel.toggleDebuggerSidebarButton);
+        panel.#sourcesView.bottomToolbar().appendToolbarItem(panel.toggleDebuggerSidebarButton);
       }
     }
   }
@@ -400,7 +400,7 @@ export class SourcesPanel extends UI.Panel.Panel implements
       this.showDebuggerPausedDetails(
           (debuggerModel.debuggerPausedDetails() as SDK.DebuggerModel.DebuggerPausedDetails));
     } else {
-      this.pausedInternal = false;
+      this.#paused = false;
       this.clearInterface();
       this.toggleDebuggerSidebarButton.setEnabled(true);
     }
@@ -410,7 +410,7 @@ export class SourcesPanel extends UI.Panel.Panel implements
     this.setTarget(target);
   }
   paused(): boolean {
-    return this.pausedInternal || false;
+    return this.#paused || false;
   }
 
   override wasShown(): void {
@@ -420,7 +420,7 @@ export class SourcesPanel extends UI.Panel.Panel implements
       UI.InspectorView.InspectorView.instance().setDrawerMinimized(true);
       SourcesPanel.updateResizerAndSidebarButtons(this);
     }
-    this.editorView.setMainWidget(this.sourcesViewInternal);
+    this.editorView.setMainWidget(this.#sourcesView);
   }
 
   override willHide(): void {
@@ -460,7 +460,7 @@ export class SourcesPanel extends UI.Panel.Panel implements
   }
 
   override searchableView(): UI.SearchableView.SearchableView {
-    return this.sourcesViewInternal.searchableView();
+    return this.#sourcesView.searchableView();
   }
 
   toggleNavigatorSidebar(): void {
@@ -474,14 +474,14 @@ export class SourcesPanel extends UI.Panel.Panel implements
   private debuggerPaused(event: Common.EventTarget.EventTargetEvent<SDK.DebuggerModel.DebuggerModel>): void {
     const debuggerModel = event.data;
     const details = debuggerModel.debuggerPausedDetails();
-    if (!this.pausedInternal &&
+    if (!this.#paused &&
         Common.Settings.Settings.instance().moduleSetting('auto-focus-on-debugger-paused-enabled').get()) {
       void this.setAsCurrentPanel();
     }
 
     if (UI.Context.Context.instance().flavor(SDK.Target.Target) === debuggerModel.target()) {
       this.showDebuggerPausedDetails((details as SDK.DebuggerModel.DebuggerPausedDetails));
-    } else if (!this.pausedInternal) {
+    } else if (!this.#paused) {
       UI.Context.Context.instance().setFlavor(SDK.Target.Target, debuggerModel.target());
     }
   }
@@ -499,7 +499,7 @@ export class SourcesPanel extends UI.Panel.Panel implements
   }
 
   private showDebuggerPausedDetails(details: SDK.DebuggerModel.DebuggerPausedDetails): void {
-    this.pausedInternal = true;
+    this.#paused = true;
     void this.updateDebuggerButtonsAndStatus();
     UI.Context.Context.instance().setFlavor(SDK.DebuggerModel.DebuggerPausedDetails, details);
     this.toggleDebuggerSidebarButton.setEnabled(false);
@@ -549,12 +549,12 @@ export class SourcesPanel extends UI.Panel.Panel implements
       if (byOverlayButton) {
         const details = UI.Context.Context.instance().flavor(SDK.DebuggerModel.DebuggerPausedDetails);
         VisualLogging.logClick(
-            this.pausedInternal && details?.reason === Protocol.Debugger.PausedEventReason.Step ?
+            this.#paused && details?.reason === Protocol.Debugger.PausedEventReason.Step ?
                 this.overlayLoggables.stepOverButton :
                 this.overlayLoggables.resumeButton,
             new MouseEvent('click'));
       }
-      if (!this.pausedInternal) {
+      if (!this.#paused) {
         VisualLogging.logResize(this.overlayLoggables.debuggerPausedMessage, new DOMRect(0, 0, 0, 0));
         this.overlayLoggables = undefined;
       }
@@ -567,7 +567,7 @@ export class SourcesPanel extends UI.Panel.Panel implements
     if (UI.Context.Context.instance().flavor(SDK.Target.Target) !== target) {
       return;
     }
-    this.pausedInternal = false;
+    this.#paused = false;
     this.clearInterface();
     this.toggleDebuggerSidebarButton.setEnabled(true);
     this.switchToPausedTargetTimeout = window.setTimeout(this.switchToPausedTarget.bind(this, debuggerModel), 500);
@@ -583,7 +583,7 @@ export class SourcesPanel extends UI.Panel.Panel implements
   }
 
   get visibleView(): UI.Widget.Widget|null {
-    return this.sourcesViewInternal.visibleView();
+    return this.#sourcesView.visibleView();
   }
 
   showUISourceCode(
@@ -596,7 +596,7 @@ export class SourcesPanel extends UI.Panel.Panel implements
     } else {
       this.showEditor();
     }
-    this.sourcesViewInternal.showSourceLocation(uiSourceCode, location, omitFocus);
+    this.#sourcesView.showSourceLocation(uiSourceCode, location, omitFocus);
   }
 
   private showEditor(): void {
@@ -679,7 +679,7 @@ export class SourcesPanel extends UI.Panel.Panel implements
     if (window.performance.now() - this.lastModificationTime < lastModificationTimeout) {
       return;
     }
-    this.sourcesViewInternal.showSourceLocation(uiLocation.uiSourceCode, uiLocation, undefined, true);
+    this.#sourcesView.showSourceLocation(uiLocation.uiSourceCode, uiLocation, undefined, true);
   }
 
   private async callFrameChanged(): Promise<void> {
@@ -704,7 +704,7 @@ export class SourcesPanel extends UI.Panel.Panel implements
       this.stepIntoAction.setEnabled(false);
       this.stepOutAction.setEnabled(false);
       this.stepAction.setEnabled(false);
-    } else if (this.pausedInternal) {
+    } else if (this.#paused) {
       this.togglePauseAction.setToggled(true);
       this.togglePauseAction.setEnabled(true);
       this.stepOverAction.setEnabled(true);
@@ -744,7 +744,7 @@ export class SourcesPanel extends UI.Panel.Panel implements
 
   private switchToPausedTarget(debuggerModel: SDK.DebuggerModel.DebuggerModel): void {
     delete this.switchToPausedTargetTimeout;
-    if (this.pausedInternal || debuggerModel.isPaused()) {
+    if (this.#paused || debuggerModel.isPaused()) {
       return;
     }
 
@@ -757,7 +757,7 @@ export class SourcesPanel extends UI.Panel.Panel implements
   }
 
   runSnippet(): void {
-    const uiSourceCode = this.sourcesViewInternal.currentUISourceCode();
+    const uiSourceCode = this.#sourcesView.currentUISourceCode();
     if (uiSourceCode) {
       void Snippets.ScriptSnippetFileSystem.evaluateScriptSnippet(uiSourceCode);
     }
@@ -782,8 +782,8 @@ export class SourcesPanel extends UI.Panel.Panel implements
       return true;
     }
 
-    if (this.pausedInternal) {
-      this.pausedInternal = false;
+    if (this.#paused) {
+      this.#paused = false;
       debuggerModel.resume();
     } else {
       // Make sure pauses didn't stick skipped.
@@ -795,11 +795,11 @@ export class SourcesPanel extends UI.Panel.Panel implements
   }
 
   private prepareToResume(): SDK.DebuggerModel.DebuggerModel|null {
-    if (!this.pausedInternal) {
+    if (!this.#paused) {
       return null;
     }
 
-    this.pausedInternal = false;
+    this.#paused = false;
 
     this.clearInterface();
     const target = UI.Context.Context.instance().flavor(SDK.Target.Target);
@@ -878,7 +878,7 @@ export class SourcesPanel extends UI.Panel.Panel implements
   private breakpointsActiveStateChanged(): void {
     const active = Common.Settings.Settings.instance().moduleSetting('breakpoints-active').get();
     this.toggleBreakpointsActiveAction.setToggled(!active);
-    this.sourcesViewInternal.toggleBreakpointsActiveState(active);
+    this.#sourcesView.toggleBreakpointsActiveState(active);
   }
 
   private createDebugToolbar(): UI.Toolbar.Toolbar {
@@ -1295,7 +1295,7 @@ export class SourcesPanel extends UI.Panel.Panel implements
   }
 
   sourcesView(): SourcesView {
-    return this.sourcesViewInternal;
+    return this.#sourcesView;
   }
 
   private handleDrop(dataTransfer: DataTransfer): void {

package/front_end/panels/sources/SourcesSearchScope.ts

@@ -1,32 +1,6 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Copyright 2011 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
 
 import * as Common from '../../core/common/common.js';
 import * as Platform from '../../core/platform/platform.js';

package/front_end/panels/sources/SourcesView.ts

@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 /* eslint-disable rulesdir/no-imperative-dom-api */
@@ -58,12 +58,12 @@ const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 
 export class SourcesView extends Common.ObjectWrapper.eventMixin<EventTypes, typeof UI.Widget.VBox>(UI.Widget.VBox)
     implements TabbedEditorContainerDelegate, UI.SearchableView.Searchable, UI.SearchableView.Replaceable {
-  private readonly searchableViewInternal: UI.SearchableView.SearchableView;
+  readonly #searchableView: UI.SearchableView.SearchableView;
   private readonly sourceViewByUISourceCode: Map<Workspace.UISourceCode.UISourceCode, UI.Widget.Widget>;
   editorContainer: TabbedEditorContainer;
   private readonly historyManager: EditingLocationHistoryManager;
   readonly #scriptViewToolbar: UI.Toolbar.Toolbar;
-  private readonly bottomToolbarInternal: UI.Toolbar.Toolbar;
+  readonly #bottomToolbar: UI.Toolbar.Toolbar;
   private toolbarChangedListener: Common.EventTarget.EventDescriptor|null;
   private readonly focusedPlaceholderElement?: HTMLElement;
   private searchView?: UISourceCodeFrame;
@@ -78,16 +78,16 @@ export class SourcesView extends Common.ObjectWrapper.eventMixin<EventTypes, typ
 
     const workspace = Workspace.Workspace.WorkspaceImpl.instance();
 
-    this.searchableViewInternal = new UI.SearchableView.SearchableView(this, this, 'sources-view-search-config');
-    this.searchableViewInternal.setMinimalSearchQuerySize(0);
-    this.searchableViewInternal.show(this.element);
+    this.#searchableView = new UI.SearchableView.SearchableView(this, this, 'sources-view-search-config');
+    this.#searchableView.setMinimalSearchQuerySize(0);
+    this.#searchableView.show(this.element);
 
     this.sourceViewByUISourceCode = new Map();
 
     this.editorContainer = new TabbedEditorContainer(
         this, Common.Settings.Settings.instance().createLocalSetting('previously-viewed-files', []),
         this.placeholderElement(), this.focusedPlaceholderElement);
-    this.editorContainer.show(this.searchableViewInternal.element);
+    this.editorContainer.show(this.#searchableView.element);
     this.editorContainer.addEventListener(TabbedEditorContainerEvents.EDITOR_SELECTED, this.editorSelected, this);
     this.editorContainer.addEventListener(TabbedEditorContainerEvents.EDITOR_CLOSED, this.editorClosed, this);
 
@@ -97,7 +97,7 @@ export class SourcesView extends Common.ObjectWrapper.eventMixin<EventTypes, typ
     toolbarContainerElementInternal.setAttribute('jslog', `${VisualLogging.toolbar('bottom')}`);
     this.#scriptViewToolbar = toolbarContainerElementInternal.createChild('devtools-toolbar');
     this.#scriptViewToolbar.style.flex = 'auto';
-    this.bottomToolbarInternal = toolbarContainerElementInternal.createChild('devtools-toolbar');
+    this.#bottomToolbar = toolbarContainerElementInternal.createChild('devtools-toolbar');
 
     this.toolbarChangedListener = null;
 
@@ -224,7 +224,7 @@ export class SourcesView extends Common.ObjectWrapper.eventMixin<EventTypes, typ
   }
 
   bottomToolbar(): UI.Toolbar.Toolbar {
-    return this.bottomToolbarInternal;
+    return this.#bottomToolbar;
   }
 
   scriptViewToolbar(): UI.Toolbar.Toolbar {
@@ -242,7 +242,7 @@ export class SourcesView extends Common.ObjectWrapper.eventMixin<EventTypes, typ
   }
 
   searchableView(): UI.SearchableView.SearchableView {
-    return this.searchableViewInternal;
+    return this.#searchableView;
   }
 
   visibleView(): UI.Widget.Widget|null {
@@ -474,7 +474,7 @@ export class SourcesView extends Common.ObjectWrapper.eventMixin<EventTypes, typ
     // SourcesNavigator does not need to update on EditorClosed.
     this.removeToolbarChangedListener();
     this.updateScriptViewToolbarItems();
-    this.searchableViewInternal.resetSearch();
+    this.#searchableView.resetSearch();
 
     const data = {
       uiSourceCode,
@@ -490,11 +490,11 @@ export class SourcesView extends Common.ObjectWrapper.eventMixin<EventTypes, typ
     }
     const currentSourceFrame = event.data.currentView instanceof UISourceCodeFrame ? event.data.currentView : null;
     if (currentSourceFrame) {
-      currentSourceFrame.setSearchableView(this.searchableViewInternal);
+      currentSourceFrame.setSearchableView(this.#searchableView);
     }
 
-    this.searchableViewInternal.setReplaceable(Boolean(currentSourceFrame?.canEditSource()));
-    this.searchableViewInternal.refreshSearch();
+    this.#searchableView.setReplaceable(Boolean(currentSourceFrame?.canEditSource()));
+    this.#searchableView.refreshSearch();
     this.updateToolbarChangedListener();
     this.updateScriptViewToolbarItems();
 

package/front_end/panels/sources/TabbedEditorContainer.ts

@@ -1,32 +1,6 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Copyright 2011 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
 /* eslint-disable rulesdir/no-imperative-dom-api */
 
 import * as Common from '../../core/common/common.js';
@@ -94,7 +68,7 @@ export class TabbedEditorContainer extends Common.ObjectWrapper.ObjectWrapper<Ev
   private readonly history: History;
   private readonly uriToUISourceCode: Map<Platform.DevToolsPath.UrlString, Workspace.UISourceCode.UISourceCode>;
   private readonly idToUISourceCode: Map<string, Workspace.UISourceCode.UISourceCode>;
-  private currentFileInternal!: Workspace.UISourceCode.UISourceCode|null;
+  #currentFile!: Workspace.UISourceCode.UISourceCode|null;
   private currentView!: UI.Widget.Widget|null;
   private scrollTimer?: number;
   private reentrantShow: boolean;
@@ -144,7 +118,7 @@ export class TabbedEditorContainer extends Common.ObjectWrapper.ObjectWrapper<Ev
     const networkTabId = this.tabIds.get(binding.network);
     let fileSystemTabId = this.tabIds.get(binding.fileSystem);
 
-    const wasSelectedInNetwork = this.currentFileInternal === binding.network;
+    const wasSelectedInNetwork = this.#currentFile === binding.network;
     const networkKey = historyItemKey(binding.network);
     const currentSelectionRange = this.history.selectionRange(networkKey);
     const currentScrollLineNumber = this.history.scrollLineNumber(networkKey);
@@ -218,7 +192,7 @@ export class TabbedEditorContainer extends Common.ObjectWrapper.ObjectWrapper<Ev
     // If the content has already been set and the current frame is showing
     // the incoming uiSourceCode, then fire the event that the file has been loaded.
     // Otherwise, this event will fire as soon as the content has been set.
-    if (frame?.currentSourceFrame()?.contentSet && this.currentFileInternal === uiSourceCode &&
+    if (frame?.currentSourceFrame()?.contentSet && this.#currentFile === uiSourceCode &&
         frame?.currentUISourceCode() === uiSourceCode) {
       Common.EventTarget.fireEvent('source-file-loaded', uiSourceCode.displayName(true));
     } else {
@@ -279,11 +253,11 @@ export class TabbedEditorContainer extends Common.ObjectWrapper.ObjectWrapper<Ev
         clearTimeout(this.scrollTimer);
       }
       this.scrollTimer = window.setTimeout(() => this.previouslyViewedFilesSetting.set(this.history.toObject()), 100);
-      if (this.currentFileInternal) {
+      if (this.#currentFile) {
         const {editor} = this.currentView.textEditor;
         const topBlock = editor.lineBlockAtHeight(editor.scrollDOM.getBoundingClientRect().top - editor.documentTop);
         const topLine = editor.state.doc.lineAt(topBlock.from).number - 1;
-        this.history.updateScrollLineNumber(historyItemKey(this.currentFileInternal), topLine);
+        this.history.updateScrollLineNumber(historyItemKey(this.#currentFile), topLine);
       }
     }
   }
@@ -294,14 +268,13 @@ export class TabbedEditorContainer extends Common.ObjectWrapper.ObjectWrapper<Ev
       const lineFrom = update.state.doc.lineAt(main.from), lineTo = update.state.doc.lineAt(main.to);
       const range = new TextUtils.TextRange.TextRange(
           lineFrom.number - 1, main.from - lineFrom.from, lineTo.number - 1, main.to - lineTo.from);
-      if (this.currentFileInternal) {
-        this.history.updateSelectionRange(historyItemKey(this.currentFileInternal), range);
+      if (this.#currentFile) {
+        this.history.updateSelectionRange(historyItemKey(this.#currentFile), range);
       }
       this.previouslyViewedFilesSetting.set(this.history.toObject());
 
-      if (this.currentFileInternal) {
-        Extensions.ExtensionServer.ExtensionServer.instance().sourceSelectionChanged(
-            this.currentFileInternal.url(), range);
+      if (this.#currentFile) {
+        Extensions.ExtensionServer.ExtensionServer.instance().sourceSelectionChanged(this.#currentFile.url(), range);
       }
     }
   }
@@ -313,12 +286,12 @@ export class TabbedEditorContainer extends Common.ObjectWrapper.ObjectWrapper<Ev
     const canonicalSourceCode = this.canonicalUISourceCode(uiSourceCode);
     const binding = Persistence.Persistence.PersistenceImpl.instance().binding(uiSourceCode);
     uiSourceCode = binding ? binding.fileSystem : uiSourceCode;
-    if (this.currentFileInternal === uiSourceCode) {
+    if (this.#currentFile === uiSourceCode) {
       return;
     }
 
     this.removeViewListeners();
-    this.currentFileInternal = uiSourceCode;
+    this.#currentFile = uiSourceCode;
 
     try {
       // Selecting the tab may cause showFile to be called again, but with the canonical source code,
@@ -351,7 +324,7 @@ export class TabbedEditorContainer extends Common.ObjectWrapper.ObjectWrapper<Ev
     }
 
     const eventData = {
-      currentFile: this.currentFileInternal,
+      currentFile: this.#currentFile,
       currentView: this.currentView,
       previousView,
       userGesture,
@@ -442,7 +415,7 @@ export class TabbedEditorContainer extends Common.ObjectWrapper.ObjectWrapper<Ev
       uiSourceCode.disableEdit();
     }
 
-    if (this.currentFileInternal?.canonicalScriptId() === uiSourceCode.canonicalScriptId()) {
+    if (this.#currentFile?.canonicalScriptId() === uiSourceCode.canonicalScriptId()) {
       return;
     }
 
@@ -461,14 +434,13 @@ export class TabbedEditorContainer extends Common.ObjectWrapper.ObjectWrapper<Ev
       return;
     }
 
-    if (!this.currentFileInternal) {
+    if (!this.#currentFile) {
       return;
     }
 
-    const currentProjectIsSnippets = Snippets.ScriptSnippetFileSystem.isSnippetsUISourceCode(this.currentFileInternal);
+    const currentProjectIsSnippets = Snippets.ScriptSnippetFileSystem.isSnippetsUISourceCode(this.#currentFile);
     const addedProjectIsSnippets = Snippets.ScriptSnippetFileSystem.isSnippetsUISourceCode(uiSourceCode);
-    if (this.history.index(historyItemKey(this.currentFileInternal)) && currentProjectIsSnippets &&
-        !addedProjectIsSnippets) {
+    if (this.history.index(historyItemKey(this.#currentFile)) && currentProjectIsSnippets && !addedProjectIsSnippets) {
       this.innerShowFile(uiSourceCode, false);
     }
   }
@@ -580,11 +552,10 @@ export class TabbedEditorContainer extends Common.ObjectWrapper.ObjectWrapper<Ev
   private tabClosed(event: Common.EventTarget.EventTargetEvent<UI.TabbedPane.EventData>): void {
     const {tabId, isUserGesture} = event.data;
     const uiSourceCode = this.files.get(tabId);
-    if (this.currentFileInternal &&
-        this.currentFileInternal.canonicalScriptId() === uiSourceCode?.canonicalScriptId()) {
+    if (this.#currentFile && this.#currentFile.canonicalScriptId() === uiSourceCode?.canonicalScriptId()) {
       this.removeViewListeners();
       this.currentView = null;
-      this.currentFileInternal = null;
+      this.#currentFile = null;
     }
     if (uiSourceCode) {
       this.tabIds.delete(uiSourceCode);
@@ -718,7 +689,7 @@ export class TabbedEditorContainer extends Common.ObjectWrapper.ObjectWrapper<Ev
   }
 
   currentFile(): Workspace.UISourceCode.UISourceCode|null {
-    return this.currentFileInternal || null;
+    return this.#currentFile || null;
   }
 }
 

package/front_end/panels/sources/ThreadsSidebarPane.ts

@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 /* eslint-disable rulesdir/no-imperative-dom-api */

package/front_end/panels/sources/UISourceCodeFrame.ts

@@ -1,32 +1,6 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Copyright 2012 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
 
 /* eslint-disable rulesdir/no-imperative-dom-api */
 
@@ -195,7 +169,7 @@ export class UISourceCodeFrame extends Common.ObjectWrapper
 
   override wasShown(): void {
     super.wasShown();
-    this.setEditable(this.canEditSourceInternal());
+    this.setEditable(this.#canEditSource());
   }
 
   override willHide(): void {
@@ -213,7 +187,7 @@ export class UISourceCodeFrame extends Common.ObjectWrapper
     return Common.ResourceType.ResourceType.simplifyContentType(mimeType);
   }
 
-  canEditSourceInternal(): boolean {
+  #canEditSource(): boolean {
     if (this.hasLoadError()) {
       return false;
     }
@@ -249,7 +223,7 @@ export class UISourceCodeFrame extends Common.ObjectWrapper
   }
 
   private onNetworkPersistenceChanged(): void {
-    this.setEditable(this.canEditSourceInternal());
+    this.setEditable(this.#canEditSource());
   }
 
   commitEditing(): void {
@@ -346,7 +320,8 @@ export class UISourceCodeFrame extends Common.ObjectWrapper
       AiWarningInfobarPlugin,
     ];
 
-    if (Boolean(Root.Runtime.hostConfig.devToolsAiCodeCompletion?.enabled)) {
+    if (Root.Runtime.hostConfig.aidaAvailability?.enabled &&
+        Root.Runtime.hostConfig.devToolsAiCodeCompletion?.enabled) {
       sourceFramePluginsList.push(AiCodeCompletionPlugin);
     }
     return sourceFramePluginsList;
@@ -391,7 +366,7 @@ export class UISourceCodeFrame extends Common.ObjectWrapper
   }
 
   private updateStyle(): void {
-    this.setEditable(this.canEditSourceInternal());
+    this.setEditable(this.#canEditSource());
   }
 
   private maybeSetContent(content: TextUtils.ContentData.ContentData): void {