Fixes microsoft#29013: Tasks 2.0 integration with launch.json

dbaeumer · dbaeumer · commit b5ae94385421 · 2017-06-26T13:14:02.000+02:00
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -855,9 +855,8 @@ export class DebugService implements debug.IDebugService {
 		}
 
 		// run a task before starting a debug session
-		return this.taskService.tasks().then(descriptions => {
-			const filteredTasks = descriptions.filter(task => task.name === taskName);
-			if (filteredTasks.length !== 1) {
+		return this.taskService.getTask(taskName).then(task => {
+			if (!task) {
 				return TPromise.wrapError(errors.create(nls.localize('DebugTaskNotFound', "Could not find the preLaunchTask \'{0}\'.", taskName)));
 			}
 
@@ -872,14 +871,14 @@ export class DebugService implements debug.IDebugService {
 			}
 
 			// no task running, execute the preLaunchTask.
-			const taskPromise = this.taskService.run(filteredTasks[0]).then(result => {
+			const taskPromise = this.taskService.run(task).then(result => {
 				this.lastTaskEvent = null;
 				return result;
 			}, err => {
 				this.lastTaskEvent = null;
 			});
 
-			if (filteredTasks[0].isBackground) {
+			if (task.isBackground) {
 				return new TPromise((c, e) => this.taskService.addOneTimeListener(TaskServiceEvents.Inactive, () => c(null)));
 			}
 
diff --git a/src/vs/workbench/parts/tasks/common/taskService.ts b/src/vs/workbench/parts/tasks/common/taskService.ts
@@ -42,6 +42,10 @@ export interface ITaskService extends IEventEmitter {
 	terminate(task: string | Task): TPromise<TaskTerminateResponse>;
 	terminateAll(): TPromise<TaskTerminateResponse[]>;
 	tasks(): TPromise<Task[]>;
+	/**
+	 * @param identifier The task's name, label or defined identifier.
+	 */
+	getTask(identifier: string): TPromise<Task>;
 	getTasksForGroup(group: string): TPromise<Task[]>;
 	getRecentlyUsedTasks(): LinkedMap<string, string>;
 
diff --git a/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts b/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts
@@ -139,6 +139,11 @@ const version: IJSONSchema = {
 	description: nls.localize('JsonSchema.version', 'The config\'s version number.')
 };
 
+const identifier: IJSONSchema = {
+	type: 'string',
+	description: nls.localize('JsonSchema.tasks.identifier', 'A user defined identifier to reference the task in launch.json or a dependsOn clause.')
+};
+
 let taskConfiguration: IJSONSchema = {
 	type: 'object',
 	additionalProperties: false,
@@ -152,6 +157,7 @@ let taskConfiguration: IJSONSchema = {
 			description: nls.localize('JsonSchema.tasks.taskName', 'The task\'s name'),
 			deprecationMessage: nls.localize('JsonSchema.tasks.taskName.deprecated', 'The task\'s name property is deprecated. Use the label property instead.')
 		},
+		identifier: Objects.deepClone(identifier),
 		group: Objects.deepClone(group),
 		isBackground: {
 			type: 'boolean',
@@ -204,6 +210,7 @@ let definitions = Objects.deepClone(commonSchema.definitions);
 let taskDescription: IJSONSchema = definitions.taskDescription;
 taskDescription.properties.isShellCommand = Objects.deepClone(shellCommand);
 taskDescription.properties.dependsOn = dependsOn;
+taskDescription.properties.identifier = Objects.deepClone(identifier);
 definitions.showOutputType.deprecationMessage = nls.localize(
 	'JsonSchema.tasks.showOputput.deprecated',
 	'The property showOutput is deprecated. Use the reveal property inside the presentation property instead. See also the 1.14 release notes.'
diff --git a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
@@ -681,6 +681,13 @@ class TaskService extends EventEmitter implements ITaskService {
 		return this._providers.delete(handle);
 	}
 
+	public getTask(identifier: string): TPromise<Task> {
+		return this.getTaskSets().then((sets) => {
+			let resolver = this.createResolver(sets);
+			return resolver.resolve(identifier);
+		});
+	}
+
 	public tasks(): TPromise<Task[]> {
 		return this.getTaskSets().then((sets) => {
 			let result: Task[] = [];
@@ -1697,7 +1704,7 @@ schema.definitions = {
 	...schemaVersion1.definitions,
 	...schemaVersion2.definitions,
 };
-schema.oneOf = [...schemaVersion1.oneOf, ...schemaVersion2.oneOf];
+schema.oneOf = [...schemaVersion2.oneOf, ...schemaVersion1.oneOf];
 
 
 let jsonRegistry = <jsonContributionRegistry.IJSONContributionRegistry>Registry.as(jsonContributionRegistry.Extensions.JSONContribution);

Original file line number	Diff line number	Diff line change
`@@ -855,9 +855,8 @@ export class DebugService implements debug.IDebugService {`
`855`	`855`	`}`
`856`	`856`
`857`	`857`	`// run a task before starting a debug session`
`858`		`- return this.taskService.tasks().then(descriptions => {`
`859`		`- const filteredTasks = descriptions.filter(task => task.name === taskName);`
`860`		`- if (filteredTasks.length !== 1) {`
	`858`	`+ return this.taskService.getTask(taskName).then(task => {`
	`859`	`+ if (!task) {`
`861`	`860`	`return TPromise.wrapError(errors.create(nls.localize('DebugTaskNotFound', "Could not find the preLaunchTask \'{0}\'.", taskName)));`
`862`	`861`	`}`
`863`	`862`
`@@ -872,14 +871,14 @@ export class DebugService implements debug.IDebugService {`
`872`	`871`	`}`
`873`	`872`
`874`	`873`	`// no task running, execute the preLaunchTask.`
`875`		`- const taskPromise = this.taskService.run(filteredTasks[0]).then(result => {`
	`874`	`+ const taskPromise = this.taskService.run(task).then(result => {`
`876`	`875`	`this.lastTaskEvent = null;`
`877`	`876`	`return result;`
`878`	`877`	`}, err => {`
`879`	`878`	`this.lastTaskEvent = null;`
`880`	`879`	`});`
`881`	`880`
`882`		`- if (filteredTasks[0].isBackground) {`
	`881`	`+ if (task.isBackground) {`
`883`	`882`	`return new TPromise((c, e) => this.taskService.addOneTimeListener(TaskServiceEvents.Inactive, () => c(null)));`
`884`	`883`	`}`
`885`	`884`