Use search.seedWithNearestWord setting instead of emptyness of search input to control nearest word seeding.

Jackson Kearl · Jackson Kearl · commit 7e2e87a81305 · 2020-04-17T16:17:07.000-07:00
Ref microsoft#91901.
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.seedWithNearestWord': {
+			type: 'boolean',
+			default: false,
+			description: nls.localize('search.seedWithNearestWord', "Enable seeding search from the word nearest the cursor when the active editor has no selection.")
+		},
 		'search.seedOnFocus': {
 			type: 'boolean',
 			default: false,
diff --git a/src/vs/workbench/contrib/search/browser/searchView.ts b/src/vs/workbench/contrib/search/browser/searchView.ts
@@ -1070,7 +1070,7 @@ export class SearchView extends ViewPane {
 			return null;
 		}
 
-		if (range.isEmpty() && !this.searchWidget.searchInput.getValue() && allowUnselectedWord) {
+		if (range.isEmpty() && this.searchConfig.seedWithNearestWord && allowUnselectedWord) {
 			const wordAtPosition = activeTextEditorControl.getModel().getWordAtPosition(range.getStartPosition());
 			if (wordAtPosition) {
 				return wordAtPosition.word;
diff --git a/src/vs/workbench/services/search/common/search.ts b/src/vs/workbench/services/search/common/search.ts
@@ -345,6 +345,7 @@ export interface ISearchConfigurationProperties {
 	collapseResults: 'auto' | 'alwaysCollapse' | 'alwaysExpand';
 	searchOnType: boolean;
 	seedOnFocus: boolean;
+	seedWithNearestWord: boolean;
 	searchOnTypeDebouncePeriod: number;
 	searchEditor: {
 		doubleClickBehaviour: 'selectWord' | 'goToLocation' | 'openLocationToSide',

Original file line number	Diff line number	Diff line change
`@@ -1070,7 +1070,7 @@ export class SearchView extends ViewPane {`
`1070`	`1070`	`return null;`
`1071`	`1071`	`}`
`1072`	`1072`
`1073`		`- if (range.isEmpty() && !this.searchWidget.searchInput.getValue() && allowUnselectedWord) {`
	`1073`	`+ if (range.isEmpty() && this.searchConfig.seedWithNearestWord && allowUnselectedWord) {`
`1074`	`1074`	`const wordAtPosition = activeTextEditorControl.getModel().getWordAtPosition(range.getStartPosition());`
`1075`	`1075`	`if (wordAtPosition) {`
`1076`	`1076`	`return wordAtPosition.word;`