updated execution block

Author: msivasubramaniaan

code/extensions/che-commands/src/compositeTaskBuilder.ts

@@ -57,7 +57,13 @@ export class CompositeTaskBuilder {
 		}
 
 		if (parallel) {
-			return this.buildParallelCrossComponent(command, execs);
+			execs.forEach((e, index) => {
+				const childTask = this.buildExecTask(e, index === 0);
+
+				vscode.tasks.executeTask(childTask);
+			});
+
+			return undefined;
 		}
 
 		return this.buildSeqCrossComponent(command, execs);
@@ -231,64 +237,6 @@ export class CompositeTaskBuilder {
 		);
 	}
 
-	private buildParallelCrossComponent(
-		command: any,
-		execs: ResolvedExec[],
-	): vscode.Task {
-		const execution = new vscode.CustomExecution(async () => {
-			const writeEmitter = new vscode.EventEmitter<string>();
-			const closeEmitter = new vscode.EventEmitter<number>();
-
-			const pty: vscode.Pseudoterminal = {
-				onDidWrite: writeEmitter.event,
-
-				onDidClose: closeEmitter.event,
-
-				open: () => {
-					execs.forEach((e, index) => {
-						const childTask = this.buildExecTask(e, index === 0);
-
-						vscode.tasks.executeTask(childTask);
-					});
-					closeEmitter.fire(0);
-				},
-
-				close: () => {
-					closeEmitter.fire(0);
-				},
-
-				handleInput: () => {},
-			};
-
-			return pty;
-		});
-
-		const first = execs[0];
-
-		const task = new vscode.Task(
-			{
-				type: "devfile",
-				command: command.id,
-				workdir: first.workdir,
-				component: first.component,
-			},
-			vscode.TaskScope.Workspace,
-			command.composite.label || command.id,
-			"devfile",
-			execution,
-			[],
-		);
-
-		task.presentationOptions = {
-			reveal: vscode.TaskRevealKind?.Never ?? 0,
-			panel: vscode.TaskPanelKind?.Dedicated ?? 1,
-			clear: false,
-			showReuseMessage: false,
-		};
-
-		return task;
-	}
-
 	private buildExecTask(e: ResolvedExec, focus: boolean): vscode.Task {
 		const task = new vscode.Task(
 			{

code/extensions/che-commands/tests/compositeTaskBuilder.test.ts

@@ -83,7 +83,7 @@ describe("Composite — same component flattening", () => {
 	});
 });
 
-describe("Composite — cross component execution", () => {
+describe("Composite Sequential — cross component execution", () => {
 	const devfile = {
 		commands: [
 			{
@@ -98,10 +98,6 @@ describe("Composite — cross component execution", () => {
 				id: "seq",
 				composite: { commands: ["backend", "frontend"], parallel: false },
 			},
-			{
-				id: "par",
-				composite: { commands: ["backend", "frontend"], parallel: true },
-			},
 		],
 	};
 
@@ -113,6 +109,25 @@ describe("Composite — cross component execution", () => {
 
 		expect(term.calls.map((c) => c.component)).toEqual(["backend", "frontend"]);
 	});
+});
+
+describe("Composite Parallel — cross component execution", () => {
+	const devfile = {
+		commands: [
+			{
+				id: "backend",
+				exec: { component: "backend", commandLine: "echo backend" },
+			},
+			{
+				id: "frontend",
+				exec: { component: "frontend", commandLine: "echo frontend" },
+			},
+			{
+				id: "par",
+				composite: { commands: ["backend", "frontend"], parallel: true },
+			},
+		],
+	};
 
 	test("parallel composite executes all components and opens only child terminals", async () => {
 		let executedTasks: vscode.Task[] = [];
@@ -135,9 +150,7 @@ describe("Composite — cross component execution", () => {
 
 		const term = new MockTerminalAPI();
 
-		const tasks = await provide(devfile, term);
-
-		await runByName(tasks!, "par");
+		await provide(devfile, term);
 
 		expect(executedTasks).toHaveLength(2);