Skip to content

Refactor browser error page to a feature contribution #318637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kycutler merged 1 commit into from
May 28, 2026
+533 −380
Merged

Refactor browser error page to a feature contribution #318637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
362 changes: 123 additions & 239 deletions src/vs/workbench/contrib/browserView/electron-browser/browserEditor.ts
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/vs/workbench/contrib/browserView/electron-browser/browserView.contribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import './features/webContentsViewRendererFeature.js';
import './features/browserDataStorageFeatures.js';
import './features/browserDevToolsFeature.js';
import './features/browserEditorChatFeatures.js';
import './features/browserEditorErrorFeatures.js';
import './features/browserEditorZoomFeature.js';
import './features/browserEditorEmulationFeatures.js';
import './features/browserEditorFindFeature.js';
Expand Down
6 changes: 3 additions & 3 deletions src/vs/workbench/contrib/browserView/electron-browser/features/browserEditorChatFeatures.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import { BrowserEditorInput } from '../../common/browserEditorInput.js';
import { Button } from '../../../../../base/browser/ui/button/button.js';
import { WorkbenchHoverDelegate } from '../../../../../platform/hover/browser/hover.js';
import { HoverPosition } from '../../../../../base/browser/ui/hover/hoverWidget.js';
import { BrowserEditor, BrowserEditorContribution, IBrowserEditorWidgetContribution, CONTEXT_BROWSER_HAS_ERROR, CONTEXT_BROWSER_HAS_URL } from '../browserEditor.js';
import { BrowserEditor, BrowserEditorContribution, BrowserWidgetLocation, IBrowserEditorWidget, CONTEXT_BROWSER_HAS_ERROR, CONTEXT_BROWSER_HAS_URL } from '../browserEditor.js';
import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../../platform/configuration/common/configurationRegistry.js';
import { Registry } from '../../../../../platform/registry/common/platform.js';
import { PolicyCategory } from '../../../../../base/common/policy.js';
Expand Down Expand Up @@ -155,8 +155,8 @@ export class BrowserEditorChatIntegration extends BrowserEditorContribution {
}));
}

override get urlBarWidgets(): readonly IBrowserEditorWidgetContribution[] {
return [{ element: this._shareButtonContainer, order: 50 }];
override get widgets(): readonly IBrowserEditorWidget[] {
return [{ location: BrowserWidgetLocation.PostUrl, element: this._shareButtonContainer, order: 50 }];
}

protected override onModelAttached(model: IBrowserViewModel, store: DisposableStore): void {
Expand Down
6 changes: 3 additions & 3 deletions ...workbench/contrib/browserView/electron-browser/features/browserEditorEmulationFeatures.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { IQuickInputService, IQuickPickItem } from '../../../../../platform/quic
import { defaultInputBoxStyles, defaultSelectBoxStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
import { IEditorService } from '../../../../services/editor/common/editorService.js';
import { IBrowserViewModel } from '../../common/browserView.js';
import { BrowserEditor, BrowserEditorContribution, IContainerLayout, IContainerLayoutOverride } from '../browserEditor.js';
import { BrowserEditor, BrowserEditorContribution, BrowserWidgetLocation, IBrowserEditorWidget, IContainerLayout, IContainerLayoutOverride } from '../browserEditor.js';
import { BROWSER_EDITOR_ACTIVE, BrowserActionCategory, BrowserActionGroup } from '../browserViewActions.js';

const CONTEXT_BROWSER_EMULATION_TOOLBAR_VISIBLE = new RawContextKey<boolean>(
Expand Down Expand Up @@ -394,8 +394,8 @@ export class BrowserEditorEmulationSupport extends BrowserEditorContribution {

// -- BrowserEditorContribution hooks ------------------------------------

override get toolbarElements(): readonly HTMLElement[] {
return [this._toolbar.element];
override get widgets(): readonly IBrowserEditorWidget[] {
return [{ location: BrowserWidgetLocation.Toolbar, element: this._toolbar.element, order: 0 }];
}

override onContainerCreated(container: HTMLElement): void {
Expand Down
Loading
Loading