diff --git a/src/vs/platform/browserView/common/browserView.ts b/src/vs/platform/browserView/common/browserView.ts index 28bbcd85e94a4..43ee26dc2f128 100644 --- a/src/vs/platform/browserView/common/browserView.ts +++ b/src/vs/platform/browserView/common/browserView.ts @@ -13,6 +13,7 @@ export enum BrowserViewCommandId { Open = `${commandPrefix}.open`, NewTab = `${commandPrefix}.newTab`, QuickOpen = `${commandPrefix}.quickOpen`, + OpenOrList = `${commandPrefix}.openOrList`, CloseAll = `${commandPrefix}.closeAll`, CloseAllInGroup = `${commandPrefix}.closeAllInGroup`, diff --git a/src/vs/workbench/contrib/browserView/electron-browser/features/browserTabManagementFeatures.ts b/src/vs/workbench/contrib/browserView/electron-browser/features/browserTabManagementFeatures.ts index a5ba5dd40dd9a..09acf97400ffc 100644 --- a/src/vs/workbench/contrib/browserView/electron-browser/features/browserTabManagementFeatures.ts +++ b/src/vs/workbench/contrib/browserView/electron-browser/features/browserTabManagementFeatures.ts @@ -83,7 +83,7 @@ class BrowserTabQuickPick extends Disposable { super(); this._quickPick = this._register(quickInputService.createQuickPick({ useSeparators: true })); - this._quickPick.placeholder = localize('browser.quickOpenPlaceholder', "Select a browser tab or enter a URL"); + this._quickPick.placeholder = localize('browser.quickOpenPlaceholder', "Select a browser tab"); this._quickPick.matchOnDescription = true; this._quickPick.sortByLabel = false; this._quickPick.buttons = [closeAllButtonItem]; @@ -225,7 +225,6 @@ class BrowserTabQuickPick extends Disposable { class QuickOpenBrowserAction extends Action2 { constructor() { - const neverShowInTitleBar = ContextKeyExpr.equals('config.workbench.browser.showInTitleBar', false); super({ id: BrowserViewCommandId.QuickOpen, title: localize2('browser.quickOpenAction', "Quick Open Browser Tab..."), @@ -239,12 +238,6 @@ class QuickOpenBrowserAction extends Action2 { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyA, when: BROWSER_EDITOR_ACTIVE }, - menu: { - id: MenuId.TitleBar, - group: 'navigation', - order: 10, - when: ContextKeyExpr.and(CONTEXT_BROWSER_EDITOR_OPEN, neverShowInTitleBar.negate()), - } }); } @@ -274,16 +267,6 @@ class OpenIntegratedBrowserAction extends Action2 { category: BrowserActionCategory, icon: Codicon.globe, f1: true, - menu: { - id: MenuId.TitleBar, - group: 'navigation', - order: 10, - when: ContextKeyExpr.and( - // This is a hack to work around `true` just testing for truthiness of the key. It works since `1 == true` in JS. - ContextKeyExpr.equals('config.workbench.browser.showInTitleBar', 1), - CONTEXT_BROWSER_EDITOR_OPEN.negate() - ) - } }); } @@ -420,18 +403,30 @@ class CloseAllBrowserTabsInGroupAction extends Action2 { } } -class OpenBrowserFromViewMenuAction extends Action2 { - static readonly ID = 'workbench.action.browser.openFromViewMenu'; - +class OpenOrListBrowsersAction extends Action2 { constructor() { super({ - id: OpenBrowserFromViewMenuAction.ID, - title: localize2('browser.openFromViewMenuAction', "Browser"), + id: BrowserViewCommandId.OpenOrList, + title: localize2('browser.openOrListAction', "Browser"), + icon: Codicon.globe, f1: false, keybinding: { weight: KeybindingWeight.WorkbenchContrib, primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Slash, }, + menu: { + id: MenuId.TitleBar, + group: 'navigation', + order: 10, + when: ContextKeyExpr.and( + ContextKeyExpr.equals('config.workbench.browser.showInTitleBar', false).negate(), + ContextKeyExpr.or( + CONTEXT_BROWSER_EDITOR_OPEN, + // This is a hack to work around `true` just testing for truthiness of the key. It works since `1 == true` in JS. + ContextKeyExpr.equals('config.workbench.browser.showInTitleBar', 1) + ) + ), + } }); } @@ -454,7 +449,7 @@ class OpenBrowserFromViewMenuAction extends Action2 { MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, { group: '4_auxbar', command: { - id: OpenBrowserFromViewMenuAction.ID, + id: BrowserViewCommandId.OpenOrList, title: localize({ key: 'miOpenBrowser', comment: ['&& denotes a mnemonic'] }, "&&Browser") }, order: 2 @@ -465,7 +460,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: BrowserV registerAction2(QuickOpenBrowserAction); registerAction2(OpenIntegratedBrowserAction); -registerAction2(OpenBrowserFromViewMenuAction); +registerAction2(OpenOrListBrowsersAction); registerAction2(NewTabAction); registerAction2(CloseAllBrowserTabsAction); registerAction2(CloseAllBrowserTabsInGroupAction);