Revert "debug: do not send terminate to EH debugging"

isidorn · isidorn · commit fcf6c22c4cf3 · 2018-08-29T16:48:06.000+02:00
This reverts commit 7df1ed4.
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugSession.ts b/src/vs/workbench/parts/debug/electron-browser/debugSession.ts
@@ -234,7 +234,7 @@ export class Session implements ISession {
 		}
 
 		return dbgr.getCustomTelemetryService().then(customTelemetryService => {
-			this._raw = this.instantiationService.createInstance(RawDebugSession, this.id, this._configuration.resolved, dbgr, customTelemetryService, this.root);
+			this._raw = this.instantiationService.createInstance(RawDebugSession, this.id, this._configuration.resolved.debugServer, dbgr, customTelemetryService, this.root);
 			this.registerListeners();
 
 			return this._raw.initialize({
diff --git a/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts b/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
@@ -16,9 +16,8 @@ import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { formatPII } from 'vs/workbench/parts/debug/common/debugUtils';
 import { SocketDebugAdapter } from 'vs/workbench/parts/debug/node/debugAdapter';
-import { DebugEvent, IRawSession, IDebugAdapter, IConfig } from 'vs/workbench/parts/debug/common/debug';
+import { DebugEvent, IRawSession, IDebugAdapter } from 'vs/workbench/parts/debug/common/debug';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { equalsIgnoreCase } from 'vs/base/common/strings';
 
 export interface SessionExitedEvent extends DebugEvent {
 	body: {
@@ -48,8 +47,7 @@ export class RawDebugSession implements IRawSession {
 	private cancellationTokens: CancellationTokenSource[];
 	private _capabilities: DebugProtocol.Capabilities;
 	private allThreadsContinued: boolean;
-	private debugServerPort: number;
-	private isAttach: boolean;
+	private isAttached: boolean;
 
 	private readonly _onDidInitialize: Emitter<DebugProtocol.InitializedEvent>;
 	private readonly _onDidStop: Emitter<DebugProtocol.StoppedEvent>;
@@ -66,7 +64,7 @@ export class RawDebugSession implements IRawSession {
 
 	constructor(
 		private sessionId: string,
-		configuration: IConfig,
+		private debugServerPort: number,
 		private _debugger: Debugger,
 		public customTelemetryService: ITelemetryService,
 		private root: IWorkspaceFolder,
@@ -78,8 +76,6 @@ export class RawDebugSession implements IRawSession {
 		this.readyForBreakpoints = false;
 		this.allThreadsContinued = true;
 		this.cancellationTokens = [];
-		this.debugServerPort = configuration.debugServer;
-		this.isAttach = configuration.request === 'attach' || equalsIgnoreCase(configuration.type, 'extensionHost');
 
 		this._onDidInitialize = new Emitter<DebugProtocol.InitializedEvent>();
 		this._onDidStop = new Emitter<DebugProtocol.StoppedEvent>();
@@ -292,6 +288,7 @@ export class RawDebugSession implements IRawSession {
 	}
 
 	public attach(args: DebugProtocol.AttachRequestArguments): TPromise<DebugProtocol.AttachResponse> {
+		this.isAttached = true;
 		return this.send('attach', args).then(response => this.readCapabilities(response));
 	}
 
@@ -350,7 +347,7 @@ export class RawDebugSession implements IRawSession {
 	}
 
 	public terminate(restart = false): TPromise<DebugProtocol.TerminateResponse> {
-		if (this.capabilities.supportsTerminateRequest && !this.terminated && !this.isAttach) {
+		if (this.capabilities.supportsTerminateRequest && !this.terminated && !this.isAttached) {
 			this.terminated = true;
 			return this.send('terminate', { restart });
 		}

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ export class Session implements ISession {`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`return dbgr.getCustomTelemetryService().then(customTelemetryService => {`
`237`		`- this._raw = this.instantiationService.createInstance(RawDebugSession, this.id, this._configuration.resolved, dbgr, customTelemetryService, this.root);`
	`237`	`+ this._raw = this.instantiationService.createInstance(RawDebugSession, this.id, this._configuration.resolved.debugServer, dbgr, customTelemetryService, this.root);`
`238`	`238`	`this.registerListeners();`
`239`	`239`
`240`	`240`	`return this._raw.initialize({`