microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-14 08:28:31 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

Fix #50632

Browse Source
This commit is contained in:
Rob Lourens
2018-05-29 20:35:06 -07:00
parent 5fad13aa4d
commit 0332c701c2
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
View File

@@ -56,6 +56,7 @@ export class SettingsEditor2 extends BaseEditor {
private delayedFilterLogging: Delayer<void>;
private localSearchDelayer: Delayer<void>;
private remoteSearchThrottle: ThrottledDelayer<void>;
private searchInProgress: TPromise<void>;
private pendingSettingModifiedReport: { key: string, value: any };
@@ -424,14 +425,18 @@ export class SettingsEditor2 extends BaseEditor {
private triggerSearch(query: string): TPromise<void> {
if (query) {
return TPromise.join([
return this.searchInProgress = TPromise.join([
this.localSearchDelayer.trigger(() => this.localFilterPreferences(query)),
this.remoteSearchThrottle.trigger(() => this.remoteSearchPreferences(query), 500)
]) as TPromise;
]).then(() => {
this.searchInProgress = null;
});
} else {
// When clearing the input, update immediately to clear it
this.localSearchDelayer.cancel();
this.remoteSearchThrottle.cancel();
if (this.searchInProgress && this.searchInProgress.cancel) {
this.searchInProgress.cancel();
}
this.searchResultModel = null;
this.settingsTree.setInput(this.defaultSettingsEditorModel);
@@ -495,15 +500,25 @@ export class SettingsEditor2 extends BaseEditor {
private filterOrSearchPreferences(query: string, type: SearchResultIdx, searchProvider: ISearchProvider): TPromise<void> {
const filterPs: TPromise<ISearchResult>[] = [this._filterOrSearchPreferencesModel(query, this.defaultSettingsEditorModel, searchProvider)];
return TPromise.join(filterPs).then(results => {
const [result] = results;
if (!this.searchResultModel) {
this.searchResultModel = new SearchResultModel();
this.settingsTree.setInput(this.searchResultModel);
}
let isCanceled = false;
return new TPromise(resolve => {
return TPromise.join(filterPs).then(results => {
if (isCanceled) {
// Handle cancellation like this because cancellation is lost inside the search provider due to async/await
return null;
}
this.searchResultModel.setResult(type, result);
return this.refreshTreeAndMaintainFocus();
const [result] = results;
if (!this.searchResultModel) {
this.searchResultModel = new SearchResultModel();
this.settingsTree.setInput(this.searchResultModel);
}
this.searchResultModel.setResult(type, result);
resolve(this.refreshTreeAndMaintainFocus());
});
}, () => {
isCanceled = true;
});
}