ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-30 16:50:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2 (#8911)

Browse Source 
* Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2

* update distro

* fix layering

* update distro

* fix tests
This commit is contained in:
Anthony Dresser
2020-01-22 13:42:37 -08:00
committed by GitHub
parent 977111eb21
commit bd7aac8ee0
895 changed files with 24651 additions and 14520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,10 +146,7 @@ export class ProgressService extends Disposable implements IProgressService {
private withNotificationProgress<P extends Promise<R>, R = unknown>(options: IProgressNotificationOptions, callback: (progress: IProgress<{ message?: string, increment?: number }>) => P, onDidCancel?: (choice?: number) => void): P {
const toDispose = new DisposableStore();
const createNotification = (message: string | undefined, increment?: number): INotificationHandle | undefined => {
if (!message) {
return undefined; // we need a message at least
}
const createNotification = (message: string, increment?: number): INotificationHandle => {
const primaryActions = options.primaryActions ? Array.from(options.primaryActions) : [];
const secondaryActions = options.secondaryActions ? Array.from(options.secondaryActions) : [];
@@ -222,21 +219,34 @@ export class ProgressService extends Disposable implements IProgressService {
};
let handle: INotificationHandle | undefined;
let handleSoon: any | undefined;
let titleAndMessage: string | undefined; // hoisted to make sure a delayed notification shows the most recent message
const updateNotification = (message?: string, increment?: number): void => {
if (!handle) {
handle = createNotification(message, increment);
// full message (inital or update)
if (message && options.title) {
titleAndMessage = `${options.title}: ${message}`; // always prefix with overall title if we have it (https://github.com/Microsoft/vscode/issues/50932)
} else {
if (typeof message === 'string') {
let newMessage: string;
if (typeof options.title === 'string') {
newMessage = `${options.title}: ${message}`; // always prefix with overall title if we have it (https://github.com/Microsoft/vscode/issues/50932)
} else {
newMessage = message;
titleAndMessage = options.title || message;
}
if (!handle && titleAndMessage) {
// create notification now or after a delay
if (typeof options.delay === 'number' && options.delay > 0) {
if (typeof handleSoon !== 'number') {
handleSoon = setTimeout(() => handle = createNotification(titleAndMessage!, increment), options.delay);
}
handle.updateMessage(newMessage);
} else {
handle = createNotification(titleAndMessage, increment);
}
}
if (handle) {
if (titleAndMessage) {
handle.updateMessage(titleAndMessage);
}
if (typeof increment === 'number') {
updateProgress(handle, increment);
}
@@ -244,7 +254,7 @@ export class ProgressService extends Disposable implements IProgressService {
};
// Show initially
updateNotification(options.title);
updateNotification();
// Update based on progress
const promise = callback({
@@ -255,6 +265,7 @@ export class ProgressService extends Disposable implements IProgressService {
// Show progress for at least 800ms and then hide once done or canceled
Promise.all([timeout(800), promise]).finally(() => {
clearTimeout(handleSoon);
if (handle) {
handle.close();
}