development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-11-05 18:29:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Settings search - clear settings.json Problems when settings editor is closed

Browse source
This commit is contained in:
Rob Lourens 2018-01-26 14:01:50 -08:00
parent f6b128d8fa
commit 7c272edbda
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
View file

@ -222,6 +222,7 @@ export class PreferencesEditor extends BaseEditor {
public clearInput(): void {
this.defaultSettingsEditorContextKey.set(false);
this.sideBySidePreferencesWidget.clearInput();
this.preferencesRenderers.onHidden();
super.clearInput();
}
@ -426,6 +427,11 @@ class PreferencesRenderersController extends Disposable {
await this.remoteSearchPreferences(this._lastQuery, true);
}
onHidden(): void {
this._prefsModelsForSearch.forEach(model => model.dispose());
this._prefsModelsForSearch = new Map<string, ISettingsEditorModel>();
}
remoteSearchPreferences(query: string, updateCurrentResults?: boolean): TPromise<void> {
if (this._remoteFilterInProgress && this._remoteFilterInProgress.cancel) {
// Resolved/rejected promises have no .cancel()
@ -466,7 +472,7 @@ class PreferencesRenderersController extends Disposable {
}
filterPs.push(this._filterOrSearchPreferences(query, this.editablePreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder),
this.updateSettingsTargetCounts(query, searchProvider, groupId, groupLabel, groupOrder));
this.searchAllSettingsTargets(query, searchProvider, groupId, groupLabel, groupOrder));
return TPromise.join(filterPs).then(results => {
const [defaultFilterResult, editableFilterResult] = results;
@ -481,7 +487,12 @@ class PreferencesRenderersController extends Disposable {
});
}
private updateSettingsTargetCounts(query: string, searchProvider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number): TPromise<void> {
private searchAllSettingsTargets(query: string, searchProvider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number): TPromise<void> {
if (!query) {
// Don't open the other settings targets when query is empty
return TPromise.wrap(null);
}
const searchPs = [
this.searchSettingsTarget(searchProvider, ConfigurationTarget.WORKSPACE, groupId, groupLabel, groupOrder),
this.searchSettingsTarget(searchProvider, ConfigurationTarget.USER, groupId, groupLabel, groupOrder)