Tweak filterSettings interface

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

@@ -107,7 +107,8 @@ class RemoteSearchProvider {
 			};
 
 			if (remoteResult) {
-				const result = preferencesModel.filterSettings(this._filter, group => null, settingFilter, remoteResult.scores);
+				const sortedNames = Object.keys(remoteResult.scores).sort((a, b) => remoteResult.scores[b] - remoteResult.scores[a]);
+				const result = preferencesModel.filterSettings(this._filter, group => null, settingFilter, sortedNames);
 				result.metadata = remoteResult.metadata;
 				return result;
 			} else {

src/vs/workbench/parts/preferences/common/preferences.ts

@@ -78,7 +78,7 @@ export type ISettingFilter = (setting: ISetting) => IRange[];
 export interface ISettingsEditorModel extends IPreferencesEditorModel<ISetting> {
 	settingsGroups: ISettingsGroup[];
 	groupsTerms: string[];
-	filterSettings(filter: string, groupFilter: IGroupFilter, settingFilter: ISettingFilter, scores?: { [key: string]: number }): IFilterResult;
+	filterSettings(filter: string, groupFilter: IGroupFilter, settingFilter: ISettingFilter, mostRelevantSettings?: string[]): IFilterResult;
 	findValueMatches(filter: string, setting: ISetting): IRange[];
 }
 

src/vs/workbench/parts/preferences/common/preferencesModels.ts

@@ -526,9 +526,9 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements
 		return this.settingsGroups[0];
 	}
 
-	public filterSettings(filter: string, groupFilter: IGroupFilter, settingFilter: ISettingFilter, scores?: { [key: string]: number }): IFilterResult {
-		if (scores) {
-			const group = this.getMostRelevantSettings(Object.keys(scores));
+	public filterSettings(filter: string, groupFilter: IGroupFilter, settingFilter: ISettingFilter, mostRelevantSettings?: string[]): IFilterResult {
+		if (mostRelevantSettings) {
+			const group = this.getMostRelevantSettings(mostRelevantSettings);
 			const builder = new SettingsContentBuilder(DefaultSettingsEditorModel.MOST_RELEVANT_START_LINE - 1);
 			builder.pushGroup(group);