diff --git a/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts b/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts index 44b5cd4695300eef768a4238153be573e13f2237..7af1f6d3496e4fe6c3a6913efa887b8f70947e95 100644 --- a/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts +++ b/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts @@ -244,7 +244,7 @@ class SessionTreeItem extends BaseTreeItem { private _session: IDebugSession; private _initialized: boolean; - private _map: Map; + private _map = new Map(); private _labelService: ILabelService; constructor(labelService: ILabelService, parent: BaseTreeItem, session: IDebugSession, private _environmentService: IEnvironmentService, private rootProvider: IWorkspaceContextService) { @@ -252,7 +252,6 @@ class SessionTreeItem extends BaseTreeItem { this._labelService = labelService; this._initialized = false; this._session = session; - this._map = new Map(); } getSession(): IDebugSession { diff --git a/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.ts b/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.ts index 53c93567d916a3c894b0ac2fd71b076f1b70e100..17dfdf746adc73d2e28999c0a12fe27358285928 100644 --- a/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.ts +++ b/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.ts @@ -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 void>; + private pendingRequests = new Map 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(); this._onExit = new Emitter(); } @@ -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 = { diff --git a/src/vs/workbench/contrib/debug/common/debugModel.ts b/src/vs/workbench/contrib/debug/common/debugModel.ts index f198b06b03d68926d8506937ffff137539a49290..4c7bba80c43a0f362a28841b287ba2019426975a 100644 --- a/src/vs/workbench/contrib/debug/common/debugModel.ts +++ b/src/vs/workbench/contrib/debug/common/debugModel.ts @@ -90,7 +90,7 @@ export class RawObjectReplElement implements IExpression { export class ExpressionContainer implements IExpressionContainer { - public static allValues: Map = new Map(); + public static allValues = new Map(); // Use chunks to support variable paging #9537 private static readonly BASE_CHUNK_SIZE = 100; diff --git a/src/vs/workbench/contrib/debug/electron-browser/debugConfigurationManager.ts b/src/vs/workbench/contrib/debug/electron-browser/debugConfigurationManager.ts index 7c53b632718162b815768b49c4b178f5855a33ac..baf0537d8349892be6f135447f95b57cfb574c72 100644 --- a/src/vs/workbench/contrib/debug/electron-browser/debugConfigurationManager.ts +++ b/src/vs/workbench/contrib/debug/electron-browser/debugConfigurationManager.ts @@ -52,7 +52,7 @@ export class ConfigurationManager implements IConfigurationManager { private _onDidSelectConfigurationName = new Emitter(); private configProviders: IDebugConfigurationProvider[]; private adapterDescriptorFactories: IDebugAdapterDescriptorFactory[]; - private debugAdapterFactories: Map; + private debugAdapterFactories = new Map(); private terminalLauncher: ITerminalLauncher; private debugConfigurationTypeContext: IContextKey; @@ -78,7 +78,6 @@ export class ConfigurationManager implements IConfigurationManager { const previousSelectedRoot = this.storageService.get(DEBUG_SELECTED_ROOT, StorageScope.WORKSPACE); const previousSelectedLaunch = this.launches.filter(l => l.uri.toString() === previousSelectedRoot).pop(); this.debugConfigurationTypeContext = CONTEXT_DEBUG_CONFIGURATION_TYPE.bindTo(contextKeyService); - this.debugAdapterFactories = new Map(); if (previousSelectedLaunch) { this.selectConfiguration(previousSelectedLaunch, this.storageService.get(DEBUG_SELECTED_CONFIG_NAME_KEY, StorageScope.WORKSPACE)); }