maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

debug: do not cancel 'disconnect' promise on end of session

Browse source 
fixes #9550
This commit is contained in:
isidor 2016-07-25 15:02:50 +02:00
parent d9067043bc
commit 1faad2d42c
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/vs/workbench/parts/debug/node/rawDebugSession.ts
View file

@ -145,7 +145,7 @@ export class RawDebugSession extends v8.V8Protocol implements debug.IRawDebugSes
return this.send(request, args);
}
protected send(command: string, args: any): TPromise<DebugProtocol.Response> {
protected send(command: string, args: any, cancelOnDisconnect = true): TPromise<DebugProtocol.Response> {
return this.initServer().then(() => {
const promise = super.send(command, args).then(response => response, (errorResponse: DebugProtocol.ErrorResponse) => {
const error = errorResponse.body ? errorResponse.body.error : null;
@ -173,7 +173,9 @@ export class RawDebugSession extends v8.V8Protocol implements debug.IRawDebugSes
return TPromise.wrapError(new Error(userMessage));
});
this.sentPromises.push(promise);
if (cancelOnDisconnect) {
this.sentPromises.push(promise);
}
return promise;
});
}
@ -286,7 +288,7 @@ export class RawDebugSession extends v8.V8Protocol implements debug.IRawDebugSes
// point of no return: from now on don't report any errors
this.stopServerPending = true;
this.restarted = restart;
return this.send('disconnect', { restart: restart }).then(() => this.stopServer(), () => this.stopServer());
return this.send('disconnect', { restart: restart }, false).then(() => this.stopServer(), () => this.stopServer());
}
return TPromise.as(null);