@theia/task 1.45.0 → 1.46.0-next.72

package/src/browser/process/process-task-resolver.ts

@@ -1,89 +1,89 @@
-// *****************************************************************************
-// 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable, inject } from '@theia/core/shared/inversify';
-import { VariableResolverService } from '@theia/variable-resolver/lib/browser';
-import { TaskResolver } from '../task-contribution';
-import { TaskConfiguration } from '../../common/task-protocol';
-import { ProcessTaskConfiguration } from '../../common/process/task-protocol';
-import { TaskDefinitionRegistry } from '../task-definition-registry';
-import URI from '@theia/core/lib/common/uri';
-import { WorkspaceService } from '@theia/workspace/lib/browser';
-
-@injectable()
-export class ProcessTaskResolver implements TaskResolver {
-
-    @inject(VariableResolverService)
-    protected readonly variableResolverService: VariableResolverService;
-
-    @inject(TaskDefinitionRegistry)
-    protected readonly taskDefinitionRegistry: TaskDefinitionRegistry;
-
-    @inject(WorkspaceService)
-    protected readonly workspaceService: WorkspaceService;
-
-    /**
-     * Perform some adjustments to the task launch configuration, before sending
-     * it to the backend to be executed. We can make sure that parameters that
-     * are optional to the user but required by the server will be defined, with
-     * sane default values. Also, resolve all known variables, e.g. `${workspaceFolder}`.
-     */
-    async resolveTask(taskConfig: TaskConfiguration): Promise<TaskConfiguration> {
-        const type = taskConfig.taskType || taskConfig.type;
-        if (type !== 'process' && type !== 'shell') {
-            throw new Error('Unsupported task configuration type.');
-        }
-        const context = typeof taskConfig._scope === 'string' ? new URI(taskConfig._scope) : undefined;
-        const variableResolverOptions = {
-            context, configurationSection: 'tasks'
-        };
-        const processTaskConfig = taskConfig as ProcessTaskConfiguration;
-        let cwd = processTaskConfig.options && processTaskConfig.options.cwd;
-        if (!cwd) {
-            const rootURI = this.workspaceService.getWorkspaceRootUri(context);
-            if (rootURI) {
-                cwd = rootURI.toString();
-            }
-        }
-
-        const result: ProcessTaskConfiguration = {
-            ...processTaskConfig,
-            command: await this.variableResolverService.resolve(processTaskConfig.command, variableResolverOptions),
-            args: processTaskConfig.args ? await this.variableResolverService.resolve(processTaskConfig.args, variableResolverOptions) : undefined,
-            windows: processTaskConfig.windows ? {
-                command: await this.variableResolverService.resolve(processTaskConfig.windows.command, variableResolverOptions),
-                args: processTaskConfig.windows.args ? await this.variableResolverService.resolve(processTaskConfig.windows.args, variableResolverOptions) : undefined,
-                options: processTaskConfig.windows.options
-            } : undefined,
-            osx: processTaskConfig.osx ? {
-                command: await this.variableResolverService.resolve(processTaskConfig.osx.command, variableResolverOptions),
-                args: processTaskConfig.osx.args ? await this.variableResolverService.resolve(processTaskConfig.osx.args, variableResolverOptions) : undefined,
-                options: processTaskConfig.osx.options
-            } : undefined,
-            linux: processTaskConfig.linux ? {
-                command: await this.variableResolverService.resolve(processTaskConfig.linux.command, variableResolverOptions),
-                args: processTaskConfig.linux.args ? await this.variableResolverService.resolve(processTaskConfig.linux.args, variableResolverOptions) : undefined,
-                options: processTaskConfig.linux.options
-            } : undefined,
-            options: {
-                cwd: await this.variableResolverService.resolve(cwd, variableResolverOptions),
-                env: processTaskConfig.options?.env && await this.variableResolverService.resolve(processTaskConfig.options.env, variableResolverOptions),
-                shell: processTaskConfig.options && processTaskConfig.options.shell
-            }
-        };
-        return result;
-    }
-}
+// *****************************************************************************
+// 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable, inject } from '@theia/core/shared/inversify';
+import { VariableResolverService } from '@theia/variable-resolver/lib/browser';
+import { TaskResolver } from '../task-contribution';
+import { TaskConfiguration } from '../../common/task-protocol';
+import { ProcessTaskConfiguration } from '../../common/process/task-protocol';
+import { TaskDefinitionRegistry } from '../task-definition-registry';
+import URI from '@theia/core/lib/common/uri';
+import { WorkspaceService } from '@theia/workspace/lib/browser';
+
+@injectable()
+export class ProcessTaskResolver implements TaskResolver {
+
+    @inject(VariableResolverService)
+    protected readonly variableResolverService: VariableResolverService;
+
+    @inject(TaskDefinitionRegistry)
+    protected readonly taskDefinitionRegistry: TaskDefinitionRegistry;
+
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
+
+    /**
+     * Perform some adjustments to the task launch configuration, before sending
+     * it to the backend to be executed. We can make sure that parameters that
+     * are optional to the user but required by the server will be defined, with
+     * sane default values. Also, resolve all known variables, e.g. `${workspaceFolder}`.
+     */
+    async resolveTask(taskConfig: TaskConfiguration): Promise<TaskConfiguration> {
+        const type = taskConfig.taskType || taskConfig.type;
+        if (type !== 'process' && type !== 'shell') {
+            throw new Error('Unsupported task configuration type.');
+        }
+        const context = typeof taskConfig._scope === 'string' ? new URI(taskConfig._scope) : undefined;
+        const variableResolverOptions = {
+            context, configurationSection: 'tasks'
+        };
+        const processTaskConfig = taskConfig as ProcessTaskConfiguration;
+        let cwd = processTaskConfig.options && processTaskConfig.options.cwd;
+        if (!cwd) {
+            const rootURI = this.workspaceService.getWorkspaceRootUri(context);
+            if (rootURI) {
+                cwd = rootURI.toString();
+            }
+        }
+
+        const result: ProcessTaskConfiguration = {
+            ...processTaskConfig,
+            command: await this.variableResolverService.resolve(processTaskConfig.command, variableResolverOptions),
+            args: processTaskConfig.args ? await this.variableResolverService.resolve(processTaskConfig.args, variableResolverOptions) : undefined,
+            windows: processTaskConfig.windows ? {
+                command: await this.variableResolverService.resolve(processTaskConfig.windows.command, variableResolverOptions),
+                args: processTaskConfig.windows.args ? await this.variableResolverService.resolve(processTaskConfig.windows.args, variableResolverOptions) : undefined,
+                options: processTaskConfig.windows.options
+            } : undefined,
+            osx: processTaskConfig.osx ? {
+                command: await this.variableResolverService.resolve(processTaskConfig.osx.command, variableResolverOptions),
+                args: processTaskConfig.osx.args ? await this.variableResolverService.resolve(processTaskConfig.osx.args, variableResolverOptions) : undefined,
+                options: processTaskConfig.osx.options
+            } : undefined,
+            linux: processTaskConfig.linux ? {
+                command: await this.variableResolverService.resolve(processTaskConfig.linux.command, variableResolverOptions),
+                args: processTaskConfig.linux.args ? await this.variableResolverService.resolve(processTaskConfig.linux.args, variableResolverOptions) : undefined,
+                options: processTaskConfig.linux.options
+            } : undefined,
+            options: {
+                cwd: await this.variableResolverService.resolve(cwd, variableResolverOptions),
+                env: processTaskConfig.options?.env && await this.variableResolverService.resolve(processTaskConfig.options.env, variableResolverOptions),
+                shell: processTaskConfig.options && processTaskConfig.options.shell
+            }
+        };
+        return result;
+    }
+}

package/src/browser/provided-task-configurations.spec.ts

@@ -1,46 +1,46 @@
-// *****************************************************************************
-// Copyright (C) 2019 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { assert } from 'chai';
-import { Container } from '@theia/core/shared/inversify';
-import { ProvidedTaskConfigurations } from './provided-task-configurations';
-import { TaskDefinitionRegistry } from './task-definition-registry';
-import { TaskProviderRegistry } from './task-contribution';
-import { TaskConfiguration } from '../common';
-
-describe('provided-task-configurations', () => {
-    let container: Container;
-    beforeEach(() => {
-        container = new Container();
-        container.bind(ProvidedTaskConfigurations).toSelf().inSingletonScope();
-        container.bind(TaskProviderRegistry).toSelf().inSingletonScope();
-        container.bind(TaskDefinitionRegistry).toSelf().inSingletonScope();
-    });
-
-    it('provided-task-search', async () => {
-        const providerRegistry = container.get(TaskProviderRegistry);
-        providerRegistry.register('test', {
-            provideTasks(): Promise<TaskConfiguration[]> {
-                return Promise.resolve([{ type: 'test', label: 'task from test', _source: 'test', _scope: 'test' } as TaskConfiguration]);
-            }
-        });
-
-        const task = await container.get(ProvidedTaskConfigurations).getTask(1, 'test', 'task from test', 'test');
-        assert.isOk(task);
-        assert.equal(task!.type, 'test');
-        assert.equal(task!.label, 'task from test');
-    });
-});
+// *****************************************************************************
+// Copyright (C) 2019 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { assert } from 'chai';
+import { Container } from '@theia/core/shared/inversify';
+import { ProvidedTaskConfigurations } from './provided-task-configurations';
+import { TaskDefinitionRegistry } from './task-definition-registry';
+import { TaskProviderRegistry } from './task-contribution';
+import { TaskConfiguration } from '../common';
+
+describe('provided-task-configurations', () => {
+    let container: Container;
+    beforeEach(() => {
+        container = new Container();
+        container.bind(ProvidedTaskConfigurations).toSelf().inSingletonScope();
+        container.bind(TaskProviderRegistry).toSelf().inSingletonScope();
+        container.bind(TaskDefinitionRegistry).toSelf().inSingletonScope();
+    });
+
+    it('provided-task-search', async () => {
+        const providerRegistry = container.get(TaskProviderRegistry);
+        providerRegistry.register('test', {
+            provideTasks(): Promise<TaskConfiguration[]> {
+                return Promise.resolve([{ type: 'test', label: 'task from test', _source: 'test', _scope: 'test' } as TaskConfiguration]);
+            }
+        });
+
+        const task = await container.get(ProvidedTaskConfigurations).getTask(1, 'test', 'task from test', 'test');
+        assert.isOk(task);
+        assert.equal(task!.type, 'test');
+        assert.equal(task!.label, 'task from test');
+    });
+});