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

Initial VS Code 1.19 source merge (#571)

Browse Source 
* Initial 1.19 xcopy

* Fix yarn build

* Fix numerous build breaks

* Next batch of build break fixes

* More build break fixes

* Runtime breaks

* Additional post merge fixes

* Fix windows setup file

* Fix test failures.

* Update license header blocks to refer to source eula
This commit is contained in:
Karl Burtram
2018-01-28 23:37:17 -08:00
committed by GitHub
parent 9a1ac20710
commit 251ae01c3e
8009 changed files with 93378 additions and 35634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,8 @@ interface ProgressState {
worked?: number;
done?: boolean;
whilePromise?: TPromise<any>;
whileStart?: number;
whileDelay?: number;
}
export abstract class ScopedService {
@@ -87,7 +89,15 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
// Replay Infinite Progress from Promise
if (this.progressState.whilePromise) {
this.doShowWhile();
let delay: number;
if (this.progressState.whileDelay > 0) {
const remainingDelay = this.progressState.whileDelay - (Date.now() - this.progressState.whileStart);
if (remainingDelay > 0) {
delay = remainingDelay;
}
}
this.doShowWhile(delay);
}
// Replay Infinite Progress
@@ -113,6 +123,8 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
this.progressState.worked = void 0;
this.progressState.total = void 0;
this.progressState.whilePromise = void 0;
this.progressState.whileStart = void 0;
this.progressState.whileDelay = void 0;
}
public show(infinite: boolean, delay?: number): IProgressRunner;
@@ -218,6 +230,8 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
// Keep Promise in State
this.progressState.whilePromise = promise;
this.progressState.whileDelay = delay || 0;
this.progressState.whileStart = Date.now();
let stop = () => {