Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-03 23:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

#42741 Separate local search from remote search

Browse Source
This commit is contained in:
Sandeep Somavarapu
2018-02-01 22:07:38 +01:00
parent b722b506f8
commit f2390e6b8a
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
View File

@@ -113,6 +113,7 @@ export class PreferencesEditor extends BaseEditor {
private preferencesRenderers: PreferencesRenderersController;
private delayedFilterLogging: Delayer<void>;
private localSearchDelayer: Delayer<void>;
private remoteSearchThrottle: ThrottledDelayer<void>;
private _lastReportedFilter: string;
@@ -131,6 +132,7 @@ export class PreferencesEditor extends BaseEditor {
this.defaultSettingsEditorContextKey = CONTEXT_SETTINGS_EDITOR.bindTo(this.contextKeyService);
this.focusSettingsContextKey = CONTEXT_SETTINGS_SEARCH_FOCUS.bindTo(this.contextKeyService);
this.delayedFilterLogging = new Delayer<void>(1000);
this.localSearchDelayer = new Delayer(100);
this.remoteSearchThrottle = new ThrottledDelayer(200);
}
@@ -247,7 +249,7 @@ export class PreferencesEditor extends BaseEditor {
private onInputChanged(): void {
const query = this.searchWidget.getValue().trim();
this.delayedFilterLogging.cancel();
this.triggerThrottledSearch(query)
this.triggerSearch(query)
.then(() => {
const result = this.preferencesRenderers.lastFilterResult;
if (result) {
@@ -259,15 +261,17 @@ export class PreferencesEditor extends BaseEditor {
});
}
private triggerThrottledSearch(query: string): TPromise<void> {
private triggerSearch(query: string): TPromise<void> {
if (query) {
return this.remoteSearchThrottle.trigger(() => {
this.preferencesRenderers.localFilterPreferences(query);
return this.progressService.showWhile(this.preferencesRenderers.remoteSearchPreferences(query), 500);
});
return TPromise.join([
this.localSearchDelayer.trigger(() => this.preferencesRenderers.localFilterPreferences(query)),
this.remoteSearchThrottle.trigger(() => this.progressService.showWhile(this.preferencesRenderers.remoteSearchPreferences(query), 500))
]) as TPromise;
} else {
this.preferencesRenderers.localFilterPreferences(query);
// When clearing the input, update immediately to clear it
this.localSearchDelayer.cancel();
this.preferencesRenderers.localFilterPreferences(query);
this.remoteSearchThrottle.cancel();
return this.preferencesRenderers.remoteSearchPreferences(query);
}