From ecbf70e253d42a3fcb1069011ab3663153a067ea Mon Sep 17 00:00:00 2001 From: roblou Date: Tue, 3 Jan 2017 17:29:23 -0800 Subject: [PATCH] Move id/label --- .../parts/search/browser/search.contribution.ts | 4 ++-- src/vs/workbench/parts/search/browser/searchActions.ts | 10 ++++++++-- src/vs/workbench/parts/search/browser/searchViewlet.ts | 1 - src/vs/workbench/parts/search/common/constants.ts | 2 -- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/vs/workbench/parts/search/browser/search.contribution.ts b/src/vs/workbench/parts/search/browser/search.contribution.ts index 24e2a7b4c05..08e9598402a 100644 --- a/src/vs/workbench/parts/search/browser/search.contribution.ts +++ b/src/vs/workbench/parts/search/browser/search.contribution.ts @@ -126,8 +126,8 @@ registry.registerWorkbenchAction(new SyncActionDescriptor(searchActions.FocusAct registry.registerWorkbenchAction(new SyncActionDescriptor(searchActions.FindInFilesAction, Constants.FindInFilesActionId, nls.localize('findInFiles', "Find in Files"), { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_F }, Constants.SearchInputBoxFocussedKey.toNegated()), 'Find in Files'); -registry.registerWorkbenchAction(new SyncActionDescriptor(searchActions.FocusNextSearchResultAction, Constants.FocusNextSearchResultActionId, 'Focus next result', { primary: KeyCode.F4 }), 'Focus next result'); -registry.registerWorkbenchAction(new SyncActionDescriptor(searchActions.FocusPreviousSearchResultAction, Constants.FocusPreviousSearchResultActionId, 'Focus previous result', { primary: KeyMod.Shift | KeyCode.F4 }), 'Focus next result'); +registry.registerWorkbenchAction(new SyncActionDescriptor(searchActions.FocusNextSearchResultAction, searchActions.FocusNextSearchResultAction.ID, searchActions.FocusNextSearchResultAction.LABEL, { primary: KeyCode.F4 }), ''); +registry.registerWorkbenchAction(new SyncActionDescriptor(searchActions.FocusPreviousSearchResultAction, searchActions.FocusPreviousSearchResultAction.ID, searchActions.FocusPreviousSearchResultAction.LABEL, { primary: KeyMod.Shift | KeyCode.F4 }), ''); registry.registerWorkbenchAction(new SyncActionDescriptor(searchActions.ReplaceInFilesAction, searchActions.ReplaceInFilesAction.ID, searchActions.ReplaceInFilesAction.LABEL, { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_H }), 'Replace in Files'); registry.registerWorkbenchAction(new SyncActionDescriptor(searchActions.CloseReplaceAction, Constants.CloseReplaceWidgetActionId, '', { primary: KeyCode.Escape }, ContextKeyExpr.and(Constants.SearchViewletVisibleKey, Constants.ReplaceInputBoxFocussedKey)), ''); diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts index 26c1bc05d25..c514ad5bab9 100644 --- a/src/vs/workbench/parts/search/browser/searchActions.ts +++ b/src/vs/workbench/parts/search/browser/searchActions.ts @@ -267,8 +267,11 @@ export class ClearSearchResultsAction extends Action { } export class FocusNextSearchResultAction extends Action { + public static ID = 'search.action.focusNextSearchResult'; + public static LABEL = nls.localize('FocusNextSearchResult.label', "Focus next search result"); + constructor(id: string, label: string, @IViewletService private viewletService: IViewletService) { - super('focusNextSearchResult', nls.localize('FocusNextSearchResult.label', "Focus next search result")); + super(id, label); } public run(): TPromise { @@ -279,8 +282,11 @@ export class FocusNextSearchResultAction extends Action { } export class FocusPreviousSearchResultAction extends Action { + public static ID = 'search.action.focusPreviousSearchResult'; + public static LABEL = nls.localize('FocusPreviousSearchResult.label', "Focus previous search result"); + constructor(id: string, label: string, @IViewletService private viewletService: IViewletService) { - super('focusPreviousSearchResult', nls.localize('FocusPreviousSearchResult.label', "Focus previous search result")); + super(id, label); } public run(): TPromise { diff --git a/src/vs/workbench/parts/search/browser/searchViewlet.ts b/src/vs/workbench/parts/search/browser/searchViewlet.ts index fe752040bfe..b0580881909 100644 --- a/src/vs/workbench/parts/search/browser/searchViewlet.ts +++ b/src/vs/workbench/parts/search/browser/searchViewlet.ts @@ -476,7 +476,6 @@ export class SearchViewlet extends Viewlet { public selectPreviousResult(): void { const eventPayload = { focusEditor: true }; - // previous with no current selection? this.tree.selectPrevious(undefined, undefined, eventPayload); let [selected]: FileMatchOrMatch[] = this.tree.getSelection(); if (!selected) { diff --git a/src/vs/workbench/parts/search/common/constants.ts b/src/vs/workbench/parts/search/common/constants.ts index 090bea80e1c..42daf7da501 100644 --- a/src/vs/workbench/parts/search/common/constants.ts +++ b/src/vs/workbench/parts/search/common/constants.ts @@ -9,8 +9,6 @@ export const VIEWLET_ID = 'workbench.view.search'; export const FindInFilesActionId = 'workbench.action.findInFiles'; export const FocusActiveEditorActionId = 'search.action.focusActiveEditor'; -export const FocusNextSearchResultActionId = 'search.action.focusNextSearchResult'; -export const FocusPreviousSearchResultActionId = 'search.action.focusPreviousSearchResult'; export const ToggleCaseSensitiveActionId = 'toggleSearchCaseSensitive'; export const ToggleWholeWordActionId = 'toggleSearchWholeWord';