Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)

* Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d

* Fix vs unit tests and hygiene issue

* Fix strict null check issue
This commit is contained in:
Chris LaFreniere
2019-06-10 18:27:09 -07:00
committed by GitHub
parent ff38bc8143
commit d15a3fcc98
926 changed files with 19529 additions and 11383 deletions

View File

@@ -13,7 +13,7 @@ import { IDebugAdapter } from 'vs/workbench/contrib/debug/common/debug';
export abstract class AbstractDebugAdapter implements IDebugAdapter {
private sequence: number;
private pendingRequests: Map<number, (e: DebugProtocol.Response) => void>;
private pendingRequests = new Map<number, (e: DebugProtocol.Response) => void>();
private requestCallback: (request: DebugProtocol.Request) => void;
private eventCallback: (request: DebugProtocol.Event) => void;
private messageCallback: (message: DebugProtocol.ProtocolMessage) => void;
@@ -22,7 +22,6 @@ export abstract class AbstractDebugAdapter implements IDebugAdapter {
constructor() {
this.sequence = 1;
this.pendingRequests = new Map();
this._onError = new Emitter<Error>();
this._onExit = new Emitter<number>();
}
@@ -139,7 +138,7 @@ export abstract class AbstractDebugAdapter implements IDebugAdapter {
protected cancelPending() {
const pending = this.pendingRequests;
this.pendingRequests = new Map();
this.pendingRequests.clear();
setTimeout(_ => {
pending.forEach((callback, request_seq) => {
const err: DebugProtocol.Response = {