Refactor search - add config to run search in EH

roblourens · roblourens · commit 2fdd6c1021fc · 2018-10-15T22:50:20.000-07:00
diff --git 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
@@ -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")
 		}
 	}
 });

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ export class ExtHostSearch implements ExtHostSearchShape {`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`function registerEHProviders(extHostSearch: ExtHostSearch, logService: ILogService, configService: ExtHostConfiguration) {`
`196`		`- if (configService.getConfiguration('searchRipgrep').enable) {`
	`196`	`+ if (configService.getConfiguration('searchRipgrep').enable \|\| configService.getConfiguration('search').runInExtensionHost) {`
`197`	`197`	`const outputChannel = new OutputChannel(logService);`
`198`	`198`	`extHostSearch.registerTextSearchProvider('file', new RipgrepSearchProvider(outputChannel));`
`199`	`199`