debt: polish settings search provider code (#249651)

Author: rzhao271

src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts

@@ -351,41 +351,41 @@ export class SettingMatches {
 }
 
 class SettingsRecordProvider {
-	private settingsRecord: IStringDictionary<ISetting> = {};
-	private currentPreferencesModel: ISettingsEditorModel | undefined;
+	private _settingsRecord: IStringDictionary<ISetting> = {};
+	private _currentPreferencesModel: ISettingsEditorModel | undefined;
 
 	constructor() { }
 
 	updateModel(preferencesModel: ISettingsEditorModel) {
-		if (preferencesModel === this.currentPreferencesModel) {
+		if (preferencesModel === this._currentPreferencesModel) {
 			return;
 		}
 
-		this.currentPreferencesModel = preferencesModel;
+		this._currentPreferencesModel = preferencesModel;
 		this.refresh();
 	}
 
 	private refresh() {
-		this.settingsRecord = {};
+		this._settingsRecord = {};
 
-		if (!this.currentPreferencesModel) {
+		if (!this._currentPreferencesModel) {
 			return;
 		}
 
-		for (const group of this.currentPreferencesModel.settingsGroups) {
+		for (const group of this._currentPreferencesModel.settingsGroups) {
 			if (group.id === 'mostCommonlyUsed') {
 				continue;
 			}
 			for (const section of group.sections) {
 				for (const setting of section.settings) {
-					this.settingsRecord[setting.key] = setting;
+					this._settingsRecord[setting.key] = setting;
 				}
 			}
 		}
 	}
 
 	getSettingsRecord(): IStringDictionary<ISetting> {
-		return this.settingsRecord;
+		return this._settingsRecord;
 	}
 }
 
@@ -395,7 +395,10 @@ class EmbeddingsSearchProvider implements IRemoteSearchProvider {
 	private readonly _recordProvider: SettingsRecordProvider;
 	private _filter: string = '';
 
-	constructor(private readonly aiSettingsSearchService: IAiSettingsSearchService) {
+	constructor(
+		private readonly _aiSettingsSearchService: IAiSettingsSearchService,
+		private readonly _excludeSelectionStep: boolean
+	) {
 		this._recordProvider = new SettingsRecordProvider();
 	}
 
@@ -404,15 +407,12 @@ class EmbeddingsSearchProvider implements IRemoteSearchProvider {
 	}
 
 	async searchModel(preferencesModel: ISettingsEditorModel, token: CancellationToken): Promise<ISearchResult | null> {
-		if (
-			!this._filter ||
-			!this.aiSettingsSearchService.isEnabled()
-		) {
+		if (!this._filter || !this._aiSettingsSearchService.isEnabled()) {
 			return null;
 		}
 
 		this._recordProvider.updateModel(preferencesModel);
-		this.aiSettingsSearchService.startSearch(this._filter, false, token);
+		this._aiSettingsSearchService.startSearch(this._filter, this._excludeSelectionStep, token);
 
 		return {
 			filterMatches: await this.getEmbeddingsItems(token),
@@ -424,7 +424,7 @@ class EmbeddingsSearchProvider implements IRemoteSearchProvider {
 	private async getEmbeddingsItems(token: CancellationToken): Promise<ISettingMatch[]> {
 		const settingsRecord = this._recordProvider.getSettingsRecord();
 		const filterMatches: ISettingMatch[] = [];
-		const settings = await this.aiSettingsSearchService.getEmbeddingsResults(this._filter, token);
+		const settings = await this._aiSettingsSearchService.getEmbeddingsResults(this._filter, token);
 		if (!settings) {
 			return [];
 		}
@@ -545,38 +545,38 @@ class TfIdfSearchProvider implements IRemoteSearchProvider {
 }
 
 class RemoteSearchProvider implements IRemoteSearchProvider {
-	private aiSettingsSearchProvider: EmbeddingsSearchProvider;
-	private tfIdfSearchProvider: TfIdfSearchProvider;
-	private filter: string = '';
+	private _embeddingsSearchProvider: EmbeddingsSearchProvider;
+	private _tfIdfSearchProvider: TfIdfSearchProvider;
+	private _filter: string = '';
 
 	constructor(
 		@IAiSettingsSearchService private readonly aiSettingsSearchService: IAiSettingsSearchService
 	) {
-		this.aiSettingsSearchProvider = new EmbeddingsSearchProvider(this.aiSettingsSearchService);
-		this.tfIdfSearchProvider = new TfIdfSearchProvider();
+		this._embeddingsSearchProvider = new EmbeddingsSearchProvider(this.aiSettingsSearchService, true);
+		this._tfIdfSearchProvider = new TfIdfSearchProvider();
 	}
 
 	setFilter(filter: string): void {
-		this.filter = filter;
-		this.tfIdfSearchProvider.setFilter(filter);
-		this.aiSettingsSearchProvider.setFilter(filter);
+		this._filter = filter;
+		this._tfIdfSearchProvider.setFilter(filter);
+		this._embeddingsSearchProvider.setFilter(filter);
 	}
 
 	async searchModel(preferencesModel: ISettingsEditorModel, token: CancellationToken): Promise<ISearchResult | null> {
-		if (!this.filter) {
+		if (!this._filter) {
 			return null;
 		}
 
 		if (!this.aiSettingsSearchService.isEnabled()) {
-			return this.tfIdfSearchProvider.searchModel(preferencesModel, token);
+			return this._tfIdfSearchProvider.searchModel(preferencesModel, token);
 		}
 
-		let results = await this.aiSettingsSearchProvider.searchModel(preferencesModel, token);
+		let results = await this._embeddingsSearchProvider.searchModel(preferencesModel, token);
 		if (results?.filterMatches.length) {
 			return results;
 		}
 		if (!token.isCancellationRequested) {
-			results = await this.tfIdfSearchProvider.searchModel(preferencesModel, token);
+			results = await this._tfIdfSearchProvider.searchModel(preferencesModel, token);
 			if (results?.filterMatches.length) {
 				return results;
 			}