ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-12 19:18:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from master

Browse Source
This commit is contained in:
Raj Musuku
2019-02-21 17:56:04 -08:00
parent 5a146e34fa
commit 666ae11639
11482 changed files with 119352 additions and 255574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vs/workbench/services/progress/browser/progressService.ts
View File

@@ -4,7 +4,6 @@
*--------------------------------------------------------------------------------------------*/
import { Disposable } from 'vs/base/common/lifecycle';
import { TPromise } from 'vs/base/common/winjs.base';
import * as types from 'vs/base/common/types';
import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
@@ -16,7 +15,7 @@ interface ProgressState {
total?: number;
worked?: number;
done?: boolean;
whilePromise?: TPromise<any>;
whilePromise?: Thenable<any>;
whileStart?: number;
whileDelay?: number;
}
@@ -31,7 +30,7 @@ export abstract class ScopedService extends Disposable {
registerListeners(): void {
this._register(this.viewletService.onDidViewletOpen(viewlet => this.onScopeOpened(viewlet.getId())));
this._register(this.panelService.onDidPanelOpen(panel => this.onScopeOpened(panel.getId())));
this._register(this.panelService.onDidPanelOpen(({ panel }) => this.onScopeOpened(panel.getId())));
this._register(this.viewletService.onDidViewletClose(viewlet => this.onScopeClosed(viewlet.getId())));
this._register(this.panelService.onDidPanelClose(panel => this.onScopeClosed(panel.getId())));
@@ -206,7 +205,7 @@ export class ScopedProgressService extends ScopedService implements IProgressSer
};
}
showWhile(promise: TPromise<any>, delay?: number): TPromise<void> {
showWhile(promise: Thenable<any>, delay?: number): Thenable<void> {
let stack: boolean = !!this.progressState.whilePromise;
// Reset State
@@ -216,7 +215,7 @@ export class ScopedProgressService extends ScopedService implements IProgressSer
// Otherwise join with existing running promise to ensure progress is accurate
else {
promise = TPromise.join([promise, this.progressState.whilePromise]);
promise = Promise.all([promise, this.progressState.whilePromise]);
}
// Keep Promise in State
@@ -287,7 +286,7 @@ export class ProgressService implements IProgressService {
};
}
showWhile(promise: TPromise<any>, delay?: number): TPromise<void> {
showWhile(promise: Thenable<any>, delay?: number): Thenable<void> {
const stop = () => {
this.progressbar.stop().hide();
};
@@ -296,4 +295,4 @@ export class ProgressService implements IProgressService {
return promise.then(stop, stop);
}
}
}