@theia/plugin-ext 1.34.2 → 1.34.3

package/src/plugin/tasks/task-provider.ts

@@ -1,60 +1,60 @@
-// *****************************************************************************
-// Copyright (C) 2018 Red Hat, Inc. and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as theia from '@theia/plugin';
-import * as Converter from '../type-converters';
-import { TaskDto } from '../../common';
-
-export class TaskProviderAdapter {
-
-    constructor(private readonly provider: theia.TaskProvider) { }
-
-    provideTasks(token: theia.CancellationToken): Promise<TaskDto[] | undefined> {
-        return Promise.resolve(this.provider.provideTasks(token)).then(tasks => {
-            if (!Array.isArray(tasks)) {
-                return undefined;
-            }
-            const result: TaskDto[] = [];
-            for (const task of tasks) {
-                const data = Converter.fromTask(task);
-                if (!data) {
-                    continue;
-                }
-
-                result.push(data);
-            }
-            return result;
-        });
-    }
-
-    resolveTask(task: TaskDto, token: theia.CancellationToken): Promise<TaskDto | undefined> {
-        if (typeof this.provider.resolveTask !== 'function') {
-            return Promise.resolve(undefined);
-        }
-
-        const item = Converter.toTask(task);
-        if (!item) {
-            return Promise.resolve(undefined);
-        }
-
-        return Promise.resolve(this.provider.resolveTask(item, token)).then(value => {
-            if (value) {
-                return Converter.fromTask(value);
-            }
-            return undefined;
-        });
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2018 Red Hat, Inc. and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as theia from '@theia/plugin';
+import * as Converter from '../type-converters';
+import { TaskDto } from '../../common';
+
+export class TaskProviderAdapter {
+
+    constructor(private readonly provider: theia.TaskProvider) { }
+
+    provideTasks(token: theia.CancellationToken): Promise<TaskDto[] | undefined> {
+        return Promise.resolve(this.provider.provideTasks(token)).then(tasks => {
+            if (!Array.isArray(tasks)) {
+                return undefined;
+            }
+            const result: TaskDto[] = [];
+            for (const task of tasks) {
+                const data = Converter.fromTask(task);
+                if (!data) {
+                    continue;
+                }
+
+                result.push(data);
+            }
+            return result;
+        });
+    }
+
+    resolveTask(task: TaskDto, token: theia.CancellationToken): Promise<TaskDto | undefined> {
+        if (typeof this.provider.resolveTask !== 'function') {
+            return Promise.resolve(undefined);
+        }
+
+        const item = Converter.toTask(task);
+        if (!item) {
+            return Promise.resolve(undefined);
+        }
+
+        return Promise.resolve(this.provider.resolveTask(item, token)).then(value => {
+            if (value) {
+                return Converter.fromTask(value);
+            }
+            return undefined;
+        });
+    }
+}

package/src/plugin/tasks/tasks.ts

@@ -1,247 +1,247 @@
-// *****************************************************************************
-// Copyright (C) 2018 Red Hat, Inc. and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import {
-    PLUGIN_RPC_CONTEXT,
-    TasksExt,
-    TasksMain,
-    TaskDto,
-    TaskExecutionDto
-} from '../../common/plugin-api-rpc';
-import * as theia from '@theia/plugin';
-import * as converter from '../type-converters';
-import { CustomExecution, Disposable } from '../types-impl';
-import { RPCProtocol } from '../../common/rpc-protocol';
-import { TaskProviderAdapter } from './task-provider';
-import { Emitter, Event } from '@theia/core/lib/common/event';
-import { TerminalServiceExtImpl } from '../terminal-ext';
-import { UUID } from '@theia/core/shared/@phosphor/coreutils';
-import { CancellationToken } from '@theia/core/lib/common/cancellation';
-
-type ExecutionCallback = (resolvedDefinition: theia.TaskDefinition) => Thenable<theia.Pseudoterminal>;
-export class TasksExtImpl implements TasksExt {
-    private proxy: TasksMain;
-
-    private callId = 0;
-    private adaptersMap = new Map<number, TaskProviderAdapter>();
-    private executions = new Map<number, theia.TaskExecution>();
-    protected callbackIdBase: string = UUID.uuid4();
-    protected callbackId: number;
-    protected customExecutionIds: Map<ExecutionCallback, string> = new Map();
-    protected customExecutionFunctions: Map<string, ExecutionCallback> = new Map();
-    protected lastStartedTask: number | undefined;
-
-    private readonly onDidExecuteTask: Emitter<theia.TaskStartEvent> = new Emitter<theia.TaskStartEvent>();
-    private readonly onDidTerminateTask: Emitter<theia.TaskEndEvent> = new Emitter<theia.TaskEndEvent>();
-    private readonly onDidExecuteTaskProcess: Emitter<theia.TaskProcessStartEvent> = new Emitter<theia.TaskProcessStartEvent>();
-    private readonly onDidTerminateTaskProcess: Emitter<theia.TaskProcessEndEvent> = new Emitter<theia.TaskProcessEndEvent>();
-
-    constructor(rpc: RPCProtocol, readonly terminalExt: TerminalServiceExtImpl) {
-        this.proxy = rpc.getProxy(PLUGIN_RPC_CONTEXT.TASKS_MAIN);
-    }
-
-    get taskExecutions(): ReadonlyArray<theia.TaskExecution> {
-        return [...this.executions.values()];
-    }
-
-    get onDidStartTask(): Event<theia.TaskStartEvent> {
-        return this.onDidExecuteTask.event;
-    }
-
-    async $onDidStartTask(execution: TaskExecutionDto, terminalId: number): Promise<void> {
-        const customExecution = this.customExecutionFunctions.get(execution.task.executionId || '');
-        if (customExecution) {
-            const taskDefinition = converter.toTask(execution.task).definition;
-            const pty = await customExecution(taskDefinition);
-            this.terminalExt.attachPtyToTerminal(terminalId, pty);
-            if (pty.onDidClose) {
-                const disposable = pty.onDidClose((e: number | void = undefined) => {
-                    disposable.dispose();
-                    // eslint-disable-next-line no-void
-                    this.proxy.$customExecutionComplete(execution.id, e === void 0 ? undefined : e);
-                });
-            }
-        }
-        this.lastStartedTask = execution.id;
-
-        this.onDidExecuteTask.fire({
-            execution: this.getTaskExecution(execution)
-        });
-    }
-
-    get onDidEndTask(): Event<theia.TaskEndEvent> {
-        return this.onDidTerminateTask.event;
-    }
-
-    $onDidEndTask(id: number): void {
-        const taskExecution = this.executions.get(id);
-        if (!taskExecution) {
-            throw new Error(`Task execution with id ${id} is not found`);
-        }
-
-        this.executions.delete(id);
-
-        this.onDidTerminateTask.fire({
-            execution: taskExecution
-        });
-    }
-
-    get onDidStartTaskProcess(): Event<theia.TaskProcessStartEvent> {
-        return this.onDidExecuteTaskProcess.event;
-    }
-
-    $onDidStartTaskProcess(processId: number, executionDto: TaskExecutionDto): void {
-        this.onDidExecuteTaskProcess.fire({
-            processId,
-            execution: this.getTaskExecution(executionDto)
-        });
-    }
-
-    get onDidEndTaskProcess(): Event<theia.TaskProcessEndEvent> {
-        return this.onDidTerminateTaskProcess.event;
-    }
-
-    $onDidEndTaskProcess(exitCode: number, taskId: number): void {
-        const taskExecution = this.executions.get(taskId);
-        if (!taskExecution) {
-            throw new Error(`Task execution with id ${taskId} is not found`);
-        }
-
-        this.onDidTerminateTaskProcess.fire({
-            execution: taskExecution,
-            exitCode
-        });
-    }
-
-    registerTaskProvider(type: string, provider: theia.TaskProvider): theia.Disposable {
-        const callId = this.addNewAdapter(new TaskProviderAdapter(provider));
-        this.proxy.$registerTaskProvider(callId, type);
-        return this.createDisposable(callId);
-    }
-
-    async fetchTasks(filter?: theia.TaskFilter): Promise<theia.Task[]> {
-        const taskVersion = filter ? filter.version : undefined;
-        const taskType = filter ? filter.type : undefined;
-        const taskDtos = await this.proxy.$fetchTasks(taskVersion, taskType);
-        return taskDtos.map(dto => converter.toTask(dto));
-    }
-
-    async executeTask(task: theia.Task): Promise<theia.TaskExecution> {
-        const taskDto = converter.fromTask(task);
-        if (taskDto) {
-            // If this task is a custom execution, then we need to save it away
-            // in the provided custom execution map that is cleaned up after the
-            // task is executed.
-            if (CustomExecution.is(task.execution!)) {
-                taskDto.executionId = this.addCustomExecution(task.execution!.callback);
-            }
-            const executionDto = await this.proxy.$executeTask(taskDto);
-            if (executionDto) {
-                const taskExecution = this.getTaskExecution(executionDto);
-                return taskExecution;
-            }
-            throw new Error('Run task config does not return after being started');
-        }
-        throw new Error('Task was not successfully transformed into a task config');
-    }
-
-    $provideTasks(handle: number): Promise<TaskDto[] | undefined> {
-        const adapter = this.adaptersMap.get(handle);
-        if (adapter) {
-            return adapter.provideTasks(CancellationToken.None).then(tasks => {
-                if (tasks) {
-                    for (const task of tasks) {
-                        if (task.taskType === 'customExecution') {
-                            task.executionId = this.addCustomExecution(task.callback);
-                            task.callback = undefined;
-                        }
-                    }
-                }
-                return tasks;
-            });
-        } else {
-            return Promise.reject(new Error('No adapter found to provide tasks'));
-        }
-    }
-
-    $resolveTask(handle: number, task: TaskDto, token: theia.CancellationToken): Promise<TaskDto | undefined> {
-        const adapter = this.adaptersMap.get(handle);
-        if (adapter) {
-            return adapter.resolveTask(task, token).then(resolvedTask => {
-                if (resolvedTask && resolvedTask.taskType === 'customExecution') {
-                    resolvedTask.executionId = this.addCustomExecution(resolvedTask.callback);
-                    resolvedTask.callback = undefined;
-                }
-                return resolvedTask;
-            });
-        } else {
-            return Promise.reject(new Error('No adapter found to resolve task'));
-        }
-    }
-
-    private addNewAdapter(adapter: TaskProviderAdapter): number {
-        const callId = this.nextCallId();
-        this.adaptersMap.set(callId, adapter);
-        return callId;
-    }
-
-    private nextCallId(): number {
-        return this.callId++;
-    }
-
-    private createDisposable(callId: number): theia.Disposable {
-        return new Disposable(() => {
-            this.adaptersMap.delete(callId);
-            this.proxy.$unregister(callId);
-        });
-    }
-
-    // Initial `this.executions` map with the running tasks from the previous session
-    async $initLoadedTasks(taskExecutions: TaskExecutionDto[]): Promise<void> {
-        taskExecutions.forEach(execution => this.getTaskExecution(execution));
-    }
-
-    private getTaskExecution(execution: TaskExecutionDto): theia.TaskExecution {
-        const executionId = execution.id;
-        let result: theia.TaskExecution | undefined = this.executions.get(executionId);
-        if (result) {
-            return result;
-        }
-
-        result = {
-            task: converter.toTask(execution.task),
-            terminate: () => {
-                this.proxy.$terminateTask(executionId);
-            }
-        };
-        this.executions.set(executionId, result);
-        return result;
-    }
-
-    private addCustomExecution(callback: ExecutionCallback): string {
-        let id = this.customExecutionIds.get(callback);
-        if (!id) {
-            id = this.nextCallbackId();
-            this.customExecutionIds.set(callback, id);
-            this.customExecutionFunctions.set(id, callback);
-        }
-        return id;
-    }
-
-    private nextCallbackId(): string {
-        return this.callbackIdBase + this.callbackId++;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2018 Red Hat, Inc. and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import {
+    PLUGIN_RPC_CONTEXT,
+    TasksExt,
+    TasksMain,
+    TaskDto,
+    TaskExecutionDto
+} from '../../common/plugin-api-rpc';
+import * as theia from '@theia/plugin';
+import * as converter from '../type-converters';
+import { CustomExecution, Disposable } from '../types-impl';
+import { RPCProtocol } from '../../common/rpc-protocol';
+import { TaskProviderAdapter } from './task-provider';
+import { Emitter, Event } from '@theia/core/lib/common/event';
+import { TerminalServiceExtImpl } from '../terminal-ext';
+import { UUID } from '@theia/core/shared/@phosphor/coreutils';
+import { CancellationToken } from '@theia/core/lib/common/cancellation';
+
+type ExecutionCallback = (resolvedDefinition: theia.TaskDefinition) => Thenable<theia.Pseudoterminal>;
+export class TasksExtImpl implements TasksExt {
+    private proxy: TasksMain;
+
+    private callId = 0;
+    private adaptersMap = new Map<number, TaskProviderAdapter>();
+    private executions = new Map<number, theia.TaskExecution>();
+    protected callbackIdBase: string = UUID.uuid4();
+    protected callbackId: number;
+    protected customExecutionIds: Map<ExecutionCallback, string> = new Map();
+    protected customExecutionFunctions: Map<string, ExecutionCallback> = new Map();
+    protected lastStartedTask: number | undefined;
+
+    private readonly onDidExecuteTask: Emitter<theia.TaskStartEvent> = new Emitter<theia.TaskStartEvent>();
+    private readonly onDidTerminateTask: Emitter<theia.TaskEndEvent> = new Emitter<theia.TaskEndEvent>();
+    private readonly onDidExecuteTaskProcess: Emitter<theia.TaskProcessStartEvent> = new Emitter<theia.TaskProcessStartEvent>();
+    private readonly onDidTerminateTaskProcess: Emitter<theia.TaskProcessEndEvent> = new Emitter<theia.TaskProcessEndEvent>();
+
+    constructor(rpc: RPCProtocol, readonly terminalExt: TerminalServiceExtImpl) {
+        this.proxy = rpc.getProxy(PLUGIN_RPC_CONTEXT.TASKS_MAIN);
+    }
+
+    get taskExecutions(): ReadonlyArray<theia.TaskExecution> {
+        return [...this.executions.values()];
+    }
+
+    get onDidStartTask(): Event<theia.TaskStartEvent> {
+        return this.onDidExecuteTask.event;
+    }
+
+    async $onDidStartTask(execution: TaskExecutionDto, terminalId: number): Promise<void> {
+        const customExecution = this.customExecutionFunctions.get(execution.task.executionId || '');
+        if (customExecution) {
+            const taskDefinition = converter.toTask(execution.task).definition;
+            const pty = await customExecution(taskDefinition);
+            this.terminalExt.attachPtyToTerminal(terminalId, pty);
+            if (pty.onDidClose) {
+                const disposable = pty.onDidClose((e: number | void = undefined) => {
+                    disposable.dispose();
+                    // eslint-disable-next-line no-void
+                    this.proxy.$customExecutionComplete(execution.id, e === void 0 ? undefined : e);
+                });
+            }
+        }
+        this.lastStartedTask = execution.id;
+
+        this.onDidExecuteTask.fire({
+            execution: this.getTaskExecution(execution)
+        });
+    }
+
+    get onDidEndTask(): Event<theia.TaskEndEvent> {
+        return this.onDidTerminateTask.event;
+    }
+
+    $onDidEndTask(id: number): void {
+        const taskExecution = this.executions.get(id);
+        if (!taskExecution) {
+            throw new Error(`Task execution with id ${id} is not found`);
+        }
+
+        this.executions.delete(id);
+
+        this.onDidTerminateTask.fire({
+            execution: taskExecution
+        });
+    }
+
+    get onDidStartTaskProcess(): Event<theia.TaskProcessStartEvent> {
+        return this.onDidExecuteTaskProcess.event;
+    }
+
+    $onDidStartTaskProcess(processId: number, executionDto: TaskExecutionDto): void {
+        this.onDidExecuteTaskProcess.fire({
+            processId,
+            execution: this.getTaskExecution(executionDto)
+        });
+    }
+
+    get onDidEndTaskProcess(): Event<theia.TaskProcessEndEvent> {
+        return this.onDidTerminateTaskProcess.event;
+    }
+
+    $onDidEndTaskProcess(exitCode: number, taskId: number): void {
+        const taskExecution = this.executions.get(taskId);
+        if (!taskExecution) {
+            throw new Error(`Task execution with id ${taskId} is not found`);
+        }
+
+        this.onDidTerminateTaskProcess.fire({
+            execution: taskExecution,
+            exitCode
+        });
+    }
+
+    registerTaskProvider(type: string, provider: theia.TaskProvider): theia.Disposable {
+        const callId = this.addNewAdapter(new TaskProviderAdapter(provider));
+        this.proxy.$registerTaskProvider(callId, type);
+        return this.createDisposable(callId);
+    }
+
+    async fetchTasks(filter?: theia.TaskFilter): Promise<theia.Task[]> {
+        const taskVersion = filter ? filter.version : undefined;
+        const taskType = filter ? filter.type : undefined;
+        const taskDtos = await this.proxy.$fetchTasks(taskVersion, taskType);
+        return taskDtos.map(dto => converter.toTask(dto));
+    }
+
+    async executeTask(task: theia.Task): Promise<theia.TaskExecution> {
+        const taskDto = converter.fromTask(task);
+        if (taskDto) {
+            // If this task is a custom execution, then we need to save it away
+            // in the provided custom execution map that is cleaned up after the
+            // task is executed.
+            if (CustomExecution.is(task.execution!)) {
+                taskDto.executionId = this.addCustomExecution(task.execution!.callback);
+            }
+            const executionDto = await this.proxy.$executeTask(taskDto);
+            if (executionDto) {
+                const taskExecution = this.getTaskExecution(executionDto);
+                return taskExecution;
+            }
+            throw new Error('Run task config does not return after being started');
+        }
+        throw new Error('Task was not successfully transformed into a task config');
+    }
+
+    $provideTasks(handle: number): Promise<TaskDto[] | undefined> {
+        const adapter = this.adaptersMap.get(handle);
+        if (adapter) {
+            return adapter.provideTasks(CancellationToken.None).then(tasks => {
+                if (tasks) {
+                    for (const task of tasks) {
+                        if (task.taskType === 'customExecution') {
+                            task.executionId = this.addCustomExecution(task.callback);
+                            task.callback = undefined;
+                        }
+                    }
+                }
+                return tasks;
+            });
+        } else {
+            return Promise.reject(new Error('No adapter found to provide tasks'));
+        }
+    }
+
+    $resolveTask(handle: number, task: TaskDto, token: theia.CancellationToken): Promise<TaskDto | undefined> {
+        const adapter = this.adaptersMap.get(handle);
+        if (adapter) {
+            return adapter.resolveTask(task, token).then(resolvedTask => {
+                if (resolvedTask && resolvedTask.taskType === 'customExecution') {
+                    resolvedTask.executionId = this.addCustomExecution(resolvedTask.callback);
+                    resolvedTask.callback = undefined;
+                }
+                return resolvedTask;
+            });
+        } else {
+            return Promise.reject(new Error('No adapter found to resolve task'));
+        }
+    }
+
+    private addNewAdapter(adapter: TaskProviderAdapter): number {
+        const callId = this.nextCallId();
+        this.adaptersMap.set(callId, adapter);
+        return callId;
+    }
+
+    private nextCallId(): number {
+        return this.callId++;
+    }
+
+    private createDisposable(callId: number): theia.Disposable {
+        return new Disposable(() => {
+            this.adaptersMap.delete(callId);
+            this.proxy.$unregister(callId);
+        });
+    }
+
+    // Initial `this.executions` map with the running tasks from the previous session
+    async $initLoadedTasks(taskExecutions: TaskExecutionDto[]): Promise<void> {
+        taskExecutions.forEach(execution => this.getTaskExecution(execution));
+    }
+
+    private getTaskExecution(execution: TaskExecutionDto): theia.TaskExecution {
+        const executionId = execution.id;
+        let result: theia.TaskExecution | undefined = this.executions.get(executionId);
+        if (result) {
+            return result;
+        }
+
+        result = {
+            task: converter.toTask(execution.task),
+            terminate: () => {
+                this.proxy.$terminateTask(executionId);
+            }
+        };
+        this.executions.set(executionId, result);
+        return result;
+    }
+
+    private addCustomExecution(callback: ExecutionCallback): string {
+        let id = this.customExecutionIds.get(callback);
+        if (!id) {
+            id = this.nextCallbackId();
+            this.customExecutionIds.set(callback, id);
+            this.customExecutionFunctions.set(id, callback);
+        }
+        return id;
+    }
+
+    private nextCallbackId(): string {
+        return this.callbackIdBase + this.callbackId++;
+    }
+}