debug: npe

isidorn · isidorn · commit 59d0eadabfd8 · 2018-08-22T16:18:33.000+02:00
fixes microsoft#56637
diff --git a/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts b/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
@@ -427,47 +427,44 @@ export class RawDebugSession implements IRawSession {
 	}
 
 	private dispatchRequest(request: DebugProtocol.Request): void {
+		const response: DebugProtocol.Response = {
+			type: 'response',
+			seq: 0,
+			command: request.command,
+			request_seq: request.seq,
+			success: true
+		};
+		const sendResponse = (response) => this.debugAdapter && this.debugAdapter.sendResponse(response);
+
+		if (request.command === 'runInTerminal') {
+
+			this._debugger.runInTerminal(<DebugProtocol.RunInTerminalRequestArguments>request.arguments).then(_ => {
+				response.body = {};
+				sendResponse(response);
+			}, err => {
+				response.success = false;
+				response.message = err.message;
+				sendResponse(response);
+			});
 
-		if (this.debugAdapter) {
-
-			const response: DebugProtocol.Response = {
-				type: 'response',
-				seq: 0,
-				command: request.command,
-				request_seq: request.seq,
-				success: true
-			};
-
-			if (request.command === 'runInTerminal') {
-
-				this._debugger.runInTerminal(<DebugProtocol.RunInTerminalRequestArguments>request.arguments).then(_ => {
-					response.body = {};
-					this.debugAdapter.sendResponse(response);
-				}, err => {
-					response.success = false;
-					response.message = err.message;
-					this.debugAdapter.sendResponse(response);
-				});
-
-			} else if (request.command === 'handshake') {
-				try {
-					const vsda = <any>require.__$__nodeRequire('vsda');
-					const obj = new vsda.signer();
-					const sig = obj.sign(request.arguments.value);
-					response.body = {
-						signature: sig
-					};
-					this.debugAdapter.sendResponse(response);
-				} catch (e) {
-					response.success = false;
-					response.message = e.message;
-					this.debugAdapter.sendResponse(response);
-				}
-			} else {
+		} else if (request.command === 'handshake') {
+			try {
+				const vsda = <any>require.__$__nodeRequire('vsda');
+				const obj = new vsda.signer();
+				const sig = obj.sign(request.arguments.value);
+				response.body = {
+					signature: sig
+				};
+				sendResponse(response);
+			} catch (e) {
 				response.success = false;
-				response.message = `unknown request '${request.command}'`;
-				this.debugAdapter.sendResponse(response);
+				response.message = e.message;
+				sendResponse(response);
 			}
+		} else {
+			response.success = false;
+			response.message = `unknown request '${request.command}'`;
+			sendResponse(response);
 		}
 	}
 
