mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-12 19:18:32 -05:00
Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c (#8525)
* Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c * remove files we don't want * fix hygiene * update distro * update distro * fix hygiene * fix strict nulls * distro * distro * fix tests * fix tests * add another edit * fix viewlet icon * fix azure dialog * fix some padding * fix more padding issues
This commit is contained in:
@@ -45,7 +45,7 @@ export class ProgressService extends Disposable implements IProgressService {
|
||||
super();
|
||||
}
|
||||
|
||||
withProgress<R = unknown>(options: IProgressOptions, task: (progress: IProgress<IProgressStep>) => Promise<R>, onDidCancel?: (choice?: number) => void): Promise<R> {
|
||||
async withProgress<R = unknown>(options: IProgressOptions, task: (progress: IProgress<IProgressStep>) => Promise<R>, onDidCancel?: (choice?: number) => void): Promise<R> {
|
||||
const { location } = options;
|
||||
if (typeof location === 'string') {
|
||||
if (this.viewletService.getProgressIndicator(location)) {
|
||||
@@ -56,7 +56,7 @@ export class ProgressService extends Disposable implements IProgressService {
|
||||
return this.withPanelProgress(location, task, { ...options, location });
|
||||
}
|
||||
|
||||
return Promise.reject(new Error(`Bad progress location: ${location}`));
|
||||
throw new Error(`Bad progress location: ${location}`);
|
||||
}
|
||||
|
||||
switch (location) {
|
||||
@@ -73,7 +73,7 @@ export class ProgressService extends Disposable implements IProgressService {
|
||||
case ProgressLocation.Dialog:
|
||||
return this.withDialogProgress(options, task, onDidCancel);
|
||||
default:
|
||||
return Promise.reject(new Error(`Bad progress location: ${location}`));
|
||||
throw new Error(`Bad progress location: ${location}`);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user