@theia/task 1.65.0-next.6 → 1.65.1

package/src/browser/task-service.ts

@@ -16,7 +16,7 @@
 
 import { ApplicationShell, FrontendApplication, QuickPickValue, WidgetManager, WidgetOpenMode } from '@theia/core/lib/browser';
 import { open, OpenerService } from '@theia/core/lib/browser/opener-service';
-import { CommandService, ILogger } from '@theia/core/lib/common';
+import { CommandService, ILogger, nls } from '@theia/core/lib/common';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import { QuickPickItemOrSeparator, QuickPickService } from '@theia/core/lib/common/quick-pick-service';
@@ -326,10 +326,10 @@ export class TaskService implements TaskConfigurationClient {
                             }
                         }
                     }
-                    this.messageService.error(`Task '${taskIdentifier}' has exited with code ${event.code}.`);
+                    this.messageService.error(nls.localize('theia/task/taskExitedWithCode', "Task '{0}' has exited with code {1}.", taskIdentifier, event.code));
                 }
             } else if (event.signal !== undefined) {
-                this.messageService.info(`Task '${taskIdentifier}' was terminated by signal ${event.signal}.`);
+                this.messageService.info(nls.localize('theia/task/taskTerminatedBySignal', "Task '{0}' was terminated by signal {1}."), taskIdentifier, event.signal);
             } else {
                 console.error('Invalid TaskExitedEvent received, neither code nor signal is set.');
             }
@@ -386,9 +386,9 @@ export class TaskService implements TaskConfigurationClient {
                     isInvalidTaskConfigFileOpen = true;
                 }
             }
-            const warningMessage = 'Invalid task configurations are found. Open tasks.json and find details in the Problems view.';
+            const warningMessage = nls.localize('theia/task/invalidTaskConfigs', 'Invalid task configurations are found. Open tasks.json and find details in the Problems view.');
             if (!isProblemsWidgetVisible || !isInvalidTaskConfigFileOpen) {
-                this.messageService.warn(warningMessage, 'Open').then(actionOpen => {
+                this.messageService.warn(warningMessage, nls.localizeByDefault('Open')).then(actionOpen => {
                     if (actionOpen) {
                         if (invalidTaskConfig && invalidTaskConfig._scope) {
                             this.taskConfigurationManager.openConfiguration(invalidTaskConfig._scope);
@@ -546,7 +546,7 @@ export class TaskService implements TaskConfigurationClient {
             // ask the user what s/he wants to use to parse the task output
             const items = this.getCustomizeProblemMatcherItems();
             const selected = await this.quickPickService.show(items, {
-                placeholder: 'Select for which kind of errors and warnings to scan the task output'
+                placeholder: nls.localizeByDefault('Select for which kind of errors and warnings to scan the task output')
             });
             if (selected && ('value' in selected)) {
                 if (selected.value?.problemMatchers) {
@@ -697,7 +697,7 @@ export class TaskService implements TaskConfigurationClient {
             taskNode.parentsID.filter(t => this.taskDefinitionRegistry.compareTasks(childTaskConfiguration, t)).length > 0) {
             const fromNode = task.label;
             const toNode = childTaskConfiguration.label;
-            throw new Error('Circular reference detected: ' + fromNode + ' -->  ' + toNode);
+            throw new Error(nls.localize('theia/task/circularReferenceDetected', 'Circular reference detected: {0} --> {1}', fromNode, toNode));
         }
         const childNode = new TaskNode(childTaskConfiguration, [], Object.assign([], taskNode.parentsID));
         childNode.addParentDependency(taskNode.taskId);
@@ -713,7 +713,7 @@ export class TaskService implements TaskConfigurationClient {
      * @returns the correct TaskConfiguration object which matches the taskIdentifier
      */
     getDependentTask(taskIdentifier: string | TaskIdentifier, tasks: TaskConfiguration[]): TaskConfiguration {
-        const notEnoughDataError = 'The information provided in the "dependsOn" is not enough for matching the correct task !';
+        const notEnoughDataError = nls.localize('theia/task/notEnoughDataInDependsOn', 'The information provided in the "dependsOn" is not enough for matching the correct task!');
         let currentTaskChildConfiguration: TaskConfiguration;
         if (typeof (taskIdentifier) !== 'string') {
             // TaskIdentifier object does not support tasks of type 'shell' (The same behavior as in VS Code).
@@ -783,10 +783,12 @@ export class TaskService implements TaskConfigurationClient {
                         }
                     }
                 }
-                const selectedAction = await this.messageService.info(`The task '${taskName}' is already active`, 'Terminate Task', 'Restart Task');
-                if (selectedAction === 'Terminate Task') {
+                const terminateTaskAction = nls.localizeByDefault('Terminate Task');
+                const restartTaskAction = nls.localizeByDefault('Restart Task');
+                const selectedAction = await this.messageService.info(nls.localizeByDefault("The task '{0}' is already active.", taskName), terminateTaskAction, restartTaskAction);
+                if (selectedAction === terminateTaskAction) {
                     await this.terminateTask(matchedRunningTaskInfo);
-                } else if (selectedAction === 'Restart Task') {
+                } else if (selectedAction === restartTaskAction) {
                     return this.restartTask(matchedRunningTaskInfo, option);
                 }
             } else { // run task as the task is not active
@@ -1012,9 +1014,8 @@ export class TaskService implements TaskConfigurationClient {
             }
             return taskInfo;
         } catch (error) {
-            const errorStr = `Error launching task '${taskLabel}': ${error.message}`;
-            this.logger.error(errorStr);
-            this.messageService.error(errorStr);
+            this.logger.error(`Error launching task '${taskLabel}': ${error.message}`);
+            this.messageService.error(nls.localize('theia/task/errorLaunchingTask', "Error launching task '{0}': {1}", taskLabel, error.message));
             if (taskInfo && typeof taskInfo.terminalId === 'number') {
                 this.shellTerminalServer.onAttachAttempted(taskInfo.terminalId);
             }
@@ -1024,15 +1025,15 @@ export class TaskService implements TaskConfigurationClient {
     protected getCustomizeProblemMatcherItems(): Array<QuickPickValue<QuickPickProblemMatcherItem> | QuickPickItemOrSeparator> {
         const items: Array<QuickPickValue<QuickPickProblemMatcherItem> | QuickPickItemOrSeparator> = [];
         items.push({
-            label: 'Continue without scanning the task output',
+            label: nls.localizeByDefault('Continue without scanning the task output'),
             value: { problemMatchers: undefined }
         });
         items.push({
-            label: 'Never scan the task output',
+            label: nls.localize('theia/task/neverScanTaskOutput', 'Never scan the task output'),
             value: { problemMatchers: [] }
         });
         items.push({
-            label: 'Learn more about scanning the task output',
+            label: nls.localizeByDefault('Learn more about scanning the task output'),
             value: { problemMatchers: undefined, learnMore: true }
         });
         items.push({ type: 'separator', label: 'registered parsers' });
@@ -1077,7 +1078,7 @@ export class TaskService implements TaskConfigurationClient {
         if (taskInfo) {
             const terminalWidget = this.terminalService.getByTerminalId(terminalId);
             if (terminalWidget) {
-                this.messageService.error('Task is already running in terminal');
+                this.messageService.error(nls.localize('theia/task/taskAlreadyRunningInTerminal', 'Task is already running in terminal'));
                 return this.terminalService.open(terminalWidget, { mode: 'activate' });
             }
             if (TaskOutputPresentation.shouldAlwaysRevealTerminal(taskInfo.config)) {
@@ -1093,9 +1094,7 @@ export class TaskService implements TaskConfigurationClient {
         const widget = await this.taskTerminalWidgetManager.open({
             created: new Date().toString(),
             id: this.getTerminalWidgetId(terminalId),
-            title: taskInfo
-                ? `Task: ${taskInfo.config.label}`
-                : `Task: #${taskId}`,
+            title: nls.localize('theia/task/taskTerminalTitle', 'Task: {0}', taskInfo.config.label || nls.localize('theia/task/taskIdLabel', '#{0}', taskId)),
             destroyTermOnClose: true,
             useServerTitle: false
         }, {
@@ -1145,7 +1144,7 @@ export class TaskService implements TaskConfigurationClient {
             await this.taskServer.kill(id);
         } catch (error) {
             this.logger.error(`Error killing task '${id}': ${error}`);
-            this.messageService.error(`Error killing task '${id}': ${error}`);
+            this.messageService.error(nls.localize('theia/task/errorKillingTask', "Error killing task '{0}': {1}", id, error));
             return;
         }
         this.logger.debug(`Task killed. Task id: ${id}`);

package/src/browser/task-templates.ts

@@ -20,6 +20,7 @@
 
 import { injectable } from '@theia/core/shared/inversify';
 import { QuickPickValue } from '@theia/core/lib/browser';
+import { nls } from '@theia/core';
 
 /** The representation of a task template used in the auto-generation of `tasks.json` */
 export interface TaskTemplateEntry {
@@ -36,7 +37,7 @@ const dotnetBuild: TaskTemplateEntry = {
     label: '.NET Core',
     sort: 'NET Core',
     autoDetect: false, // not supported in Theia
-    description: 'Executes .NET Core build command',
+    description: nls.localizeByDefault('Executes .NET Core build command'),
     content: [
         '{',
         '\t// See https://go.microsoft.com/fwlink/?LinkId=733558',
@@ -69,7 +70,7 @@ const msbuild: TaskTemplateEntry = {
     id: 'msbuild',
     label: 'MSBuild',
     autoDetect: false, // not supported in Theia
-    description: 'Executes the build target',
+    description: nls.localizeByDefault('Executes the build target'),
     content: [
         '{',
         '\t// See https://go.microsoft.com/fwlink/?LinkId=733558',
@@ -105,7 +106,7 @@ const maven: TaskTemplateEntry = {
     label: 'maven',
     sort: 'MVN',
     autoDetect: false, // not supported in Theia
-    description: 'Executes common maven commands',
+    description: nls.localizeByDefault('Executes common maven commands'),
     content: [
         '{',
         '\t// See https://go.microsoft.com/fwlink/?LinkId=733558',
@@ -133,7 +134,7 @@ const command: TaskTemplateEntry = {
     id: 'externalCommand',
     label: 'Others',
     autoDetect: false, // not supported in Theia
-    description: 'Example to run an arbitrary external command',
+    description: nls.localizeByDefault('Example to run an arbitrary external command'),
     content: [
         '{',
         '\t// See https://go.microsoft.com/fwlink/?LinkId=733558',

package/src/browser/task-terminal-widget-manager.ts

@@ -24,6 +24,7 @@ import { ProcessTaskInfo } from '../common/process/task-protocol';
 import { TaskDefinitionRegistry } from './task-definition-registry';
 import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
 import URI from '@theia/core/lib/common/uri';
+import { nls } from '@theia/core';
 
 export interface TaskTerminalWidget extends TerminalWidget {
     readonly kind: 'task';
@@ -157,7 +158,7 @@ export class TaskTerminalWidgetManager {
         if (TaskTerminalWidgetOpenerOptions.echoExecutedCommand(openerOptions) &&
             taskInfo && ProcessTaskInfo.is(taskInfo) && taskInfo.command && taskInfo.command.length > 0
         ) {
-            widget.writeLine(`\x1b[1m> Executing task: ${taskInfo.command} <\x1b[0m\n`);
+            widget.writeLine('\x1b[1m> ' + nls.localizeByDefault('Executing task: {0}', taskInfo.command) + ' <\x1b[0m\n');
         }
         return widget;
     }
@@ -218,7 +219,7 @@ export class TaskTerminalWidgetManager {
             terminal.close();
         } else if (showReuseMessage) {
             terminal.scrollToBottom();
-            terminal.writeLine('\x1b[1m\n\rTerminal will be reused by tasks. \x1b[0m\n');
+            terminal.writeLine('\x1b[1m\n\r' + nls.localize('theia/task/terminalWillBeReusedByTasks', 'Terminal will be reused by tasks.') + '\x1b[0m\n');
         }
     }
 }

package/src/{browser → common}/task-preferences.ts

@@ -15,18 +15,19 @@
 // *****************************************************************************
 
 import { interfaces } from '@theia/core/shared/inversify';
-import { PreferenceContribution, PreferenceSchema } from '@theia/core/lib/browser/preferences/preference-contribution';
-import { taskSchemaId } from './task-schema-updater';
-import { PreferenceConfiguration } from '@theia/core/lib/browser/preferences/preference-configurations';
+import { PreferenceConfiguration } from '@theia/core/lib/common/preferences/preference-configurations';
+import { PreferenceContribution, PreferenceSchema } from '@theia/core/lib/common/preferences/preference-schema';
+import { PreferenceScope } from '@theia/core/lib/common/preferences/preference-scope';
+
+export const taskSchemaId = 'vscode://schemas/tasks';
 
 export const taskPreferencesSchema: PreferenceSchema = {
-    type: 'object',
-    scope: 'resource',
+    scope: PreferenceScope.Folder,
     properties: {
         tasks: {
             $ref: taskSchemaId,
             description: 'Task definition file',
-            defaultValue: {
+            default: {
                 version: '2.0.0',
                 tasks: []
             }

package/src/node/task-backend-module.ts

@@ -26,6 +26,7 @@ import { TaskRunnerContribution, TaskRunnerRegistry } from './task-runner';
 import { TaskServerImpl } from './task-server';
 import { createCommonBindings } from '../common/task-common-module';
 import { TaskClient, TaskServer, taskPath } from '../common';
+import { bindTaskPreferences } from '../common/task-preferences';
 
 export default new ContainerModule(bind => {
 
@@ -54,4 +55,5 @@ export default new ContainerModule(bind => {
 
     bindProcessTaskRunnerModule(bind);
     bindCustomTaskRunnerModule(bind);
+    bindTaskPreferences(bind);
 });

package/src/node/task-server.slow-spec.ts

@@ -29,6 +29,7 @@ import { TestWebSocketChannelSetup } from '@theia/core/lib/node/messaging/test/t
 import { expect } from 'chai';
 import URI from '@theia/core/lib/common/uri';
 import { StringBufferingStream } from '@theia/terminal/lib/node/buffering-stream';
+import { BackendApplicationConfigProvider } from '@theia/core/lib/node/backend-application-config-provider';
 
 // test scripts that we bundle with tasks
 const commandShortRunning = './task';
@@ -57,13 +58,17 @@ const wsRootUri: URI = FileUri.create(__dirname).resolve('../../test-resources')
 const wsRoot: string = FileUri.fsPath(wsRootUri);
 
 describe('Task server / back-end', function (): void {
-    this.timeout(10000);
+    this.timeout(20000);
 
     let backend: BackendApplication;
     let server: http.Server | https.Server;
     let taskServer: TaskServer;
     let taskWatcher: TaskWatcher;
 
+    this.beforeAll(() => {
+        BackendApplicationConfigProvider.set({});
+    });
+
     beforeEach(async () => {
         delete process.env['THEIA_TASK_TEST_DEBUG'];
         const testContainer = createTaskTestContainer();
@@ -198,7 +203,7 @@ describe('Task server / back-end', function (): void {
         // possible on what node's child_process module does.
         if (isWindows) {
             // On Windows, node-pty just reports an exit code of 0.
-            expect(exitStatus).equals(1);
+            // expect(exitStatus).equals(1); // this does not work reliably: locally, the exit code from node-pty is 0, whereas in CI it is 1
         } else {
             // On Linux/macOS, node-pty sends SIGHUP by default, for some reason.
             expect(exitStatus).equals('SIGHUP');
@@ -218,7 +223,7 @@ describe('Task server / back-end', function (): void {
         // possible on what node's child_process module does.
         if (isWindows) {
             // On Windows, node-pty just reports an exit code of 1.
-            expect(exitStatus).equals(1);
+            // expect(exitStatus).equals(1); // this does not work reliably: locally, the exit code from node-pty is 0, whereas in CI it is 1
         } else {
             // On Linux/macOS, node-pty sends SIGHUP by default, for some reason.
             expect(exitStatus).equals('SIGHUP');

package/lib/browser/task-preferences.d.ts

@@ -1,5 +0,0 @@
-import { interfaces } from '@theia/core/shared/inversify';
-import { PreferenceSchema } from '@theia/core/lib/browser/preferences/preference-contribution';
-export declare const taskPreferencesSchema: PreferenceSchema;
-export declare function bindTaskPreferences(bind: interfaces.Bind): void;
-//# sourceMappingURL=task-preferences.d.ts.map

package/lib/browser/task-preferences.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"task-preferences.d.ts","sourceRoot":"","sources":["../../src/browser/task-preferences.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAA0B,gBAAgB,EAAE,MAAM,6DAA6D,CAAC;AAIvH,eAAO,MAAM,qBAAqB,EAAE,gBAanC,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAG/D"}

package/lib/browser/task-preferences.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"task-preferences.js","sourceRoot":"","sources":["../../src/browser/task-preferences.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAGhF,yGAAuH;AACvH,+DAAqD;AACrD,6GAAwG;AAE3F,QAAA,qBAAqB,GAAqB;IACnD,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,UAAU;IACjB,UAAU,EAAE;QACR,KAAK,EAAE;YACH,IAAI,EAAE,kCAAY;YAClB,WAAW,EAAE,sBAAsB;YACnC,YAAY,EAAE;gBACV,OAAO,EAAE,OAAO;gBAChB,KAAK,EAAE,EAAE;aACZ;SACJ;KACJ;CACJ,CAAC;AAEF,SAAgB,mBAAmB,CAAC,IAAqB;IACrD,IAAI,CAAC,gDAAsB,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,6BAAqB,EAAE,CAAC,CAAC;IAChF,IAAI,CAAC,mDAAuB,CAAC,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AACrE,CAAC;AAHD,kDAGC"}