From 76dfc8d544358a12e3e95e35690bf390245ee55c Mon Sep 17 00:00:00 2001 From: Jackson Kearl Date: Thu, 12 Dec 2019 18:01:47 -0800 Subject: [PATCH] Clean up search editor rerun actions --- extensions/search-result/package.json | 10 ++++++++++ .../contrib/search/browser/search.contribution.ts | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/extensions/search-result/package.json b/extensions/search-result/package.json index 7442c05b8ee..40d59e2bcd7 100644 --- a/extensions/search-result/package.json +++ b/extensions/search-result/package.json @@ -46,6 +46,16 @@ } ], "menus": { + "commandPalette": [ + { + "command": "searchResult.rerunSearch", + "when": "false" + }, + { + "command": "searchResult.rerunSearchWithContext", + "when": "false" + } + ], "editor/title": [ { "command": "searchResult.rerunSearch", diff --git a/src/vs/workbench/contrib/search/browser/search.contribution.ts b/src/vs/workbench/contrib/search/browser/search.contribution.ts index 2bb92366d6a..9aef1001127 100644 --- a/src/vs/workbench/contrib/search/browser/search.contribution.ts +++ b/src/vs/workbench/contrib/search/browser/search.contribution.ts @@ -646,16 +646,17 @@ registry.registerWorkbenchAction( 'Search: Open Results in Editor', category, ContextKeyExpr.and(Constants.EnableSearchEditorPreview)); +const searchEditorCategory = nls.localize({ comment: ['The name of the tabbed search view'], key: 'searcheditor' }, "Search Editor"); registry.registerWorkbenchAction( SyncActionDescriptor.create(RerunEditorSearchAction, RerunEditorSearchAction.ID, RerunEditorSearchAction.LABEL, { primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.KEY_R }, ContextKeyExpr.and(EditorContextKeys.languageId.isEqualTo('search-result'))), - 'Search Editor: Search Again', category, + 'Search Editor: Search Again', searchEditorCategory, ContextKeyExpr.and(EditorContextKeys.languageId.isEqualTo('search-result'))); registry.registerWorkbenchAction( SyncActionDescriptor.create(RerunEditorSearchWithContextAction, RerunEditorSearchWithContextAction.ID, RerunEditorSearchWithContextAction.LABEL), - 'Search Editor: Search Again (With Context)', category, + 'Search Editor: Search Again (With Context)', searchEditorCategory, ContextKeyExpr.and(EditorContextKeys.languageId.isEqualTo('search-result')));