From 2fdd6c1021fcfa67685f721edafe83a25ec044f0 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Mon, 15 Oct 2018 22:50:20 -0700 Subject: [PATCH] Refactor search - add config to run search in EH --- src/vs/workbench/api/node/extHostSearch.ts | 2 +- .../search/electron-browser/search.contribution.ts | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/api/node/extHostSearch.ts b/src/vs/workbench/api/node/extHostSearch.ts index 30f2b629e72..200f05ffa49 100644 --- a/src/vs/workbench/api/node/extHostSearch.ts +++ b/src/vs/workbench/api/node/extHostSearch.ts @@ -193,7 +193,7 @@ export class ExtHostSearch implements ExtHostSearchShape { } function registerEHProviders(extHostSearch: ExtHostSearch, logService: ILogService, configService: ExtHostConfiguration) { - if (configService.getConfiguration('searchRipgrep').enable) { + if (configService.getConfiguration('searchRipgrep').enable || configService.getConfiguration('search').runInExtensionHost) { const outputChannel = new OutputChannel(logService); extHostSearch.registerTextSearchProvider('file', new RipgrepSearchProvider(outputChannel)); diff --git a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts index 25018f00ecb..62af8ecc289 100644 --- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts +++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts @@ -653,6 +653,17 @@ configurationRegistry.registerConfiguration({ type: 'boolean', default: false, description: nls.localize('search.showLineNumbers', "Controls whether to show line numbers for search results."), + }, + 'searchRipgrep.enable': { + type: 'boolean', + default: false, + deprecationMessage: nls.localize('search.searchRipgrepEnableDeprecated', "Deprecated. Use \"search.runInExtensionHost\" instead"), + description: nls.localize('search.searchRipgrepEnable', "Whether to run search in the extension host") + }, + 'search.runInExtensionHost': { + type: 'boolean', + default: false, + description: nls.localize('search.searchRipgrepEnable', "Whether to run search in the extension host") } } });