From 602741e5f26d23b4e1f572e85714a777b224eead Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Mon, 24 Oct 2016 10:54:50 +0200
Subject: [PATCH] debug: surface multiple debug sessions

---
 .../workbench/parts/debug/electron-browser/debugService.ts | 3 ++-
 src/vs/workbench/parts/debug/node/debugAdapter.ts          | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index 3ff912625da..834ada45019 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -7,6 +7,7 @@ import nls = require('vs/nls');
 import lifecycle = require('vs/base/common/lifecycle');
 import { guessMimeTypes } from 'vs/base/common/mime';
 import Event, { Emitter } from 'vs/base/common/event';
+import * as strings from 'vs/base/common/strings';
 import uuid = require('vs/base/common/uuid');
 import uri from 'vs/base/common/uri';
 import { Action } from 'vs/base/common/actions';
@@ -546,7 +547,7 @@ export class DebugService implements debug.IDebugService {
 							if (configuration.silentlyAbort) {
 								return;
 							}
-							if (configuration.configurationNames) {
+							if (strings.equalsIgnoreCase(configuration.type, 'composite') && configuration.configurationNames) {
 								return TPromise.join(configuration.configurationNames.map(name => this.createProcess(name)));
 							}
 
diff --git a/src/vs/workbench/parts/debug/node/debugAdapter.ts b/src/vs/workbench/parts/debug/node/debugAdapter.ts
index 041d5605317..8dee37ee896 100644
--- a/src/vs/workbench/parts/debug/node/debugAdapter.ts
+++ b/src/vs/workbench/parts/debug/node/debugAdapter.ts
@@ -130,7 +130,7 @@ export class Adapter {
 				}
 				const properties = attributes.properties;
 				properties.type = {
-					enum: [this.type],
+					enum: [this.type, 'composite'],
 					description: nls.localize('debugType', "Type of configuration.")
 				};
 				properties.name = {
@@ -142,6 +142,11 @@ export class Adapter {
 					enum: [request],
 					description: nls.localize('debugRequest', "Request type of configuration. Can be \"launch\" or \"attach\"."),
 				};
+				properties.configurationNames = {
+					type: 'array',
+					default: [],
+					description: nls.localize('debugConfigurationNames', "Configurations that will be launched as part of this \"composite\" configuration. Only respected if type of this configuration is \"composite\".")
+				};
 				properties.preLaunchTask = {
 					type: ['string', 'null'],
 					default: null,
-- 
GitLab