chrome-devtools-frontend 1.0.1702515 → 1.0.1704172

package/front_end/panels/sources/DebuggerPlugin.ts

@@ -583,6 +583,7 @@ export class DebuggerPlugin extends Plugin {
   }
 
   private workingCopyChanged(): void {
+    this.#scopeMappingsCache.clear();
     this.setMuted(this.uiSourceCode.isDirty());
   }
 
@@ -666,7 +667,7 @@ export class DebuggerPlugin extends Plugin {
     return {
       box,
       show: async (popover: UI.GlassPane.GlassPane) => {
-        const scopeMappings = await this.#getScopeMappings(selectedCallFrame);
+        const scopeMappings = await this.#getScopeMappings(debuggableFrame) ?? [];
         const scopedVariable = findVariableInScopeMappings(evaluationText, highlightRange.from, scopeMappings);
         if (scopedVariable.found) {
           if (!scopedVariable.value) {
@@ -967,21 +968,18 @@ export class DebuggerPlugin extends Plugin {
     return offset ?? null;
   }
 
-  #cachedScopeMappings?: {callFrame: SDK.DebuggerModel.CallFrame, promise: Promise<ScopeMapping[]>};
+  readonly #scopeMappingsCache = new ScopeMappingsCache(this.uiSourceCode);
 
-  #getScopeMappings(callFrame: SDK.DebuggerModel.CallFrame,
-                    resolvedScopeChain?: SDK.DebuggerModel.ScopeChainEntry[]): Promise<ScopeMapping[]> {
-    if (this.#cachedScopeMappings?.callFrame !== callFrame) {
-      const url = this.uiSourceCode.url();
-      this.#cachedScopeMappings = {
-        callFrame,
-        promise: computeScopeMappings(
-            callFrame, location => this.#rawLocationToEditorOffset(location, url),
+  /** @returns `null` if the scope mappings can't be used because the file has unsaved edits. */
+  #getScopeMappings(debuggableFrame: StackTrace.StackTrace.DebuggableFrameFlavor,
+                    resolvedScopeChain?: SDK.DebuggerModel.ScopeChainEntry[]): Promise<ScopeMapping[]>|null {
+    const url = this.uiSourceCode.url();
+    return this.#scopeMappingsCache.get(
+        debuggableFrame,
+        () => computeScopeMappings(
+            debuggableFrame.sdkFrame, location => this.#rawLocationToEditorOffset(location, url),
             (line, col) => this.editor?.toOffset(this.transformer.uiLocationToEditorLocation(line, col)) ?? null,
-            resolvedScopeChain),
-      };
-    }
-    return this.#cachedScopeMappings.promise;
+            resolvedScopeChain));
   }
 
   private async computeValueDecorations(): Promise<CodeMirror.DecorationSet|null> {
@@ -1040,9 +1038,9 @@ export class DebuggerPlugin extends Plugin {
       return null;
     }
 
-    const scopeMappings = await this.#getScopeMappings(callFrame, scopeChain);
+    const scopeMappings = await this.#getScopeMappings(debuggableFrame, scopeChain);
     // After the `await` the DebuggerPlugin could have been disposed. Re-check `this.editor`.
-    if (!this.editor || scopeMappings.length === 0) {
+    if (!this.editor || !scopeMappings?.length) {
       return null;
     }
 
@@ -2144,6 +2142,41 @@ export interface ScopeMapping {
   variableMap: Map<string, SDK.RemoteObject.RemoteObject|null>;
 }
 
+/**
+ * Caches the {@link ScopeMapping}s for the selected frame of a single {@link DebuggerPlugin}.
+ *
+ * The editor offsets in a {@link ScopeMapping} are derived from raw and UI locations, which describe
+ * the committed script content. Once the user edits the file, these offsets no longer match the
+ * editor content. So no mappings are handed out while the UISourceCode has unsaved edits.
+ *
+ * The cache is keyed on the DebuggableFrameFlavor rather than the SDK CallFrame: Re-translating a
+ * frame (e.g. after a source map is attached) produces a new flavor for the same SDK CallFrame.
+ */
+export class ScopeMappingsCache {
+  readonly #uiSourceCode: Workspace.UISourceCode.UISourceCode;
+  #cached?: {frame: StackTrace.StackTrace.DebuggableFrameFlavor, promise: Promise<ScopeMapping[]>};
+
+  constructor(uiSourceCode: Workspace.UISourceCode.UISourceCode) {
+    this.#uiSourceCode = uiSourceCode;
+  }
+
+  /** @returns the (cached) scope mappings for `frame`, or `null` if the UISourceCode has unsaved edits. */
+  get(frame: StackTrace.StackTrace.DebuggableFrameFlavor,
+      compute: () => Promise<ScopeMapping[]>): Promise<ScopeMapping[]>|null {
+    if (this.#uiSourceCode.isDirty()) {
+      return null;
+    }
+    if (this.#cached?.frame !== frame) {
+      this.#cached = {frame, promise: compute()};
+    }
+    return this.#cached.promise;
+  }
+
+  clear(): void {
+    this.#cached = undefined;
+  }
+}
+
 export async function computeScopeMappings(
     callFrame: SDK.DebuggerModel.CallFrame,
     rawLocationToEditorOffset: (l: SDK.DebuggerModel.Location|null) => Promise<number|null>,

package/front_end/panels/sources/SourcesPanel.ts

@@ -327,7 +327,7 @@ export class SourcesPanel extends UI.Panel.Panel implements
   static updateResizerAndSidebarButtons(panel: SourcesPanel): void {
     const isInWrapper = Boolean(UI.Context.Context.instance().flavor(QuickSourceView)) &&
         !UI.InspectorView.InspectorView.instance().isDrawerMinimized();
-    panel.#sourcesView.setLayoutMode(panel.splitWidget, panel.splitWidget.isVertical(), isInWrapper);
+    panel.#sourcesView.setLayoutMode(panel.splitWidget.isVertical(), isInWrapper);
   }
 
   targetAdded(_target: SDK.Target.Target): void {

package/front_end/panels/sources/SourcesView.ts

@@ -1,7 +1,6 @@
 // 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 @devtools/no-imperative-dom-api */
 
 import '../../ui/legacy/legacy.js';
 
@@ -13,17 +12,17 @@ import * as SDK from '../../core/sdk/sdk.js';
 import * as Bindings from '../../models/bindings/bindings.js';
 import * as Persistence from '../../models/persistence/persistence.js';
 import * as Workspace from '../../models/workspace/workspace.js';
+import * as Buttons from '../../ui/components/buttons/buttons.js';
 import * as QuickOpen from '../../ui/legacy/components/quick_open/quick_open.js';
 import type * as SourceFrame from '../../ui/legacy/components/source_frame/source_frame.js';
 import * as UI from '../../ui/legacy/legacy.js';
-import {Directives, html, render} from '../../ui/lit/lit.js';
+import {html, type LitTemplate, nothing, render} from '../../ui/lit/lit.js';
 import * as VisualLogging from '../../ui/visual_logging/visual_logging.js';
 
 import {EditingLocationHistoryManager} from './EditingLocationHistoryManager.js';
 import sourcesViewStyles from './sourcesView.css.js';
 import {
   type EditorSelectedEvent,
-  Events as TabbedEditorContainerEvents,
   type SerializedHistoryItem,
   TabbedEditorContainer,
 } from './TabbedEditorContainer.js';
@@ -76,14 +75,24 @@ export interface ViewInput {
   searchProvider: UI.SearchableView.Searchable;
   replaceProvider: UI.SearchableView.Replaceable;
   searchableViewId: string;
-  scriptViewToolbarItems: UI.Toolbar.ToolbarItem[];
-  bottomToolbarItems: UI.Toolbar.ToolbarItem[];
+  scriptViewToolbarItems: UI.Toolbar.ToolbarItem[]|LitTemplate;
+  isNavigatorSidebarOpen: boolean;
+  isDebuggerSidebarOpen: boolean;
+  isDebuggerSidebarButtonEnabled: boolean;
+  isVertical: boolean;
+  isInWrapper: boolean;
+  isTraceApp: boolean;
+  onToggleNavigatorSidebar?: () => void;
+  onToggleDebuggerSidebar?: () => void;
+  breakpointsActive: boolean;
+  uiSourceCodes: ReadonlySet<Workspace.UISourceCode.UISourceCode>;
   historyManager: EditingLocationHistoryManager;
   previouslyViewedFilesSetting: Common.Settings.Setting<SerializedHistoryItem[]>;
+  onEditorSelected: (event: EditorSelectedEvent) => void;
+  onEditorClosed: (uiSourceCode: Workspace.UISourceCode.UISourceCode) => void;
 }
 
 export interface ViewOutput {
-  scriptViewToolbar?: UI.Toolbar.Toolbar;
   editorContainer?: TabbedEditorContainer;
   searchableView?: UI.SearchableView.SearchableView;
 }
@@ -91,8 +100,52 @@ export interface ViewOutput {
 export type View = (input: ViewInput, output: ViewOutput, target: HTMLElement) => void;
 
 export const DEFAULT_VIEW: View = (input, output, target): void => {
+  const renderNavigatorToggleButton = (): LitTemplate => {
+    const navHidden = !input.isNavigatorSidebarOpen;
+    const title = navHidden ? i18nString(UIStrings.showNavigator) : i18nString(UIStrings.hideNavigator);
+    // clang-format off
+    return html`
+      <devtools-button
+        class="toolbar-button"
+        title=${title}
+        aria-label=${title}
+        .iconName=${navHidden ? 'left-panel-open' : 'left-panel-close'}
+        .variant=${Buttons.Button.Variant.TOOLBAR}
+        jslog=${VisualLogging.toggleSubpane().track({click: true}).context('navigator')}
+        @click=${() => input.onToggleNavigatorSidebar?.()}
+      ></devtools-button>`;
+    // clang-format on
+  };
+
+  const renderDebuggerToggleButton = (): LitTemplate => {
+    const debuggerHidden = !input.isDebuggerSidebarOpen;
+    const title = debuggerHidden ? i18nString(UIStrings.showDebugger) : i18nString(UIStrings.hideDebugger);
+    const glyph = debuggerHidden ? (input.isVertical ? 'right-panel-open' : 'bottom-panel-open') :
+                                   (input.isVertical ? 'right-panel-close' : 'bottom-panel-close');
+    // clang-format off
+    return html`
+      <devtools-button
+        class="toolbar-button"
+        title=${title}
+        aria-label=${title}
+        .iconName=${glyph}
+        .variant=${Buttons.Button.Variant.TOOLBAR}
+        ?disabled=${!input.isDebuggerSidebarButtonEnabled}
+        jslog=${VisualLogging.toggleSubpane().track({click: true}).context('debugger')}
+        @click=${() => input.onToggleDebuggerSidebar?.()}
+      ></devtools-button>`;
+    // clang-format on
+  };
+
+  const leftToolbarItems: LitTemplate[] = !input.isInWrapper ? [renderNavigatorToggleButton()] : [];
+  const rightToolbarItems: LitTemplate[] =
+      (!input.isInWrapper && !input.isTraceApp && input.isVertical) ? [renderDebuggerToggleButton()] : [];
+  const bottomToolbarContent: LitTemplate =
+      (!input.isInWrapper && !input.isTraceApp && !input.isVertical) ? renderDebuggerToggleButton() : nothing;
+
   // clang-format off
   render(html`
+    <style>${sourcesViewStyles}</style>
     <devtools-widget class="vbox flex-auto"
       ${widget(element => {
         const searchableView = new UI.SearchableView.SearchableView(input.searchProvider, input.replaceProvider, input.searchableViewId, element);
@@ -101,19 +154,35 @@ export const DEFAULT_VIEW: View = (input, output, target): void => {
       })}
       ${widgetRef(UI.SearchableView.SearchableView, e => { output.searchableView = e; })}
     >
-      <devtools-widget class="vbox flex-auto"
-        ${widget(TabbedEditorContainer, {historyManager: input.historyManager, previouslyViewedFilesSetting: input.previouslyViewedFilesSetting})}
+      <devtools-widget class="vbox flex-auto ${input.breakpointsActive ? '' : 'breakpoints-deactivated'}"
+        ${widget(TabbedEditorContainer, {
+          historyManager: input.historyManager,
+          previouslyViewedFilesSetting: input.previouslyViewedFilesSetting,
+          leftToolbarItems,
+          rightToolbarItems,
+          uiSourceCodes: input.uiSourceCodes,
+          onEditorSelected: input.onEditorSelected,
+          onEditorClosed: input.onEditorClosed,
+        })}
         ${widgetRef(TabbedEditorContainer, e => { output.editorContainer = e; })}>
       </devtools-widget>
     </devtools-widget>
     <div class="sources-toolbar" jslog=${VisualLogging.toolbar('bottom')}>
-      <devtools-toolbar class="script-view-toolbar" style="flex: auto;" ${Directives.ref(el => { output.scriptViewToolbar = el as UI.Toolbar.Toolbar; })}>
-        ${input.scriptViewToolbarItems.map(item => item.element)}
+      <devtools-toolbar class="script-view-toolbar" style="flex: auto;">
+        ${Array.isArray(input.scriptViewToolbarItems)
+            ? input.scriptViewToolbarItems.map(item => item.element)
+            : input.scriptViewToolbarItems}
       </devtools-toolbar>
       <devtools-toolbar class="bottom-toolbar">
-        ${input.bottomToolbarItems.map(item => item.element)}
+        ${bottomToolbarContent}
       </devtools-toolbar>
-    </div>`, target);
+    </div>`, target, {
+    container: {
+      attributes: {
+        id: 'sources-panel-sources-view',
+      },
+    },
+  });
   // clang-format on
 };
 
@@ -128,38 +197,32 @@ export class SourcesView extends SourcesViewBase implements UI.SearchableView.Se
   editorContainer?: TabbedEditorContainer;
   #uiSourceCodes = new Set<Workspace.UISourceCode.UISourceCode>();
   private readonly historyManager: EditingLocationHistoryManager;
-  #scriptViewToolbar?: UI.Toolbar.Toolbar;
-  #scriptViewToolbarItems: UI.Toolbar.ToolbarItem[] = [];
-  #bottomToolbarItems: UI.Toolbar.ToolbarItem[] = [];
+  #scriptViewToolbarItems: UI.Toolbar.ToolbarItem[]|LitTemplate = [];
   private toolbarChangedListener: Common.EventTarget.EventDescriptor|null;
   private searchView?: UISourceCodeFrame;
   private searchConfig?: UI.SearchableView.SearchConfig;
-  #view: View = DEFAULT_VIEW;
+  readonly #view: View;
 
-  #toggleNavigatorSidebarButton: UI.Toolbar.ToolbarButton;
-  #toggleDebuggerSidebarButton: UI.Toolbar.ToolbarButton;
   #onToggleNavigatorSidebar?: () => void;
   #onToggleDebuggerSidebar?: () => void;
   #isNavigatorSidebarOpen = false;
   #isDebuggerSidebarOpen = false;
+  #isDebuggerSidebarButtonEnabled = true;
   #navigatorSidebarInitialized = false;
   #debuggerSidebarInitialized = false;
   #isVertical = false;
-  #leftToolbarItems?: UI.Toolbar.ToolbarItem[];
-  #rightToolbarItems?: UI.Toolbar.ToolbarItem[];
-  #breakpointsActive?: boolean;
+  #isInWrapper = true;
+  #breakpointsActive = true;
   #editorContainerPromise: Promise<TabbedEditorContainer>;
   #editorContainerResolve!: (container: TabbedEditorContainer) => void;
   readonly previouslyViewedFilesSetting: Common.Settings.Setting<SerializedHistoryItem[]>;
 
-  constructor() {
-    super({jslog: `${VisualLogging.pane('editor').track({keydown: 'Escape'})}`});
+  constructor(element?: HTMLElement, view: View = DEFAULT_VIEW) {
+    super(element, {jslog: `${VisualLogging.pane('editor').track({keydown: 'Escape'})}`});
+    this.#view = view;
     this.#editorContainerPromise = new Promise(resolve => {
       this.#editorContainerResolve = resolve;
     });
-    this.registerRequiredCSS(sourcesViewStyles);
-
-    this.element.id = 'sources-panel-sources-view';
     this.setMinimumAndPreferredSizes(88, 52, 150, 100);
 
     const workspace = Workspace.Workspace.WorkspaceImpl.instance();
@@ -168,22 +231,6 @@ export class SourcesView extends SourcesViewBase implements UI.SearchableView.Se
 
     this.toolbarChangedListener = null;
 
-    this.#toggleNavigatorSidebarButton =
-        new UI.Toolbar.ToolbarButton(i18nString(UIStrings.showNavigator), 'left-panel-open');
-    this.#toggleNavigatorSidebarButton.addEventListener(UI.Toolbar.ToolbarButton.Events.CLICK, () => {
-      this.#onToggleNavigatorSidebar?.();
-    });
-    this.#toggleNavigatorSidebarButton.element.setAttribute(
-        'jslog', `${VisualLogging.toggleSubpane().track({click: true}).context('navigator')}`);
-
-    this.#toggleDebuggerSidebarButton =
-        new UI.Toolbar.ToolbarButton(i18nString(UIStrings.showDebugger), 'right-panel-open');
-    this.#toggleDebuggerSidebarButton.addEventListener(UI.Toolbar.ToolbarButton.Events.CLICK, () => {
-      this.#onToggleDebuggerSidebar?.();
-    });
-    this.#toggleDebuggerSidebarButton.element.setAttribute(
-        'jslog', `${VisualLogging.toggleSubpane().track({click: true}).context('debugger')}`);
-
     this.previouslyViewedFilesSetting =
         Common.Settings.Settings.instance().createLocalSetting('previously-viewed-files', []);
     this.requestUpdate();
@@ -235,16 +282,24 @@ export class SourcesView extends SourcesViewBase implements UI.SearchableView.Se
       replaceProvider: this,
       searchableViewId: 'sources-view-search-config',
       scriptViewToolbarItems: this.#scriptViewToolbarItems,
-      bottomToolbarItems: this.#bottomToolbarItems,
+      isNavigatorSidebarOpen: this.#isNavigatorSidebarOpen,
+      isDebuggerSidebarOpen: this.#isDebuggerSidebarOpen,
+      isDebuggerSidebarButtonEnabled: this.#isDebuggerSidebarButtonEnabled,
+      isVertical: this.#isVertical,
+      isInWrapper: this.#isInWrapper,
+      isTraceApp: Root.Runtime.Runtime.isTraceApp(),
+      onToggleNavigatorSidebar: this.#onToggleNavigatorSidebar,
+      onToggleDebuggerSidebar: this.#onToggleDebuggerSidebar,
+      breakpointsActive: this.#breakpointsActive,
+      uiSourceCodes: new Set(this.#uiSourceCodes),
       historyManager: this.historyManager,
       previouslyViewedFilesSetting: this.previouslyViewedFilesSetting,
+      onEditorSelected: this.editorSelected.bind(this),
+      onEditorClosed: this.editorClosed.bind(this),
     };
 
     const that = this;
     const output: ViewOutput = {
-      set scriptViewToolbar(value: UI.Toolbar.Toolbar) {
-        that.#scriptViewToolbar = value;
-      },
       set editorContainer(value: TabbedEditorContainer) {
         that.setEditorContainer(value);
       },
@@ -265,36 +320,9 @@ export class SourcesView extends SourcesViewBase implements UI.SearchableView.Se
     if (this.editorContainer === editorContainer) {
       return;
     }
-    if (this.editorContainer) {
-      this.editorContainer.removeEventListener(TabbedEditorContainerEvents.EDITOR_SELECTED, this.editorSelected, this);
-      this.editorContainer.removeEventListener(TabbedEditorContainerEvents.EDITOR_CLOSED, this.editorClosed, this);
-    }
     this.editorContainer = editorContainer;
     if (this.editorContainer) {
-      if (this.#leftToolbarItems) {
-        this.editorContainer.leftToolbar().removeToolbarItems();
-        for (const item of this.#leftToolbarItems) {
-          this.editorContainer.leftToolbar().appendToolbarItem(item);
-        }
-      }
-      if (this.#rightToolbarItems) {
-        this.editorContainer.rightToolbar().removeToolbarItems();
-        for (const item of this.#rightToolbarItems) {
-          this.editorContainer.rightToolbar().appendToolbarItem(item);
-        }
-      }
-      if (this.#breakpointsActive !== undefined) {
-        this.editorContainer.element.classList.toggle('breakpoints-deactivated', !this.#breakpointsActive);
-      }
-
       this.#editorContainerResolve(editorContainer);
-      this.editorContainer.addEventListener(TabbedEditorContainerEvents.EDITOR_SELECTED, this.editorSelected, this);
-      this.editorContainer.addEventListener(TabbedEditorContainerEvents.EDITOR_CLOSED, this.editorClosed, this);
-      UI.UIUtils.startBatchUpdate();
-      for (const uiSourceCode of this.#uiSourceCodes) {
-        this.editorContainer.addUISourceCode(uiSourceCode);
-      }
-      UI.UIUtils.endBatchUpdate();
     }
   }
 
@@ -313,10 +341,12 @@ export class SourcesView extends SourcesViewBase implements UI.SearchableView.Se
 
   set onToggleNavigatorSidebar(callback: () => void) {
     this.#onToggleNavigatorSidebar = callback;
+    this.requestUpdate();
   }
 
   set onToggleDebuggerSidebar(callback: () => void) {
     this.#onToggleDebuggerSidebar = callback;
+    this.requestUpdate();
   }
 
   set isNavigatorSidebarOpen(isOpen: boolean) {
@@ -326,7 +356,7 @@ export class SourcesView extends SourcesViewBase implements UI.SearchableView.Se
       return;
     }
     this.#isNavigatorSidebarOpen = isOpen;
-    this.#updateNavigatorSidebarButton();
+    this.requestUpdate();
     if (isInitialized) {
       UI.ARIAUtils.LiveAnnouncer.alert(isOpen ? i18nString(UIStrings.navigatorShown) :
                                                 i18nString(UIStrings.navigatorHidden));
@@ -340,73 +370,21 @@ export class SourcesView extends SourcesViewBase implements UI.SearchableView.Se
       return;
     }
     this.#isDebuggerSidebarOpen = isOpen;
-    this.#updateDebuggerSidebarButton();
+    this.requestUpdate();
     if (isInitialized) {
       UI.ARIAUtils.LiveAnnouncer.alert(isOpen ? i18nString(UIStrings.debuggerShown) :
                                                 i18nString(UIStrings.debuggerHidden));
     }
   }
 
-  #updateNavigatorSidebarButton(): void {
-    const navHidden = !this.#isNavigatorSidebarOpen;
-    this.#toggleNavigatorSidebarButton.setGlyph(navHidden ? 'left-panel-open' : 'left-panel-close');
-    this.#toggleNavigatorSidebarButton.setTitle(navHidden ? i18nString(UIStrings.showNavigator) :
-                                                            i18nString(UIStrings.hideNavigator));
-  }
-
-  #updateDebuggerSidebarButton(): void {
-    const debuggerHidden = !this.#isDebuggerSidebarOpen;
-    const debuggerGlyph = debuggerHidden ? (this.#isVertical ? 'right-panel-open' : 'bottom-panel-open') :
-                                           (this.#isVertical ? 'right-panel-close' : 'bottom-panel-close');
-    this.#toggleDebuggerSidebarButton.setGlyph(debuggerGlyph);
-    this.#toggleDebuggerSidebarButton.setTitle(debuggerHidden ? i18nString(UIStrings.showDebugger) :
-                                                                i18nString(UIStrings.hideDebugger));
-  }
-
   toggleDebuggerSidebarButtonEnabled(enabled: boolean): void {
-    this.#toggleDebuggerSidebarButton.setEnabled(enabled);
+    this.#isDebuggerSidebarButtonEnabled = enabled;
+    this.requestUpdate();
   }
 
-  setLayoutMode(splitWidget: UI.SplitWidget.SplitWidget, isVertical: boolean, isInWrapper: boolean): void {
-    this.#bottomToolbarItems = [];
-
-    if (isVertical || isInWrapper) {
-      if (this.#scriptViewToolbar) {
-        splitWidget.uninstallResizer(this.#scriptViewToolbar);
-      }
-    } else if (this.#scriptViewToolbar) {
-      splitWidget.installResizer(this.#scriptViewToolbar);
-    }
-
+  setLayoutMode(isVertical: boolean, isInWrapper: boolean): void {
     this.#isVertical = isVertical;
-    this.#updateNavigatorSidebarButton();
-    this.#updateDebuggerSidebarButton();
-
-    const leftItems: UI.Toolbar.ToolbarItem[] = [];
-    const rightItems: UI.Toolbar.ToolbarItem[] = [];
-
-    if (!isInWrapper) {
-      leftItems.push(this.#toggleNavigatorSidebarButton);
-      if (!Root.Runtime.Runtime.isTraceApp()) {
-        if (isVertical) {
-          rightItems.push(this.#toggleDebuggerSidebarButton);
-        } else {
-          this.#bottomToolbarItems.push(this.#toggleDebuggerSidebarButton);
-        }
-      }
-    }
-
-    this.#leftToolbarItems = leftItems;
-    this.#rightToolbarItems = rightItems;
-
-    if (this.editorContainer) {
-      const editorContainer = this.editorContainer;
-      editorContainer.leftToolbar().removeToolbarItems();
-      leftItems.forEach(item => editorContainer.leftToolbar().appendToolbarItem(item));
-
-      editorContainer.rightToolbar().removeToolbarItems();
-      rightItems.forEach(item => editorContainer.rightToolbar().appendToolbarItem(item));
-    }
+    this.#isInWrapper = isInWrapper;
     this.requestUpdate();
   }
 
@@ -500,7 +478,7 @@ export class SourcesView extends SourcesViewBase implements UI.SearchableView.Se
       }
     }
     this.#uiSourceCodes.add(uiSourceCode);
-    this.editorContainer?.addUISourceCode(uiSourceCode);
+    this.requestUpdate();
   }
 
   private uiSourceCodeRemoved(event: Common.EventTarget.EventTargetEvent<Workspace.UISourceCode.UISourceCode>): void {
@@ -510,10 +488,10 @@ export class SourcesView extends SourcesViewBase implements UI.SearchableView.Se
 
   private removeUISourceCodes(uiSourceCodes: Workspace.UISourceCode.UISourceCode[]): void {
     uiSourceCodes.forEach(ui => this.#uiSourceCodes.delete(ui));
-    this.editorContainer?.removeUISourceCodes(uiSourceCodes);
     for (let i = 0; i < uiSourceCodes.length; ++i) {
       this.historyManager.removeHistoryForSourceCode(uiSourceCodes[i]);
     }
+    this.requestUpdate();
   }
 
   private projectRemoved(event: Common.EventTarget.EventTargetEvent<Workspace.Workspace.Project>): void {
@@ -526,17 +504,12 @@ export class SourcesView extends SourcesViewBase implements UI.SearchableView.Se
     const view = this.visibleView();
     if (view instanceof UI.View.SimpleView) {
       void view.toolbarItems().then(items => {
-        if (Array.isArray(items)) {
-          this.#scriptViewToolbarItems = items;
-        } else {
-          const wrapper = document.createElement('div');
-          wrapper.style.display = 'contents';
-          // eslint-disable-next-line @devtools/no-lit-render-outside-of-view
-          render(items, wrapper);
-          this.#scriptViewToolbarItems = [new UI.Toolbar.ToolbarItem(wrapper)];
-        }
+        this.#scriptViewToolbarItems = items;
         this.requestUpdate();
       });
+    } else {
+      this.#scriptViewToolbarItems = [];
+      this.requestUpdate();
     }
   }
 
@@ -570,8 +543,7 @@ export class SourcesView extends SourcesViewBase implements UI.SearchableView.Se
     return this.editorContainer?.getCreatedSourceView(uiSourceCode);
   }
 
-  private editorClosed(event: Common.EventTarget.EventTargetEvent<Workspace.UISourceCode.UISourceCode>): void {
-    const uiSourceCode = event.data;
+  private editorClosed(uiSourceCode: Workspace.UISourceCode.UISourceCode): void {
     this.historyManager.removeHistoryForSourceCode(uiSourceCode);
 
     let wasSelected = false;
@@ -591,12 +563,12 @@ export class SourcesView extends SourcesViewBase implements UI.SearchableView.Se
     this.dispatchEventToListeners(Events.EDITOR_CLOSED, data);
   }
 
-  private editorSelected(event: Common.EventTarget.EventTargetEvent<EditorSelectedEvent>): void {
-    const previousSourceFrame = event.data.previousView instanceof UISourceCodeFrame ? event.data.previousView : null;
+  private editorSelected(event: EditorSelectedEvent): void {
+    const previousSourceFrame = event.previousView instanceof UISourceCodeFrame ? event.previousView : null;
     if (previousSourceFrame) {
       previousSourceFrame.setSearchableView(null);
     }
-    const currentSourceFrame = event.data.currentView instanceof UISourceCodeFrame ? event.data.currentView : null;
+    const currentSourceFrame = event.currentView instanceof UISourceCodeFrame ? event.currentView : null;
     if (currentSourceFrame) {
       currentSourceFrame.setSearchableView(this.searchableView());
     }
@@ -738,7 +710,6 @@ export class SourcesView extends SourcesViewBase implements UI.SearchableView.Se
 
   toggleBreakpointsActiveState(active: boolean): void {
     this.#breakpointsActive = active;
-    this.editorContainer?.element.classList.toggle('breakpoints-deactivated', !active);
     this.requestUpdate();
   }
 }