Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-26 10:16:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move id/label

Browse Source
This commit is contained in:
roblou
2017-01-03 17:29:23 -08:00
parent 68274bfd8f
commit ecbf70e253
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/parts/search/browser/search.contribution.ts
+2 -2
View File
@@ -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)), '');
src/vs/workbench/parts/search/browser/searchActions.ts
+8 -2
View File
@@ -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<any> {
@@ -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<any> {
src/vs/workbench/parts/search/browser/searchViewlet.ts
-1
View File
@@ -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) {
src/vs/workbench/parts/search/common/constants.ts
-2
View File
@@ -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';