提交 8b9d93dd 编写于 作者: R Rob Lourens

Fix #36822 - properly clean up old fuzzy results for a non-fuzzy search

上级 f49e3e5c
......@@ -672,6 +672,24 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements
public filterSettings(filter: string, groupFilter: IGroupFilter, settingFilter: ISettingFilter, mostRelevantSettings?: string[]): IFilterResult {
if (mostRelevantSettings) {
const mostRelevantGroup = this.renderMostRelevantSettings(mostRelevantSettings);
return {
allGroups: [...this.settingsGroups, mostRelevantGroup],
filteredGroups: mostRelevantGroup.sections[0].settings.length ? [mostRelevantGroup] : [],
matches: [],
query: filter
};
} else {
// Do local search and add empty 'most relevant' group
const mostRelevantGroup = this.renderMostRelevantSettings([]);
const result = this.doFilterSettings(filter, groupFilter, settingFilter);
result.allGroups = [...result.allGroups, mostRelevantGroup];
return result;
}
}
private renderMostRelevantSettings(mostRelevantSettings: string[]): ISettingsGroup {
const builder = new SettingsContentBuilder(this._mostRelevantLineOffset - 1);
builder.pushLine(',');
const mostRelevantGroup = this.getMostRelevantSettings(mostRelevantSettings);
......@@ -690,16 +708,7 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements
}
]);
return {
allGroups: [...this.settingsGroups, mostRelevantGroup],
filteredGroups: mostRelevantGroup.sections[0].settings.length ? [mostRelevantGroup] : [],
matches: [],
query: filter
};
} else {
// local
return this.doFilterSettings(filter, groupFilter, settingFilter);
}
return mostRelevantGroup;
}
public findValueMatches(filter: string, setting: ISetting): IRange[] {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册