Add command to disable seeding workspace search text on focus. Ref microsoft#91901.

Jackson Kearl · Jackson Kearl · commit 7dca4f161dc2 · 2020-04-17T12:40:55.000-07:00
diff --git a/src/vs/workbench/contrib/search/browser/search.contribution.ts b/src/vs/workbench/contrib/search/browser/search.contribution.ts
@@ -789,6 +789,11 @@ configurationRegistry.registerConfiguration({
 			default: true,
 			description: nls.localize('search.searchOnType', "Search all files as you type.")
 		},
+		'search.seedOnFocus': {
+			type: 'boolean',
+			default: true,
+			description: nls.localize('search.seedOnFocus', "Update workspace seach query to the editor's selected text when focusing the search view. This happens either on click or when triggering the `workbench.views.search.focus` command.")
+		},
 		'search.searchOnTypeDebouncePeriod': {
 			type: 'number',
 			default: 300,
diff --git a/src/vs/workbench/contrib/search/browser/searchView.ts b/src/vs/workbench/contrib/search/browser/searchView.ts
@@ -859,8 +859,7 @@ export class SearchView extends ViewPane {
 
 	focus(): void {
 		super.focus();
-
-		const updatedText = this.updateTextFromSelection({ allowSearchOnType: false });
+		const updatedText = this.searchConfig.seedOnFocus ? this.updateTextFromSelection({ allowSearchOnType: false }) : false;
 		this.searchWidget.focus(undefined, undefined, updatedText);
 	}
 
diff --git a/src/vs/workbench/services/search/common/search.ts b/src/vs/workbench/services/search/common/search.ts
@@ -344,6 +344,7 @@ export interface ISearchConfigurationProperties {
 	maintainFileSearchCache: boolean;
 	collapseResults: 'auto' | 'alwaysCollapse' | 'alwaysExpand';
 	searchOnType: boolean;
+	seedOnFocus: boolean;
 	searchOnTypeDebouncePeriod: number;
 	searchEditor: {
 		doubleClickBehaviour: 'selectWord' | 'goToLocation' | 'openLocationToSide',

Original file line number	Diff line number	Diff line change
`@@ -859,8 +859,7 @@ export class SearchView extends ViewPane {`
`859`	`859`
`860`	`860`	`focus(): void {`
`861`	`861`	`super.focus();`
`862`		`-`
`863`		`- const updatedText = this.updateTextFromSelection({ allowSearchOnType: false });`
	`862`	`+ const updatedText = this.searchConfig.seedOnFocus ? this.updateTextFromSelection({ allowSearchOnType: false }) : false;`
`864`	`863`	`this.searchWidget.focus(undefined, undefined, updatedText);`
`865`	`864`	`}`
`866`	`865`