ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-04-01 01:20:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 777931080477e28b7c27e8f7d4b0d69897945946 (#9220)

Browse Source
This commit is contained in:
Anthony Dresser
2020-02-19 22:27:53 -08:00
committed by GitHub
parent ab6fb810f8
commit 0cec223301
115 changed files with 1431 additions and 1133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,22 +191,6 @@ export class ProgressService extends Disposable implements IProgressService {
}
};
const createWindowProgress = () => {
this.withWindowProgress<R>({
location: ProgressLocation.Window,
title: options.title
}, progress => {
if (progressStateModel.step) {
progress.report(progressStateModel.step);
}
const disposable = progressStateModel.onDidReport(step => progress.report(step));
Event.once(progressStateModel.onDispose)(() => disposable.dispose());
return progressStateModel.promise;
});
};
const createNotification = (message: string, increment?: number): INotificationHandle => {
const notificationDisposables = new DisposableStore();
@@ -254,18 +238,8 @@ export class ProgressService extends Disposable implements IProgressService {
updateProgress(handle, increment);
Event.once(handle.onDidClose)(() => {
// Switch to window based progress once the notification
// is being closed even though still running and not
// cancelled.
if (!progressStateModel.done) {
createWindowProgress();
}
// Clear disposables
notificationDisposables.dispose();
});
// Clear upon dispose
Event.once(handle.onDidClose)(() => notificationDisposables.dispose());
return handle;
};