debug: respect progress update event

isidorn · isidorn · commit 620ac0aebfcc · 2020-03-19T12:31:53.000+01:00
microsoft#92253
diff --git a/src/vs/workbench/contrib/debug/browser/debugProgress.ts b/src/vs/workbench/contrib/debug/browser/debugProgress.ts
@@ -39,7 +39,19 @@ export class DebugProgressContribution implements IWorkbenchContribution {
 						title: progressStartEvent.body.title,
 						cancellable: progressStartEvent.body.cancellable,
 						silent: true
-					}, () => promise, () => session.cancel(progressStartEvent.body.progressId));
+					}, progressStep => {
+						const progressUpdateListener = session.onDidProgressUpdate(e => {
+							if (e.body.progressId === progressStartEvent.body.progressId) {
+								progressStep.report({
+									message: e.body.message,
+									increment: e.body.percentage,
+									total: e.body.percentage ? 100 : undefined
+								});
+							}
+						});
+
+						return promise.then(() => progressUpdateListener.dispose());
+					}, () => session.cancel(progressStartEvent.body.progressId));
 				});
 			}
 		};
diff --git a/src/vs/workbench/contrib/debug/browser/debugSession.ts b/src/vs/workbench/contrib/debug/browser/debugSession.ts
@@ -55,6 +55,7 @@ export class DebugSession implements IDebugSession {
 	private readonly _onDidLoadedSource = new Emitter<LoadedSourceEvent>();
 	private readonly _onDidCustomEvent = new Emitter<DebugProtocol.Event>();
 	private readonly _onDidProgressStart = new Emitter<DebugProtocol.ProgressStartEvent>();
+	private readonly _onDidProgressUpdate = new Emitter<DebugProtocol.ProgressUpdateEvent>();
 	private readonly _onDidProgressEnd = new Emitter<DebugProtocol.ProgressEndEvent>();
 
 	private readonly _onDidChangeREPLElements = new Emitter<void>();
@@ -190,6 +191,10 @@ export class DebugSession implements IDebugSession {
 		return this._onDidProgressStart.event;
 	}
 
+	get onDidProgressUpdate(): Event<DebugProtocol.ProgressUpdateEvent> {
+		return this._onDidProgressUpdate.event;
+	}
+
 	get onDidProgressEnd(): Event<DebugProtocol.ProgressEndEvent> {
 		return this._onDidProgressEnd.event;
 	}
@@ -935,6 +940,9 @@ export class DebugSession implements IDebugSession {
 		this.rawListeners.push(this.raw.onDidProgressStart(event => {
 			this._onDidProgressStart.fire(event);
 		}));
+		this.rawListeners.push(this.raw.onDidProgressUpdate(event => {
+			this._onDidProgressUpdate.fire(event);
+		}));
 		this.rawListeners.push(this.raw.onDidProgressEnd(event => {
 			this._onDidProgressEnd.fire(event);
 		}));
diff --git a/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts b/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
@@ -66,6 +66,7 @@ export class RawDebugSession implements IDisposable {
 	private readonly _onDidBreakpoint = new Emitter<DebugProtocol.BreakpointEvent>();
 	private readonly _onDidLoadedSource = new Emitter<DebugProtocol.LoadedSourceEvent>();
 	private readonly _onDidProgressStart = new Emitter<DebugProtocol.ProgressStartEvent>();
+	private readonly _onDidProgressUpdate = new Emitter<DebugProtocol.ProgressUpdateEvent>();
 	private readonly _onDidProgressEnd = new Emitter<DebugProtocol.ProgressEndEvent>();
 	private readonly _onDidCustomEvent = new Emitter<DebugProtocol.Event>();
 	private readonly _onDidEvent = new Emitter<DebugProtocol.Event>();
@@ -142,6 +143,9 @@ export class RawDebugSession implements IDisposable {
 				case 'progressStart':
 					this._onDidProgressStart.fire(event as DebugProtocol.ProgressStartEvent);
 					break;
+				case 'progressUpdate':
+					this._onDidProgressUpdate.fire(event as DebugProtocol.ProgressUpdateEvent);
+					break;
 				case 'progressEnd':
 					this._onDidProgressEnd.fire(event as DebugProtocol.ProgressEndEvent);
 					break;
@@ -217,6 +221,10 @@ export class RawDebugSession implements IDisposable {
 		return this._onDidProgressStart.event;
 	}
 
+	get onDidProgressUpdate(): Event<DebugProtocol.ProgressUpdateEvent> {
+		return this._onDidProgressUpdate.event;
+	}
+
 	get onDidProgressEnd(): Event<DebugProtocol.ProgressEndEvent> {
 		return this._onDidProgressEnd.event;
 	}
diff --git a/src/vs/workbench/contrib/debug/common/debug.ts b/src/vs/workbench/contrib/debug/common/debug.ts
@@ -200,6 +200,7 @@ export interface IDebugSession extends ITreeElement {
 	readonly onDidLoadedSource: Event<LoadedSourceEvent>;
 	readonly onDidCustomEvent: Event<DebugProtocol.Event>;
 	readonly onDidProgressStart: Event<DebugProtocol.ProgressStartEvent>;
+	readonly onDidProgressUpdate: Event<DebugProtocol.ProgressUpdateEvent>;
 	readonly onDidProgressEnd: Event<DebugProtocol.ProgressEndEvent>;
 
 	// DAP request
diff --git a/src/vs/workbench/contrib/debug/test/common/mockDebug.ts b/src/vs/workbench/contrib/debug/test/common/mockDebug.ts
@@ -230,6 +230,10 @@ export class MockSession implements IDebugSession {
 		throw new Error('not implemented');
 	}
 
+	get onDidProgressUpdate(): Event<DebugProtocol.ProgressUpdateEvent> {
+		throw new Error('not implemented');
+	}
+
 	get onDidProgressEnd(): Event<DebugProtocol.ProgressEndEvent> {
 		throw new Error('not implemented');
 	}

Original file line number	Diff line number	Diff line change
`@@ -230,6 +230,10 @@ export class MockSession implements IDebugSession {`
`230`	`230`	`throw new Error('not implemented');`
`231`	`231`	`}`
`232`	`232`
	`233`	`+ get onDidProgressUpdate(): Event<DebugProtocol.ProgressUpdateEvent> {`
	`234`	`+ throw new Error('not implemented');`
	`235`	`+ }`
	`236`	`+`
`233`	`237`	`get onDidProgressEnd(): Event<DebugProtocol.ProgressEndEvent> {`
`234`	`238`	`throw new Error('not implemented');`
`235`	`239`	`}`