Custom executions get lost during fetchTasks

alexr00 · alexr00 · commit 40bda94ebc27 · 2020-06-22T18:36:32.000+02:00
Fixes microsoft#100577
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { window, tasks, Disposable, TaskDefinition, Task, EventEmitter, CustomExecution, Pseudoterminal, TaskScope, commands, Task2, env, UIKind, ShellExecution, TaskExecution, Terminal } from 'vscode';
+import { window, tasks, Disposable, TaskDefinition, Task, EventEmitter, CustomExecution, Pseudoterminal, TaskScope, commands, Task2, env, UIKind, ShellExecution, TaskExecution, Terminal, Event } from 'vscode';
 
 // Disable tasks tests:
 // - Web https://github.com/microsoft/vscode/issues/90528
@@ -220,5 +220,54 @@ import { window, tasks, Disposable, TaskDefinition, Task, EventEmitter, CustomEx
 				taskExecution = await tasks.executeTask(task);
 			});
 		});
+
+		// https://github.com/microsoft/vscode/issues/100577
+		test('A CustomExecution task can be fetched and executed', () => {
+			return new Promise(async (resolve, reject) => {
+				class CustomTerminal implements Pseudoterminal {
+					private readonly writeEmitter = new EventEmitter<string>();
+					public readonly onDidWrite: Event<string> = this.writeEmitter.event;
+					public async close(): Promise<void> { }
+					public open(): void {
+						this.close();
+						resolve();
+					}
+				}
+
+				function buildTask(): Task {
+					const task = new Task(
+						{
+							type: 'customTesting',
+						},
+						TaskScope.Workspace,
+						'Test Task',
+						'customTesting',
+						new CustomExecution(
+							async (): Promise<Pseudoterminal> => {
+								return new CustomTerminal();
+							}
+						)
+					);
+					return task;
+				}
+
+				disposables.push(tasks.registerTaskProvider('customTesting', {
+					provideTasks: () => {
+						return [buildTask()];
+					},
+					resolveTask(_task: Task): undefined {
+						return undefined;
+					}
+				}));
+
+				const task = await tasks.fetchTasks({ type: 'customTesting' });
+
+				if (task && task.length > 0) {
+					await tasks.executeTask(task[0]);
+				} else {
+					reject('fetched task can\'t be undefined');
+				}
+			});
+		});
 	});
 });
diff --git a/src/vs/workbench/api/browser/mainThreadTask.ts b/src/vs/workbench/api/browser/mainThreadTask.ts
@@ -328,10 +328,10 @@ namespace TaskDTO {
 			result.detail = task.configurationProperties.detail;
 		}
 		if (!ConfiguringTask.is(task) && task.command) {
-			if (task.command.runtime === RuntimeType.Process) {
-				result.execution = ProcessExecutionDTO.from(task.command);
-			} else if (task.command.runtime === RuntimeType.Shell) {
-				result.execution = ShellExecutionDTO.from(task.command);
+			switch (task.command.runtime) {
+				case RuntimeType.Process: result.execution = ProcessExecutionDTO.from(task.command); break;
+				case RuntimeType.Shell: result.execution = ShellExecutionDTO.from(task.command); break;
+				case RuntimeType.CustomExecution: result.execution = CustomExecutionDTO.from(task.command); break;
 			}
 		}
 		if (task.configurationProperties.problemMatchers) {
diff --git a/src/vs/workbench/api/node/extHostTask.ts b/src/vs/workbench/api/node/extHostTask.ts
@@ -59,7 +59,7 @@ export class ExtHostTask extends ExtHostTaskBase {
 				throw new Error('Task from execution DTO is undefined');
 			}
 			const execution = await this.getTaskExecution(executionDTO, task);
-			this._proxy.$executeTask(executionDTO.task).catch(error => { throw new Error(error); });
+			this._proxy.$executeTask(executionDTO.task).catch(() => { /* The error here isn't actionable. */ });
 			return execution;
 		} else {
 			const dto = TaskDTO.from(task, extension);
@@ -75,7 +75,7 @@ export class ExtHostTask extends ExtHostTaskBase {
 			}
 			// Always get the task execution first to prevent timing issues when retrieving it later
 			const execution = await this.getTaskExecution(await this._proxy.$getTaskExecution(dto), task);
-			this._proxy.$executeTask(dto).catch(error => { throw new Error(error); });
+			this._proxy.$executeTask(dto).catch(() => { /* The error here isn't actionable. */ });
 			return execution;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -328,10 +328,10 @@ namespace TaskDTO {`
`328`	`328`	`result.detail = task.configurationProperties.detail;`
`329`	`329`	`}`
`330`	`330`	`if (!ConfiguringTask.is(task) && task.command) {`
`331`		`- if (task.command.runtime === RuntimeType.Process) {`
`332`		`- result.execution = ProcessExecutionDTO.from(task.command);`
`333`		`- } else if (task.command.runtime === RuntimeType.Shell) {`
`334`		`- result.execution = ShellExecutionDTO.from(task.command);`
	`331`	`+ switch (task.command.runtime) {`
	`332`	`+ case RuntimeType.Process: result.execution = ProcessExecutionDTO.from(task.command); break;`
	`333`	`+ case RuntimeType.Shell: result.execution = ShellExecutionDTO.from(task.command); break;`
	`334`	`+ case RuntimeType.CustomExecution: result.execution = CustomExecutionDTO.from(task.command); break;`
`335`	`335`	`}`
`336`	`336`	`}`
`337`	`337`	`if (task.configurationProperties.problemMatchers) {`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ export class ExtHostTask extends ExtHostTaskBase {`
`59`	`59`	`throw new Error('Task from execution DTO is undefined');`
`60`	`60`	`}`
`61`	`61`	`const execution = await this.getTaskExecution(executionDTO, task);`
`62`		`- this._proxy.$executeTask(executionDTO.task).catch(error => { throw new Error(error); });`
	`62`	`+ this._proxy.$executeTask(executionDTO.task).catch(() => { /* The error here isn't actionable. */ });`
`63`	`63`	`return execution;`
`64`	`64`	`} else {`
`65`	`65`	`const dto = TaskDTO.from(task, extension);`
`@@ -75,7 +75,7 @@ export class ExtHostTask extends ExtHostTaskBase {`
`75`	`75`	`}`
`76`	`76`	`// Always get the task execution first to prevent timing issues when retrieving it later`
`77`	`77`	`const execution = await this.getTaskExecution(await this._proxy.$getTaskExecution(dto), task);`
`78`		`- this._proxy.$executeTask(dto).catch(error => { throw new Error(error); });`
	`78`	`+ this._proxy.$executeTask(dto).catch(() => { /* The error here isn't actionable. */ });`
`79`	`79`	`return execution;`
`80`	`80`	`}`
`81`	`81`	`}`