Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 02:28:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

progress - don't rethrow errors on main side

Browse Source
This commit is contained in:
Johannes Rieken
2017-01-18 16:51:50 +01:00
parent 95d1342bbe
commit 3186c15c7f
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/api/node/extHost.protocol.ts
View File

@@ -187,7 +187,7 @@ export abstract class MainThreadOutputServiceShape {
export abstract class MainThreadProgressShape {
$progressStart(handle: number, extensionId: string, location: string): void { throw ni(); }
$progressReport(handle: number, message: string): void { throw ni(); }
$progressEnd(handle: number, err?: any): void { throw ni(); }
$progressEnd(handle: number): void { throw ni(); }
}
export abstract class MainThreadTerminalServiceShape {

2
src/vs/workbench/api/node/extHostProgress.ts
View File

@@ -48,7 +48,7 @@ export class ExtHostProgress {
this._proxy.$progressEnd(handle);
return result;
}, err => {
this._proxy.$progressEnd(handle, err);
this._proxy.$progressEnd(handle);
throw err;
});
}

14
src/vs/workbench/api/node/mainThreadProgress.ts
View File

@@ -11,7 +11,7 @@ import { MainThreadProgressShape } from './extHost.protocol';
export class MainThreadProgress extends MainThreadProgressShape {
private _progressService: IProgressService2;
private progress = new Map<number, { resolve: Function, reject: Function, progress: IProgress<any> }>();
private progress = new Map<number, { resolve: Function, progress: IProgress<any> }>();
constructor(
@IProgressService2 progressService: IProgressService2
@@ -24,8 +24,8 @@ export class MainThreadProgress extends MainThreadProgressShape {
$progressStart(handle: number, extensionId: string, where: string): void {
const task = (progress: IProgress<any>) => {
return new TPromise<any>((resolve, reject) => {
this.progress.set(handle, { resolve, reject, progress });
return new TPromise<any>(resolve => {
this.progress.set(handle, { resolve, progress });
});
};
@@ -44,12 +44,8 @@ export class MainThreadProgress extends MainThreadProgressShape {
this.progress.get(handle).progress.report(message);
}
$progressEnd(handle: number, err: any): void {
if (err) {
this.progress.get(handle).reject(err);
} else {
this.progress.get(handle).resolve();
}
$progressEnd(handle: number): void {
this.progress.get(handle).resolve();
this.progress.delete(handle);
}
}