abstract more

TylerLeonhardt · TylerLeonhardt · commit f8cf2fce66ff · 2020-07-23T19:13:24.000-07:00
diff --git a/src/vs/workbench/contrib/debug/node/debugAdapter.ts b/src/vs/workbench/contrib/debug/node/debugAdapter.ts
@@ -95,41 +95,26 @@ export abstract class NetworkDebugAdapter extends StreamDebugAdapter {
 
 	protected socket?: net.Socket;
 
-	abstract startSession(): Promise<void>;
-
-	async stopSession(): Promise<void> {
-		await this.cancelPendingRequests();
-		if (this.socket) {
-			this.socket.end();
-			this.socket = undefined;
-		}
-	}
-}
-
-/**
- * An implementation that connects to a debug adapter via a socket.
-*/
-export class SocketDebugAdapter extends NetworkDebugAdapter {
-
-	constructor(private adapterServer: IDebugAdapterServer) {
-		super();
-	}
+	protected abstract createConnection(connectionListener: () => void): net.Socket;
 
 	startSession(): Promise<void> {
 		return new Promise<void>((resolve, reject) => {
 			let connected = false;
-			this.socket = net.createConnection(this.adapterServer.port, this.adapterServer.host || '127.0.0.1', () => {
+
+			this.socket = this.createConnection(() => {
 				this.connect(this.socket!, this.socket!);
 				resolve();
 				connected = true;
 			});
+
 			this.socket.on('close', () => {
 				if (connected) {
 					this._onError.fire(new Error('connection closed'));
 				} else {
 					reject(new Error('connection closed'));
 				}
 			});
+
 			this.socket.on('error', error => {
 				if (connected) {
 					this._onError.fire(error);
@@ -139,6 +124,28 @@ export class SocketDebugAdapter extends NetworkDebugAdapter {
 			});
 		});
 	}
+
+	async stopSession(): Promise<void> {
+		await this.cancelPendingRequests();
+		if (this.socket) {
+			this.socket.end();
+			this.socket = undefined;
+		}
+	}
+}
+
+/**
+ * An implementation that connects to a debug adapter via a socket.
+*/
+export class SocketDebugAdapter extends NetworkDebugAdapter {
+
+	constructor(private adapterServer: IDebugAdapterServer) {
+		super();
+	}
+
+	protected createConnection(connectionListener: () => void): net.Socket {
+		return net.createConnection(this.adapterServer.port, this.adapterServer.host || '127.0.0.1', connectionListener);
+	}
 }
 
 /**
@@ -150,29 +157,8 @@ export class NamedPipeDebugAdapter extends NetworkDebugAdapter {
 		super();
 	}
 
-	startSession(): Promise<void> {
-		return new Promise<void>((resolve, reject) => {
-			let connected = false;
-			this.socket = net.createConnection(this.adapterServer.path, () => {
-				this.connect(this.socket!, this.socket!);
-				resolve();
-				connected = true;
-			});
-			this.socket.on('close', () => {
-				if (connected) {
-					this._onError.fire(new Error('connection closed'));
-				} else {
-					reject(new Error('connection closed'));
-				}
-			});
-			this.socket.on('error', error => {
-				if (connected) {
-					this._onError.fire(error);
-				} else {
-					reject(error);
-				}
-			});
-		});
+	protected createConnection(connectionListener: () => void): net.Socket {
+		return net.createConnection(this.adapterServer.path, connectionListener);
 	}
 }
 
