diff --git a/src/vs/workbench/browser/actions/quickOpenActions.ts b/src/vs/workbench/browser/actions/quickOpenActions.ts index a16e1cd16233e1782c8bf3158a7d91fc639e6dd2..5c137d4ce5f0960ca2d90c29d8f6e83deb59e5ad 100644 --- a/src/vs/workbench/browser/actions/quickOpenActions.ts +++ b/src/vs/workbench/browser/actions/quickOpenActions.ts @@ -3,13 +3,41 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { localize } from 'vs/nls'; import { Registry } from 'vs/platform/registry/common/platform'; import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions'; import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions'; import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry'; -import { QuickOpenSelectNextAction, QuickOpenSelectPreviousAction, inQuickOpenContext, getQuickNavigateHandler, QuickOpenNavigateNextAction, QuickOpenNavigatePreviousAction, defaultQuickOpenContext, QUICKOPEN_ACTION_ID, QUICKOPEN_ACION_LABEL } from 'vs/workbench/browser/parts/quickopen/quickopen'; -import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput'; +import { IQuickInputService, ItemActivation } from 'vs/platform/quickinput/common/quickInput'; +import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; +import { CommandsRegistry } from 'vs/platform/commands/common/commands'; +import { Action } from 'vs/base/common/actions'; +import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; +import { inQuickOpenContext, defaultQuickOpenContext, getQuickNavigateHandler } from 'vs/workbench/browser/quickopen'; + +//#region Quick open management commands and keys + +const globalQuickOpenKeybinding = { + primary: KeyMod.CtrlCmd | KeyCode.KEY_P, + secondary: [KeyMod.CtrlCmd | KeyCode.KEY_E], + mac: { primary: KeyMod.CtrlCmd | KeyCode.KEY_P, secondary: undefined } +}; + +const QUICKOPEN_ACTION_ID = 'workbench.action.quickOpen'; + +MenuRegistry.appendMenuItem(MenuId.CommandPalette, { + command: { id: QUICKOPEN_ACTION_ID, title: { value: localize('quickOpen', "Go to File..."), original: 'Go to File...' } } +}); + +KeybindingsRegistry.registerKeybindingRule({ + id: QUICKOPEN_ACTION_ID, + weight: KeybindingWeight.WorkbenchContrib, + when: undefined, + primary: globalQuickOpenKeybinding.primary, + secondary: globalQuickOpenKeybinding.secondary, + mac: globalQuickOpenKeybinding.mac +}); KeybindingsRegistry.registerCommandAndKeybindingRule({ id: 'workbench.action.closeQuickOpen', @@ -55,28 +83,6 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ } }); -const registry = Registry.as(ActionExtensions.WorkbenchActions); - -const globalQuickOpenKeybinding = { primary: KeyMod.CtrlCmd | KeyCode.KEY_P, secondary: [KeyMod.CtrlCmd | KeyCode.KEY_E], mac: { primary: KeyMod.CtrlCmd | KeyCode.KEY_P, secondary: undefined } }; - -KeybindingsRegistry.registerKeybindingRule({ - id: QUICKOPEN_ACTION_ID, - weight: KeybindingWeight.WorkbenchContrib, - when: undefined, - primary: globalQuickOpenKeybinding.primary, - secondary: globalQuickOpenKeybinding.secondary, - mac: globalQuickOpenKeybinding.mac -}); - -MenuRegistry.appendMenuItem(MenuId.CommandPalette, { - command: { id: QUICKOPEN_ACTION_ID, title: { value: QUICKOPEN_ACION_LABEL, original: 'Go to File...' } } -}); - -registry.registerWorkbenchAction(SyncActionDescriptor.create(QuickOpenSelectNextAction, QuickOpenSelectNextAction.ID, QuickOpenSelectNextAction.LABEL, { primary: 0, mac: { primary: KeyMod.WinCtrl | KeyCode.KEY_N } }, inQuickOpenContext, KeybindingWeight.WorkbenchContrib + 50), 'Select Next in Quick Open'); -registry.registerWorkbenchAction(SyncActionDescriptor.create(QuickOpenSelectPreviousAction, QuickOpenSelectPreviousAction.ID, QuickOpenSelectPreviousAction.LABEL, { primary: 0, mac: { primary: KeyMod.WinCtrl | KeyCode.KEY_P } }, inQuickOpenContext, KeybindingWeight.WorkbenchContrib + 50), 'Select Previous in Quick Open'); -registry.registerWorkbenchAction(SyncActionDescriptor.create(QuickOpenNavigateNextAction, QuickOpenNavigateNextAction.ID, QuickOpenNavigateNextAction.LABEL), 'Navigate Next in Quick Open'); -registry.registerWorkbenchAction(SyncActionDescriptor.create(QuickOpenNavigatePreviousAction, QuickOpenNavigatePreviousAction.ID, QuickOpenNavigatePreviousAction.LABEL), 'Navigate Previous in Quick Open'); - const quickOpenNavigateNextInFilePickerId = 'workbench.action.quickOpenNavigateNextInFilePicker'; KeybindingsRegistry.registerCommandAndKeybindingRule({ id: quickOpenNavigateNextInFilePickerId, @@ -126,3 +132,120 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ quickInputService.back(); } }); + +CommandsRegistry.registerCommand({ + id: QUICKOPEN_ACTION_ID, + handler: async function (accessor: ServicesAccessor, prefix: unknown) { + const quickInputService = accessor.get(IQuickInputService); + + quickInputService.quickAccess.show(typeof prefix === 'string' ? prefix : undefined); + }, + description: { + description: `Quick open`, + args: [{ + name: 'prefix', + schema: { + 'type': 'string' + } + }] + } +}); + +CommandsRegistry.registerCommand('workbench.action.quickOpenPreviousEditor', async function (accessor: ServicesAccessor, prefix: string | null = null) { + const quickInputService = accessor.get(IQuickInputService); + + quickInputService.quickAccess.show('', { itemActivation: ItemActivation.SECOND }); +}); + +//#endregion + +//#region Workbench actions + +export class BaseQuickOpenNavigateAction extends Action { + + constructor( + id: string, + label: string, + private next: boolean, + private quickNavigate: boolean, + @IQuickInputService private readonly quickInputService: IQuickInputService, + @IKeybindingService private readonly keybindingService: IKeybindingService + ) { + super(id, label); + } + + async run(): Promise { + const keys = this.keybindingService.lookupKeybindings(this.id); + const quickNavigate = this.quickNavigate ? { keybindings: keys } : undefined; + + this.quickInputService.navigate(this.next, quickNavigate); + } +} + +export class QuickOpenNavigateNextAction extends BaseQuickOpenNavigateAction { + + static readonly ID = 'workbench.action.quickOpenNavigateNext'; + static readonly LABEL = localize('quickNavigateNext', "Navigate Next in Quick Open"); + + constructor( + id: string, + label: string, + @IQuickInputService quickInputService: IQuickInputService, + @IKeybindingService keybindingService: IKeybindingService + ) { + super(id, label, true, true, quickInputService, keybindingService); + } +} + +class QuickOpenNavigatePreviousAction extends BaseQuickOpenNavigateAction { + + static readonly ID = 'workbench.action.quickOpenNavigatePrevious'; + static readonly LABEL = localize('quickNavigatePrevious', "Navigate Previous in Quick Open"); + + constructor( + id: string, + label: string, + @IQuickInputService quickInputService: IQuickInputService, + @IKeybindingService keybindingService: IKeybindingService + ) { + super(id, label, false, true, quickInputService, keybindingService); + } +} + +class QuickOpenSelectNextAction extends BaseQuickOpenNavigateAction { + + static readonly ID = 'workbench.action.quickOpenSelectNext'; + static readonly LABEL = localize('quickSelectNext', "Select Next in Quick Open"); + + constructor( + id: string, + label: string, + @IQuickInputService quickInputService: IQuickInputService, + @IKeybindingService keybindingService: IKeybindingService + ) { + super(id, label, true, false, quickInputService, keybindingService); + } +} + +class QuickOpenSelectPreviousAction extends BaseQuickOpenNavigateAction { + + static readonly ID = 'workbench.action.quickOpenSelectPrevious'; + static readonly LABEL = localize('quickSelectPrevious', "Select Previous in Quick Open"); + + constructor( + id: string, + label: string, + @IQuickInputService quickInputService: IQuickInputService, + @IKeybindingService keybindingService: IKeybindingService + ) { + super(id, label, false, false, quickInputService, keybindingService); + } +} + +const registry = Registry.as(ActionExtensions.WorkbenchActions); +registry.registerWorkbenchAction(SyncActionDescriptor.create(QuickOpenSelectNextAction, QuickOpenSelectNextAction.ID, QuickOpenSelectNextAction.LABEL, { primary: 0, mac: { primary: KeyMod.WinCtrl | KeyCode.KEY_N } }, inQuickOpenContext, KeybindingWeight.WorkbenchContrib + 50), 'Select Next in Quick Open'); +registry.registerWorkbenchAction(SyncActionDescriptor.create(QuickOpenSelectPreviousAction, QuickOpenSelectPreviousAction.ID, QuickOpenSelectPreviousAction.LABEL, { primary: 0, mac: { primary: KeyMod.WinCtrl | KeyCode.KEY_P } }, inQuickOpenContext, KeybindingWeight.WorkbenchContrib + 50), 'Select Previous in Quick Open'); +registry.registerWorkbenchAction(SyncActionDescriptor.create(QuickOpenNavigateNextAction, QuickOpenNavigateNextAction.ID, QuickOpenNavigateNextAction.LABEL), 'Navigate Next in Quick Open'); +registry.registerWorkbenchAction(SyncActionDescriptor.create(QuickOpenNavigatePreviousAction, QuickOpenNavigatePreviousAction.ID, QuickOpenNavigatePreviousAction.LABEL), 'Navigate Previous in Quick Open'); + +//#endregion diff --git a/src/vs/workbench/browser/actions/windowActions.ts b/src/vs/workbench/browser/actions/windowActions.ts index f63d927d18e1f8af7dd62e9a35bd152f12c75c17..0f07cf134c0ff77259048caccbae2303bbfb19ee 100644 --- a/src/vs/workbench/browser/actions/windowActions.ts +++ b/src/vs/workbench/browser/actions/windowActions.ts @@ -29,7 +29,7 @@ import { FileKind } from 'vs/platform/files/common/files'; import { splitName } from 'vs/base/common/labels'; import { isMacintosh } from 'vs/base/common/platform'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; -import { inQuickOpenContext, getQuickNavigateHandler } from 'vs/workbench/browser/parts/quickopen/quickopen'; +import { inQuickOpenContext, getQuickNavigateHandler } from 'vs/workbench/browser/quickopen'; import { IHostService } from 'vs/workbench/services/host/browser/host'; export const inRecentFilesPickerContextKey = 'inRecentFilesPicker'; diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts index cedf4ee11f62f9c3ca97de4578043501c1f44c21..34a3f07daef70b9b334d7010c73d7de3993ffc6d 100644 --- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts +++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts @@ -39,7 +39,7 @@ import { } from 'vs/workbench/browser/parts/editor/editorActions'; import * as editorCommands from 'vs/workbench/browser/parts/editor/editorCommands'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { getQuickNavigateHandler, inQuickOpenContext } from 'vs/workbench/browser/parts/quickopen/quickopen'; +import { inQuickOpenContext, getQuickNavigateHandler } from 'vs/workbench/browser/quickopen'; import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { ContextKeyExpr, ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey'; import { isMacintosh } from 'vs/base/common/platform'; diff --git a/src/vs/workbench/browser/parts/quickopen/quickopen.ts b/src/vs/workbench/browser/parts/quickopen/quickopen.ts deleted file mode 100644 index 03f9889ce011726af5c6cc32bdf4ba9260e4e11b..0000000000000000000000000000000000000000 --- a/src/vs/workbench/browser/parts/quickopen/quickopen.ts +++ /dev/null @@ -1,139 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import * as nls from 'vs/nls'; -import { Action } from 'vs/base/common/actions'; -import { IQuickInputService, ItemActivation } from 'vs/platform/quickinput/common/quickInput'; -import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; -import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey'; -import { ICommandHandler, CommandsRegistry } from 'vs/platform/commands/common/commands'; -import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; - -const inQuickOpenKey = 'inQuickOpen'; -export const InQuickOpenContextKey = new RawContextKey(inQuickOpenKey, false); -export const inQuickOpenContext = ContextKeyExpr.has(inQuickOpenKey); -export const defaultQuickOpenContextKey = 'inFilesPicker'; -export const defaultQuickOpenContext = ContextKeyExpr.and(inQuickOpenContext, ContextKeyExpr.has(defaultQuickOpenContextKey)); - -export const QUICKOPEN_ACTION_ID = 'workbench.action.quickOpen'; -export const QUICKOPEN_ACION_LABEL = nls.localize('quickOpen', "Go to File..."); - -CommandsRegistry.registerCommand({ - id: QUICKOPEN_ACTION_ID, - handler: async function (accessor: ServicesAccessor, prefix: unknown) { - const quickInputService = accessor.get(IQuickInputService); - - quickInputService.quickAccess.show(typeof prefix === 'string' ? prefix : undefined); - }, - description: { - description: `Quick open`, - args: [{ - name: 'prefix', - schema: { - 'type': 'string' - } - }] - } -}); - -export const QUICKOPEN_FOCUS_SECONDARY_ACTION_ID = 'workbench.action.quickOpenPreviousEditor'; -CommandsRegistry.registerCommand(QUICKOPEN_FOCUS_SECONDARY_ACTION_ID, async function (accessor: ServicesAccessor, prefix: string | null = null) { - const quickInputService = accessor.get(IQuickInputService); - - quickInputService.quickAccess.show('', { itemActivation: ItemActivation.SECOND }); -}); - -export class BaseQuickOpenNavigateAction extends Action { - - constructor( - id: string, - label: string, - private next: boolean, - private quickNavigate: boolean, - @IQuickInputService private readonly quickInputService: IQuickInputService, - @IKeybindingService private readonly keybindingService: IKeybindingService - ) { - super(id, label); - } - - async run(): Promise { - const keys = this.keybindingService.lookupKeybindings(this.id); - const quickNavigate = this.quickNavigate ? { keybindings: keys } : undefined; - - this.quickInputService.navigate(this.next, quickNavigate); - } -} - -export function getQuickNavigateHandler(id: string, next?: boolean): ICommandHandler { - return accessor => { - const keybindingService = accessor.get(IKeybindingService); - const quickInputService = accessor.get(IQuickInputService); - - const keys = keybindingService.lookupKeybindings(id); - const quickNavigate = { keybindings: keys }; - - quickInputService.navigate(!!next, quickNavigate); - }; -} - -export class QuickOpenNavigateNextAction extends BaseQuickOpenNavigateAction { - - static readonly ID = 'workbench.action.quickOpenNavigateNext'; - static readonly LABEL = nls.localize('quickNavigateNext', "Navigate Next in Quick Open"); - - constructor( - id: string, - label: string, - @IQuickInputService quickInputService: IQuickInputService, - @IKeybindingService keybindingService: IKeybindingService - ) { - super(id, label, true, true, quickInputService, keybindingService); - } -} - -export class QuickOpenNavigatePreviousAction extends BaseQuickOpenNavigateAction { - - static readonly ID = 'workbench.action.quickOpenNavigatePrevious'; - static readonly LABEL = nls.localize('quickNavigatePrevious', "Navigate Previous in Quick Open"); - - constructor( - id: string, - label: string, - @IQuickInputService quickInputService: IQuickInputService, - @IKeybindingService keybindingService: IKeybindingService - ) { - super(id, label, false, true, quickInputService, keybindingService); - } -} - -export class QuickOpenSelectNextAction extends BaseQuickOpenNavigateAction { - - static readonly ID = 'workbench.action.quickOpenSelectNext'; - static readonly LABEL = nls.localize('quickSelectNext', "Select Next in Quick Open"); - - constructor( - id: string, - label: string, - @IQuickInputService quickInputService: IQuickInputService, - @IKeybindingService keybindingService: IKeybindingService - ) { - super(id, label, true, false, quickInputService, keybindingService); - } -} - -export class QuickOpenSelectPreviousAction extends BaseQuickOpenNavigateAction { - - static readonly ID = 'workbench.action.quickOpenSelectPrevious'; - static readonly LABEL = nls.localize('quickSelectPrevious', "Select Previous in Quick Open"); - - constructor( - id: string, - label: string, - @IQuickInputService quickInputService: IQuickInputService, - @IKeybindingService keybindingService: IKeybindingService - ) { - super(id, label, false, false, quickInputService, keybindingService); - } -} diff --git a/src/vs/workbench/browser/quickopen.ts b/src/vs/workbench/browser/quickopen.ts index 7d14477c1be4d233014722e18b0421b6bd63b945..14b6f8db0aba2abcb356fd74b8a7518998ba137c 100644 --- a/src/vs/workbench/browser/quickopen.ts +++ b/src/vs/workbench/browser/quickopen.ts @@ -3,6 +3,18 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey'; +import { ICommandHandler } from 'vs/platform/commands/common/commands'; +import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; +import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput'; + +export const inQuickOpenContextKeyValue = 'inQuickOpen'; +export const InQuickOpenContextKey = new RawContextKey(inQuickOpenContextKeyValue, false); +export const inQuickOpenContext = ContextKeyExpr.has(inQuickOpenContextKeyValue); + +export const defaultQuickOpenContextKeyValue = 'inFilesPicker'; +export const defaultQuickOpenContext = ContextKeyExpr.and(inQuickOpenContext, ContextKeyExpr.has(defaultQuickOpenContextKeyValue)); + export interface IWorkbenchQuickOpenConfiguration { workbench: { commandPalette: { @@ -15,3 +27,15 @@ export interface IWorkbenchQuickOpenConfiguration { } }; } + +export function getQuickNavigateHandler(id: string, next?: boolean): ICommandHandler { + return accessor => { + const keybindingService = accessor.get(IKeybindingService); + const quickInputService = accessor.get(IQuickInputService); + + const keys = keybindingService.lookupKeybindings(id); + const quickNavigate = { keybindings: keys }; + + quickInputService.navigate(!!next, quickNavigate); + }; +} diff --git a/src/vs/workbench/contrib/quickopen/browser/quickopen.contribution.ts b/src/vs/workbench/contrib/quickopen/browser/quickopen.contribution.ts index a382a409551bff8ffc84d04b6d65199b8593c6a9..5d6cd416ea2256aac4237937284675810775121a 100644 --- a/src/vs/workbench/contrib/quickopen/browser/quickopen.contribution.ts +++ b/src/vs/workbench/contrib/quickopen/browser/quickopen.contribution.ts @@ -8,7 +8,7 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { SyncActionDescriptor, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions'; import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions'; import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; -import { inQuickOpenContext, getQuickNavigateHandler } from 'vs/workbench/browser/parts/quickopen/quickopen'; +import { inQuickOpenContext, getQuickNavigateHandler } from 'vs/workbench/browser/quickopen'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { ShowAllCommandsAction, ClearCommandHistoryAction } from 'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess'; diff --git a/src/vs/workbench/contrib/remote/browser/remote.ts b/src/vs/workbench/contrib/remote/browser/remote.ts index 06935f0bcfc0818276a46f78f1d44e0aeb7fb2e8..f67fd36ac225f167ee98a8deab05ebeca11eec1a 100644 --- a/src/vs/workbench/contrib/remote/browser/remote.ts +++ b/src/vs/workbench/contrib/remote/browser/remote.ts @@ -56,6 +56,7 @@ import { Event } from 'vs/base/common/event'; import { ExtensionsRegistry, IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry'; import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; import { RemoteWindowActiveIndicator } from 'vs/workbench/contrib/remote/browser/remoteIndicator'; +import { inQuickOpenContextKeyValue } from 'vs/workbench/browser/quickopen'; export interface HelpInformation { extensionDescription: IExtensionDescription; @@ -773,7 +774,7 @@ class RemoteAgentConnectionStatusListener implements IWorkbenchContribution { // Register to listen for quick input is opened disposableListener = contextKeyService.onDidChangeContext((contextKeyChangeEvent) => { - const reconnectInteraction = new Set(['inQuickOpen']); + const reconnectInteraction = new Set([inQuickOpenContextKeyValue]); if (contextKeyChangeEvent.affectsSome(reconnectInteraction)) { // Need to move from dialog if being shown and user needs to type in a prompt if (lastLocation === ProgressLocation.Dialog && visibleProgress !== null) { diff --git a/src/vs/workbench/contrib/search/browser/search.contribution.ts b/src/vs/workbench/contrib/search/browser/search.contribution.ts index fdbb6dcf388868662524141536763d1728aa8713..2c8a203b84ea986934ff9872b1fd62d44e5f36ab 100644 --- a/src/vs/workbench/contrib/search/browser/search.contribution.ts +++ b/src/vs/workbench/contrib/search/browser/search.contribution.ts @@ -25,7 +25,7 @@ import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/co import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; import { IListService, WorkbenchListFocusContextKey, WorkbenchObjectTree } from 'vs/platform/list/browser/listService'; import { Registry } from 'vs/platform/registry/common/platform'; -import { defaultQuickOpenContextKey } from 'vs/workbench/browser/parts/quickopen/quickopen'; +import { defaultQuickOpenContextKeyValue } from 'vs/workbench/browser/quickopen'; import { Extensions as ActionExtensions, IWorkbenchActionRegistry } from 'vs/workbench/common/actions'; import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions'; import { Extensions as ViewExtensions, IViewsRegistry, IViewContainersRegistry, ViewContainerLocation, IViewDescriptorService, IViewsService } from 'vs/workbench/common/views'; @@ -620,7 +620,7 @@ quickAccessRegistry.registerQuickAccessProvider({ ctor: AnythingQuickAccessProvider, prefix: AnythingQuickAccessProvider.PREFIX, placeholder: nls.localize('anythingQuickAccessPlaceholder', "Search files by name (append {0} to go to line or {1} to go to symbol)", AbstractGotoLineQuickAccessProvider.PREFIX, GotoSymbolQuickAccessProvider.PREFIX), - contextKey: defaultQuickOpenContextKey, + contextKey: defaultQuickOpenContextKeyValue, helpEntries: [{ description: nls.localize('anythingQuickAccess', "Go to File"), needsEditor: false }] }); diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts index c2dea90e8583e9217c7df3a6bed608d3c72b598e..e97e38f090b681f6de11a693c3fc7bdd1873d214 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts @@ -16,7 +16,7 @@ import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { Registry } from 'vs/platform/registry/common/platform'; import * as panel from 'vs/workbench/browser/panel'; -import { getQuickNavigateHandler } from 'vs/workbench/browser/parts/quickopen/quickopen'; +import { getQuickNavigateHandler } from 'vs/workbench/browser/quickopen'; import { Extensions as ActionExtensions, IWorkbenchActionRegistry } from 'vs/workbench/common/actions'; import { Extensions as ViewContainerExtensions, IViewContainersRegistry, ViewContainerLocation, IViewsRegistry } from 'vs/workbench/common/views'; import { ClearSelectionTerminalAction, ClearTerminalAction, CopyTerminalSelectionAction, CreateNewInActiveWorkspaceTerminalAction, CreateNewTerminalAction, DeleteToLineStartTerminalAction, DeleteWordLeftTerminalAction, DeleteWordRightTerminalAction, FindNext, FindPrevious, FocusActiveTerminalAction, FocusNextPaneTerminalAction, FocusNextTerminalAction, FocusPreviousPaneTerminalAction, FocusPreviousTerminalAction, FocusTerminalFindWidgetAction, HideTerminalFindWidgetAction, KillTerminalAction, MoveToLineEndTerminalAction, MoveToLineStartTerminalAction, QuickOpenTermAction, RenameTerminalAction, ResizePaneDownTerminalAction, ResizePaneLeftTerminalAction, ResizePaneRightTerminalAction, ResizePaneUpTerminalAction, RunActiveFileInTerminalAction, RunSelectedTextInTerminalAction, ScrollDownPageTerminalAction, ScrollDownTerminalAction, ScrollToBottomTerminalAction, ScrollToNextCommandAction, ScrollToPreviousCommandAction, ScrollToTopTerminalAction, ScrollUpPageTerminalAction, ScrollUpTerminalAction, SelectAllTerminalAction, SelectDefaultShellWindowsTerminalAction, SelectToNextCommandAction, SelectToNextLineAction, SelectToPreviousCommandAction, SelectToPreviousLineAction, SplitInActiveWorkspaceTerminalAction, SplitTerminalAction, TerminalPasteAction, ToggleCaseSensitiveCommand, ToggleEscapeSequenceLoggingAction, ToggleRegexCommand, ToggleTerminalAction, ToggleWholeWordCommand, NavigationModeFocusPreviousTerminalAction, NavigationModeFocusNextTerminalAction, NavigationModeExitTerminalAction, ManageWorkspaceShellPermissionsTerminalCommand, CreateNewWithCwdTerminalAction, RenameWithArgTerminalAction, SendSequenceTerminalAction } from 'vs/workbench/contrib/terminal/browser/terminalActions'; diff --git a/src/vs/workbench/contrib/watermark/browser/watermark.ts b/src/vs/workbench/contrib/watermark/browser/watermark.ts index 391994b1911fbde11489c49ef2527beca04eff4f..52a5213f6f8ef296247995a6bb1ccccd95c20d5a 100644 --- a/src/vs/workbench/contrib/watermark/browser/watermark.ts +++ b/src/vs/workbench/contrib/watermark/browser/watermark.ts @@ -21,7 +21,6 @@ import { ShowAllCommandsAction } from 'vs/workbench/contrib/quickaccess/browser/ import { Parts, IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService'; import { StartAction } from 'vs/workbench/contrib/debug/browser/debugActions'; import { FindInFilesActionId } from 'vs/workbench/contrib/search/common/constants'; -import { QUICKOPEN_ACTION_ID } from 'vs/workbench/browser/parts/quickopen/quickopen'; import * as dom from 'vs/base/browser/dom'; import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel'; import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; @@ -39,7 +38,7 @@ interface WatermarkEntry { } const showCommands: WatermarkEntry = { text: nls.localize('watermark.showCommands', "Show All Commands"), id: ShowAllCommandsAction.ID }; -const quickOpen: WatermarkEntry = { text: nls.localize('watermark.quickOpen', "Go to File"), id: QUICKOPEN_ACTION_ID }; +const quickOpen: WatermarkEntry = { text: nls.localize('watermark.quickOpen', "Go to File"), id: 'workbench.action.quickOpen' }; const openFileNonMacOnly: WatermarkEntry = { text: nls.localize('watermark.openFile', "Open File"), id: OpenFileAction.ID, mac: false }; const openFolderNonMacOnly: WatermarkEntry = { text: nls.localize('watermark.openFolder', "Open Folder"), id: OpenFolderAction.ID, mac: false }; const openFileOrFolderMacOnly: WatermarkEntry = { text: nls.localize('watermark.openFileFolder', "Open File or Folder"), id: OpenFileFolderAction.ID, mac: true }; diff --git a/src/vs/workbench/services/quickinput/browser/quickInputService.ts b/src/vs/workbench/services/quickinput/browser/quickInputService.ts index 8ab0278caba63433cf142de0b9c0e1defa3a096d..8483439d895b619f1da5f41f6f57bc93310de0e8 100644 --- a/src/vs/workbench/services/quickinput/browser/quickInputService.ts +++ b/src/vs/workbench/services/quickinput/browser/quickInputService.ts @@ -15,7 +15,7 @@ import { QuickInputController } from 'vs/base/parts/quickinput/browser/quickInpu import { QuickInputService as BaseQuickInputService } from 'vs/platform/quickinput/browser/quickInput'; import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput'; -import { InQuickOpenContextKey } from 'vs/workbench/browser/parts/quickopen/quickopen'; +import { InQuickOpenContextKey } from 'vs/workbench/browser/quickopen'; export class QuickInputService extends BaseQuickInputService {