eclipse-theiagh-7185: init

Signed-off-by: Akos Kitta <kittaakos@typefox.io>

packages/plugin-ext/src/common/plugin-api-rpc.ts

@@ -1664,19 +1664,21 @@ export const MAIN_RPC_CONTEXT = {
 export interface TasksExt {
     $provideTasks(handle: number, token?: CancellationToken): Promise<TaskDto[] | undefined>;
     $resolveTask(handle: number, task: TaskDto, token?: CancellationToken): Promise<TaskDto | undefined>;
-    $onDidStartTask(execution: TaskExecutionDto): void;
+    $onDidStartTask(execution: TaskExecutionDto, terminalId: number): void;
     $onDidEndTask(id: number): void;
     $onDidStartTaskProcess(processId: number | undefined, execution: TaskExecutionDto): void;
     $onDidEndTaskProcess(exitCode: number | undefined, taskId: number): void;
 }
 
 export interface TasksMain {
+    $createTaskId(task: TaskDto): Promise<string>;
     $registerTaskProvider(handle: number, type: string): void;
     $fetchTasks(taskVersion: string | undefined, taskType: string | undefined): Promise<TaskDto[]>;
     $executeTask(taskDto: TaskDto): Promise<TaskExecutionDto | undefined>;
     $taskExecutions(): Promise<TaskExecutionDto[]>;
     $unregister(handle: number): void;
     $terminateTask(id: number): void;
+    $customExecutionComplete(id: string, result?: number): Promise<void>;
 }
 
 export interface AuthenticationExt {

packages/plugin-ext/src/main/browser/tasks-main.ts

@@ -53,7 +53,7 @@ export class TasksMainImpl implements TasksMain, Disposable {
             this.proxy.$onDidStartTask({
                 id: event.taskId,
                 task: this.fromTaskConfiguration(event.config)
-            });
+            }, event.terminalId!);
         }));
 
         this.toDispose.push(this.taskWatcher.onTaskExit((event: TaskExitedEvent) => {
@@ -80,6 +80,11 @@ export class TasksMainImpl implements TasksMain, Disposable {
         this.toDispose.dispose();
     }
 
+    async $createTaskId(task: TaskDto): Promise<string> {
+        console.log('$createTaskId', JSON.stringify(task));
+        return 'foo-bar';
+    }
+
     $registerTaskProvider(handle: number, type: string): void {
         const taskProvider = this.createTaskProvider(handle);
         const taskResolver = this.createTaskResolver(handle);
@@ -154,6 +159,15 @@ export class TasksMainImpl implements TasksMain, Disposable {
         this.taskService.kill(id);
     }
 
+    async $customExecutionComplete(id: string, result?: number): Promise<void> {
+        const tasks = await this.taskService.getRunningTasks();
+        const task = tasks.find(({ taskId }) => String(taskId) === id);
+        if (!task) {
+            throw new Error('Task to mark as complete not found');
+        }
+        await this.taskService.extensionCallbackTaskComplete(task, result);
+    }
+
     protected createTaskProvider(handle: number): TaskProvider {
         return {
             provideTasks: () =>

packages/plugin-ext/src/plugin/plugin-context.ts

@@ -95,6 +95,7 @@ import {
     ShellQuoting,
     ShellExecution,
     ProcessExecution,
+    CustomExecution,
     TaskScope,
     TaskPanelKind,
     TaskRevealKind,
@@ -909,6 +910,7 @@ export function createAPIFactory(
             ShellQuoting,
             ShellExecution,
             ProcessExecution,
+            CustomExecution,
             TaskScope,
             TaskRevealKind,
             TaskPanelKind,

packages/plugin-ext/src/plugin/type-converters.ts

@@ -700,7 +700,7 @@ export function toWorkspaceFolder(folder: model.WorkspaceFolder): theia.Workspac
     };
 }
 
-export function fromTask(task: theia.Task): TaskDto | undefined {
+export function fromTask(task: theia.Task | undefined): TaskDto | undefined {
     if (!task) {
         return undefined;
     }
@@ -753,6 +753,10 @@ export function fromTask(task: theia.Task): TaskDto | undefined {
         return fromProcessExecution(<theia.ProcessExecution>execution, taskDto);
     }
 
+    if (taskDefinition.type === 'customExecution' || execution instanceof theia.CustomExecution) {
+        return fromCustomExecution(<theia.CustomExecution>execution, taskDto);
+    }
+
     return taskDto;
 }
 
@@ -849,6 +853,10 @@ export function fromShellExecution(execution: theia.ShellExecution, taskDto: Tas
     }
 }
 
+export function fromCustomExecution(execution: theia.CustomExecution, taskDto: TaskDto): TaskDto {
+    return taskDto;
+}
+
 export function getProcessExecution(taskDto: TaskDto): theia.ProcessExecution {
     return new types.ProcessExecution(
         taskDto.command,

packages/plugin-ext/src/plugin/types-impl.ts

@@ -1522,7 +1522,7 @@ export class ProcessExecution {
         return computeTaskExecutionId(props);
     }
 
-    public static is(value: theia.ShellExecution | theia.ProcessExecution): boolean {
+    public static is(value: theia.ShellExecution | theia.ProcessExecution | theia.CustomExecution): boolean {
         const candidate = value as ProcessExecution;
         return candidate && !!candidate.process;
     }
@@ -1630,12 +1630,31 @@ export class ShellExecution {
         return computeTaskExecutionId(props);
     }
 
-    public static is(value: theia.ShellExecution | theia.ProcessExecution): boolean {
+    public static is(value: theia.ShellExecution | theia.ProcessExecution | theia.CustomExecution): boolean {
         const candidate = value as ShellExecution;
         return candidate && (!!candidate.commandLine || !!candidate.command);
     }
 }
 
+export class CustomExecution implements theia.CustomExecution {
+
+    private _id?: string;
+    constructor(public callback: (resolvedDefinition: theia.TaskDefinition) => Thenable<theia.Pseudoterminal>) { }
+
+    computeId(): string {
+        if (!this._id) {
+            this._id = UUID.uuid4();
+        }
+        return `customExecution${this._id}`;
+    }
+
+}
+export namespace CustomExecution {
+    export function is(execution: theia.ShellExecution | theia.ProcessExecution | theia.CustomExecution): execution is theia.CustomExecution {
+        return execution instanceof theia.CustomExecution;
+    }
+}
+
 export class TaskGroup {
     private groupId: string;