@theia/task 1.65.0-next.6 → 1.65.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (55) hide show
  1. package/lib/browser/quick-open-task.d.ts +4 -3
  2. package/lib/browser/quick-open-task.d.ts.map +1 -1
  3. package/lib/browser/quick-open-task.js +36 -24
  4. package/lib/browser/quick-open-task.js.map +1 -1
  5. package/lib/browser/task-configuration-manager.d.ts +5 -7
  6. package/lib/browser/task-configuration-manager.d.ts.map +1 -1
  7. package/lib/browser/task-configuration-manager.js +18 -29
  8. package/lib/browser/task-configuration-manager.js.map +1 -1
  9. package/lib/browser/task-configuration-model.d.ts +5 -4
  10. package/lib/browser/task-configuration-model.d.ts.map +1 -1
  11. package/lib/browser/task-configuration-model.js +16 -13
  12. package/lib/browser/task-configuration-model.js.map +1 -1
  13. package/lib/browser/task-frontend-module.js +1 -1
  14. package/lib/browser/task-frontend-module.js.map +1 -1
  15. package/lib/browser/task-problem-matcher-registry.d.ts.map +1 -1
  16. package/lib/browser/task-problem-matcher-registry.js +8 -8
  17. package/lib/browser/task-problem-matcher-registry.js.map +1 -1
  18. package/lib/browser/task-schema-updater.d.ts +0 -1
  19. package/lib/browser/task-schema-updater.d.ts.map +1 -1
  20. package/lib/browser/task-schema-updater.js +87 -88
  21. package/lib/browser/task-schema-updater.js.map +1 -1
  22. package/lib/browser/task-service.d.ts.map +1 -1
  23. package/lib/browser/task-service.js +20 -21
  24. package/lib/browser/task-service.js.map +1 -1
  25. package/lib/browser/task-templates.d.ts.map +1 -1
  26. package/lib/browser/task-templates.js +5 -4
  27. package/lib/browser/task-templates.js.map +1 -1
  28. package/lib/browser/task-terminal-widget-manager.d.ts.map +1 -1
  29. package/lib/browser/task-terminal-widget-manager.js +3 -2
  30. package/lib/browser/task-terminal-widget-manager.js.map +1 -1
  31. package/lib/common/task-preferences.d.ts +6 -0
  32. package/lib/common/task-preferences.d.ts.map +1 -0
  33. package/lib/{browser → common}/task-preferences.js +9 -9
  34. package/lib/common/task-preferences.js.map +1 -0
  35. package/lib/node/task-backend-module.d.ts.map +1 -1
  36. package/lib/node/task-backend-module.js +2 -0
  37. package/lib/node/task-backend-module.js.map +1 -1
  38. package/lib/node/task-server.slow-spec.js +7 -3
  39. package/lib/node/task-server.slow-spec.js.map +1 -1
  40. package/package.json +13 -13
  41. package/src/browser/quick-open-task.ts +35 -24
  42. package/src/browser/task-configuration-manager.ts +15 -20
  43. package/src/browser/task-configuration-model.ts +18 -15
  44. package/src/browser/task-frontend-module.ts +1 -1
  45. package/src/browser/task-problem-matcher-registry.ts +9 -9
  46. package/src/browser/task-schema-updater.ts +91 -87
  47. package/src/browser/task-service.ts +21 -22
  48. package/src/browser/task-templates.ts +5 -4
  49. package/src/browser/task-terminal-widget-manager.ts +3 -2
  50. package/src/{browser → common}/task-preferences.ts +7 -6
  51. package/src/node/task-backend-module.ts +2 -0
  52. package/src/node/task-server.slow-spec.ts +8 -3
  53. package/lib/browser/task-preferences.d.ts +0 -5
  54. package/lib/browser/task-preferences.d.ts.map +0 -1
  55. package/lib/browser/task-preferences.js.map +0 -1
@@ -26,6 +26,7 @@ const terminal_protocol_1 = require("@theia/terminal/lib/common/terminal-protoco
26
26
  const test_web_socket_channel_1 = require("@theia/core/lib/node/messaging/test/test-web-socket-channel");
27
27
  const chai_1 = require("chai");
28
28
  const buffering_stream_1 = require("@theia/terminal/lib/node/buffering-stream");
29
+ const backend_application_config_provider_1 = require("@theia/core/lib/node/backend-application-config-provider");
29
30
  // test scripts that we bundle with tasks
30
31
  const commandShortRunning = './task';
31
32
  const commandShortRunningOsx = './task-osx';
@@ -47,11 +48,14 @@ const script2 = './test-arguments-2.js';
47
48
  const wsRootUri = node_1.FileUri.create(__dirname).resolve('../../test-resources');
48
49
  const wsRoot = node_1.FileUri.fsPath(wsRootUri);
49
50
  describe('Task server / back-end', function () {
50
- this.timeout(10000);
51
+ this.timeout(20000);
51
52
  let backend;
52
53
  let server;
53
54
  let taskServer;
54
55
  let taskWatcher;
56
+ this.beforeAll(() => {
57
+ backend_application_config_provider_1.BackendApplicationConfigProvider.set({});
58
+ });
55
59
  beforeEach(async () => {
56
60
  delete process.env['THEIA_TASK_TEST_DEBUG'];
57
61
  const testContainer = (0, task_test_container_1.createTaskTestContainer)();
@@ -169,7 +173,7 @@ describe('Task server / back-end', function () {
169
173
  // possible on what node's child_process module does.
170
174
  if (os_1.isWindows) {
171
175
  // On Windows, node-pty just reports an exit code of 0.
172
- (0, chai_1.expect)(exitStatus).equals(1);
176
+ // expect(exitStatus).equals(1); // this does not work reliably: locally, the exit code from node-pty is 0, whereas in CI it is 1
173
177
  }
174
178
  else {
175
179
  // On Linux/macOS, node-pty sends SIGHUP by default, for some reason.
@@ -187,7 +191,7 @@ describe('Task server / back-end', function () {
187
191
  // possible on what node's child_process module does.
188
192
  if (os_1.isWindows) {
189
193
  // On Windows, node-pty just reports an exit code of 1.
190
- (0, chai_1.expect)(exitStatus).equals(1);
194
+ // expect(exitStatus).equals(1); // this does not work reliably: locally, the exit code from node-pty is 0, whereas in CI it is 1
191
195
  }
192
196
  else {
193
197
  // On Linux/macOS, node-pty sends SIGHUP by default, for some reason.
@@ -1 +1 @@
1
- {"version":3,"file":"task-server.slow-spec.js","sourceRoot":"","sources":["../../src/node/task-server.slow-spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"task-server.slow-spec.js","sourceRoot":"","sources":["../../src/node/task-server.slow-spec.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,19 +1,19 @@
1
1
  {
2
2
  "name": "@theia/task",
3
- "version": "1.65.0-next.6+4384a9461",
3
+ "version": "1.65.1",
4
4
  "description": "Theia - Task extension. This extension adds support for executing raw or terminal processes in the backend.",
5
5
  "dependencies": {
6
- "@theia/core": "1.65.0-next.6+4384a9461",
7
- "@theia/editor": "1.65.0-next.6+4384a9461",
8
- "@theia/filesystem": "1.65.0-next.6+4384a9461",
9
- "@theia/markers": "1.65.0-next.6+4384a9461",
10
- "@theia/monaco": "1.65.0-next.6+4384a9461",
6
+ "@theia/core": "1.65.1",
7
+ "@theia/editor": "1.65.1",
8
+ "@theia/filesystem": "1.65.1",
9
+ "@theia/markers": "1.65.1",
10
+ "@theia/monaco": "1.65.1",
11
11
  "@theia/monaco-editor-core": "1.96.302",
12
- "@theia/process": "1.65.0-next.6+4384a9461",
13
- "@theia/terminal": "1.65.0-next.6+4384a9461",
14
- "@theia/userstorage": "1.65.0-next.6+4384a9461",
15
- "@theia/variable-resolver": "1.65.0-next.6+4384a9461",
16
- "@theia/workspace": "1.65.0-next.6+4384a9461",
12
+ "@theia/process": "1.65.1",
13
+ "@theia/terminal": "1.65.1",
14
+ "@theia/userstorage": "1.65.1",
15
+ "@theia/variable-resolver": "1.65.1",
16
+ "@theia/workspace": "1.65.1",
17
17
  "async-mutex": "^0.3.1",
18
18
  "jsonc-parser": "^2.2.0",
19
19
  "p-debounce": "^2.1.0",
@@ -53,10 +53,10 @@
53
53
  "watch": "theiaext watch"
54
54
  },
55
55
  "devDependencies": {
56
- "@theia/ext-scripts": "1.64.0"
56
+ "@theia/ext-scripts": "1.65.1"
57
57
  },
58
58
  "nyc": {
59
59
  "extends": "../../configs/nyc.json"
60
60
  },
61
- "gitHead": "4384a946123dd1b41e65708e58928fc1af707c8d"
61
+ "gitHead": "ed70d58fe5ef87606f903ea92fcb684e83f5354f"
62
62
  }
@@ -19,7 +19,7 @@ import { TaskService } from './task-service';
19
19
  import { TaskInfo, TaskConfiguration, TaskCustomization, TaskScope, TaskConfigurationScope, TaskDefinition } from '../common/task-protocol';
20
20
  import { TaskDefinitionRegistry } from './task-definition-registry';
21
21
  import URI from '@theia/core/lib/common/uri';
22
- import { LabelProvider, QuickAccessProvider, QuickAccessRegistry, QuickInputService, QuickPick, PreferenceService } from '@theia/core/lib/browser';
22
+ import { LabelProvider, QuickAccessProvider, QuickAccessRegistry, QuickInputService, QuickPick } from '@theia/core/lib/browser';
23
23
  import { WorkspaceService } from '@theia/workspace/lib/browser';
24
24
  import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
25
25
  import { ALL_TASK_TYPES } from './provided-task-configurations';
@@ -28,13 +28,13 @@ import { TaskSourceResolver } from './task-source-resolver';
28
28
  import { TaskConfigurationManager } from './task-configuration-manager';
29
29
  import { filterItems, QuickInputButton, QuickPickItem, QuickPickItemOrSeparator, QuickPicks, QuickPickInput, QuickPickValue } from
30
30
  '@theia/core/lib/browser/quick-input/quick-input-service';
31
- import { CancellationToken } from '@theia/core/lib/common';
31
+ import { CancellationToken, PreferenceService } from '@theia/core/lib/common';
32
32
  import { nls } from '@theia/core/lib/common/nls';
33
33
  import { TriggerAction } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/browser/pickerQuickAccess';
34
34
 
35
35
  export namespace ConfigureTaskAction {
36
36
  export const ID = 'workbench.action.tasks.configureTaskRunner';
37
- export const TEXT = 'Configure Task';
37
+ export const TEXT = nls.localizeByDefault('Configure Task');
38
38
  }
39
39
 
40
40
  export type TaskEntry = QuickPickItemOrSeparator | QuickPickValue<string>;
@@ -47,12 +47,13 @@ export namespace TaskEntry {
47
47
  export const CHOOSE_TASK = nls.localizeByDefault('Select the task to run');
48
48
  export const CONFIGURE_A_TASK = nls.localizeByDefault('Configure a Task');
49
49
  export const NO_TASK_TO_RUN = nls.localize('theia/task/noTaskToRun', 'No task to run found. Configure Tasks...');
50
+ export const NO_TASKS_FOUND = nls.localize('theia/task/noTasksFound', 'No tasks found');
50
51
  export const SHOW_ALL = nls.localizeByDefault('Show All Tasks...');
51
52
 
52
53
  @injectable()
53
54
  export class QuickOpenTask implements QuickAccessProvider {
54
55
  static readonly PREFIX = 'task ';
55
- readonly description: string = 'Run Task';
56
+ readonly description: string = nls.localizeByDefault('Run Task');
56
57
  protected items: Array<TaskEntry> = [];
57
58
 
58
59
  @inject(TaskService)
@@ -98,8 +99,8 @@ export class QuickOpenTask implements QuickAccessProvider {
98
99
  const isMulti: boolean = this.workspaceService.isMultiRootWorkspaceOpened;
99
100
  this.items = [];
100
101
 
101
- const filteredRecentTasksItems = this.getItems(filteredRecentTasks, 'recently used tasks', token, isMulti);
102
- const filteredConfiguredTasksItems = this.getItems(filteredConfiguredTasks, 'configured tasks', token, isMulti, {
102
+ const filteredRecentTasksItems = this.getItems(filteredRecentTasks, nls.localizeByDefault('recently used tasks'), token, isMulti);
103
+ const filteredConfiguredTasksItems = this.getItems(filteredConfiguredTasks, nls.localizeByDefault('configured tasks'), token, isMulti, {
103
104
  label: `$(plus) ${CONFIGURE_A_TASK}`,
104
105
  execute: () => this.configure()
105
106
  });
@@ -238,7 +239,7 @@ export class QuickOpenTask implements QuickAccessProvider {
238
239
  this.taskService.getRunningTasks().then(tasks => {
239
240
  if (!tasks.length) {
240
241
  this.items.push({
241
- label: 'No tasks found',
242
+ label: NO_TASKS_FOUND,
242
243
  });
243
244
  } else {
244
245
  tasks.forEach((task: TaskInfo) => {
@@ -259,7 +260,7 @@ export class QuickOpenTask implements QuickAccessProvider {
259
260
  }
260
261
  if (this.items.length === 0) {
261
262
  this.items.push(({
262
- label: 'No tasks found'
263
+ label: NO_TASKS_FOUND
263
264
  }));
264
265
  }
265
266
  this.quickInputService?.showQuickPick(this.items, { placeholder: CHOOSE_TASK });
@@ -306,7 +307,7 @@ export class QuickOpenTask implements QuickAccessProvider {
306
307
  const { configUri } = this.preferences.resolve('tasks', [], rootFolder);
307
308
  const existTaskConfigFile = !!configUri;
308
309
  items.push(({
309
- label: existTaskConfigFile ? 'Open tasks.json file' : 'Create tasks.json file from template',
310
+ label: existTaskConfigFile ? nls.localizeByDefault('Open tasks.json file') : nls.localizeByDefault('Create tasks.json file from template'),
310
311
  execute: () => {
311
312
  setTimeout(() => this.taskConfigurationManager.openConfiguration(rootFolder));
312
313
  }
@@ -322,7 +323,7 @@ export class QuickOpenTask implements QuickAccessProvider {
322
323
 
323
324
  if (items.length === 0) {
324
325
  items.push(({
325
- label: 'No tasks found'
326
+ label: NO_TASKS_FOUND
326
327
  }));
327
328
  }
328
329
 
@@ -385,7 +386,9 @@ export class QuickOpenTask implements QuickAccessProvider {
385
386
  this.items = buildOrTestTasks;
386
387
  } else { // no build / test tasks, display an action item to configure the build / test task
387
388
  this.items = [({
388
- label: `No ${buildOrTestType} task to run found. Configure ${buildOrTestType.charAt(0).toUpperCase() + buildOrTestType.slice(1)} Task...`,
389
+ label: shouldRunBuildTask
390
+ ? nls.localizeByDefault('No build task to run found. Configure Build Task...')
391
+ : nls.localizeByDefault('No test task to run found. Configure Tasks...'),
389
392
  execute: () => {
390
393
  this.doInit(token).then(() => {
391
394
  // update the `tasks.json` file, instead of running the task itself
@@ -400,20 +403,28 @@ export class QuickOpenTask implements QuickAccessProvider {
400
403
  this.taskDefinitionRegistry,
401
404
  this.taskSourceResolver
402
405
  ));
403
- this.quickInputService?.showQuickPick(this.items, { placeholder: `Select the task to be used as the default ${buildOrTestType} task` });
406
+ this.quickInputService?.showQuickPick(this.items, {
407
+ placeholder: shouldRunBuildTask
408
+ ? nls.localizeByDefault('Select the task to be used as the default build task')
409
+ : nls.localizeByDefault('Select the task to be used as the default test task')
410
+ });
404
411
  });
405
412
  }
406
413
  })];
407
414
  }
408
415
  } else { // no tasks are currently present, prompt users if they'd like to configure a task.
409
416
  this.items = [{
410
- label: `No ${buildOrTestType} task to run found. Configure ${buildOrTestType.charAt(0).toUpperCase() + buildOrTestType.slice(1)} Task...`,
417
+ label: shouldRunBuildTask
418
+ ? nls.localizeByDefault('No build task to run found. Configure Build Task...')
419
+ : nls.localizeByDefault('No test task to run found. Configure Tasks...'),
411
420
  execute: () => this.configure()
412
421
  }];
413
422
  }
414
423
 
415
424
  this.quickInputService?.showQuickPick(this.items, {
416
- placeholder: `Select the ${buildOrTestType} task to run`,
425
+ placeholder: shouldRunBuildTask
426
+ ? nls.localizeByDefault('Select the build task to run')
427
+ : nls.localizeByDefault('Select the test task to run'),
417
428
  onDidTriggerItemButton: ({ item }) => this.onDidTriggerGearIcon(item)
418
429
  });
419
430
  }
@@ -427,8 +438,8 @@ export class QuickOpenTask implements QuickAccessProvider {
427
438
  this.quickAccessRegistry.registerQuickAccessProvider({
428
439
  getInstance: () => this,
429
440
  prefix: QuickOpenTask.PREFIX,
430
- placeholder: 'Select the task to run',
431
- helpEntries: [{ description: 'Run Task', needsEditor: false }]
441
+ placeholder: nls.localizeByDefault('Select the task to run'),
442
+ helpEntries: [{ description: nls.localizeByDefault('Run Task'), needsEditor: false }]
432
443
  });
433
444
  }
434
445
 
@@ -442,7 +453,7 @@ export class QuickOpenTask implements QuickAccessProvider {
442
453
  new TaskRunQuickOpenItem(token, task, this.taskService, isMulti, this.taskDefinitionRegistry, this.taskNameResolver,
443
454
  this.taskSourceResolver, this.taskConfigurationManager, [{
444
455
  iconClass: 'codicon-gear',
445
- tooltip: 'Configure Task',
456
+ tooltip: nls.localizeByDefault('Configure Task'),
446
457
  }])
447
458
  ).sort((t1, t2) => {
448
459
  let result = (t1.description ?? '').localeCompare(t2.description ?? '');
@@ -652,7 +663,7 @@ export class TaskTerminateQuickOpen {
652
663
  const isMulti: boolean = this.workspaceService.isMultiRootWorkspaceOpened;
653
664
  if (runningTasks.length <= 0) {
654
665
  items.push(({
655
- label: 'No task is currently running',
666
+ label: nls.localizeByDefault('No task is currently running'),
656
667
  }));
657
668
  } else {
658
669
  runningTasks.forEach((task: TaskInfo) => {
@@ -669,7 +680,7 @@ export class TaskTerminateQuickOpen {
669
680
  });
670
681
  if (runningTasks.length > 1) {
671
682
  items.push(({
672
- label: 'All running tasks',
683
+ label: nls.localizeByDefault('All Running Tasks'),
673
684
  execute: () => {
674
685
  runningTasks.forEach((t: TaskInfo) => {
675
686
  this.taskService.kill(t.taskId);
@@ -683,7 +694,7 @@ export class TaskTerminateQuickOpen {
683
694
 
684
695
  async open(): Promise<void> {
685
696
  const items = await this.getItems();
686
- this.quickInputService?.showQuickPick(items, { placeholder: 'Select task to terminate' });
697
+ this.quickInputService?.showQuickPick(items, { placeholder: nls.localizeByDefault('Select a task to terminate') });
687
698
  }
688
699
  }
689
700
 
@@ -719,7 +730,7 @@ export class TaskRunningQuickOpen {
719
730
  const isMulti: boolean = this.workspaceService.isMultiRootWorkspaceOpened;
720
731
  if (runningTasks.length <= 0) {
721
732
  items.push(({
722
- label: 'No task is currently running',
733
+ label: nls.localizeByDefault('No task is currently running'),
723
734
  }));
724
735
  } else {
725
736
  runningTasks.forEach((task: TaskInfo) => {
@@ -747,7 +758,7 @@ export class TaskRunningQuickOpen {
747
758
 
748
759
  async open(): Promise<void> {
749
760
  const items = await this.getItems();
750
- this.quickInputService?.showQuickPick(items, { placeholder: 'Select the task to show its output' });
761
+ this.quickInputService?.showQuickPick(items, { placeholder: nls.localizeByDefault('Select the task to show its output') });
751
762
  }
752
763
  }
753
764
 
@@ -805,7 +816,7 @@ export class TaskRestartRunningQuickOpen {
805
816
  const isMulti: boolean = this.workspaceService.isMultiRootWorkspaceOpened;
806
817
  if (runningTasks.length <= 0) {
807
818
  items.push({
808
- label: 'No task to restart'
819
+ label: nls.localizeByDefault('No task to restart')
809
820
  });
810
821
  } else {
811
822
  runningTasks.forEach((task: TaskInfo) => {
@@ -826,6 +837,6 @@ export class TaskRestartRunningQuickOpen {
826
837
 
827
838
  async open(): Promise<void> {
828
839
  const items = await this.getItems();
829
- this.quickInputService?.showQuickPick(items, { placeholder: 'Select task to restart' });
840
+ this.quickInputService?.showQuickPick(items, { placeholder: nls.localizeByDefault('Select the task to restart') });
830
841
  }
831
842
  }
@@ -16,11 +16,11 @@
16
16
 
17
17
  import * as jsoncparser from 'jsonc-parser';
18
18
  import debounce = require('p-debounce');
19
- import { inject, injectable, postConstruct, named } from '@theia/core/shared/inversify';
19
+ import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
20
20
  import URI from '@theia/core/lib/common/uri';
21
21
  import { Emitter, Event } from '@theia/core/lib/common/event';
22
22
  import { EditorManager, EditorWidget } from '@theia/editor/lib/browser';
23
- import { PreferenceScope, PreferenceProvider, PreferenceService } from '@theia/core/lib/browser';
23
+ import { PreferenceScope, PreferenceService, DisposableCollection, PreferenceProviderProvider, nls } from '@theia/core/lib/common';
24
24
  import { QuickPickService } from '@theia/core/lib/common/quick-pick-service';
25
25
  import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
26
26
  import { TaskConfigurationModel } from './task-configuration-model';
@@ -28,10 +28,11 @@ import { TaskTemplateSelector } from './task-templates';
28
28
  import { TaskCustomization, TaskConfiguration, TaskConfigurationScope, TaskScope } from '../common/task-protocol';
29
29
  import { WorkspaceVariableContribution } from '@theia/workspace/lib/browser/workspace-variable-contribution';
30
30
  import { FileChangeType } from '@theia/filesystem/lib/common/filesystem-watcher-protocol';
31
- import { PreferenceConfigurations } from '@theia/core/lib/browser/preferences/preference-configurations';
31
+ import { PreferenceConfigurations } from '@theia/core/lib/common/preferences/preference-configurations';
32
32
  import { FileService } from '@theia/filesystem/lib/browser/file-service';
33
- import { DisposableCollection } from '@theia/core/lib/common';
34
33
  import { TaskSchemaUpdater } from './task-schema-updater';
34
+ import { JSONObject } from '@theia/core/shared/@lumino/coreutils';
35
+ import { PreferenceProvider } from '@theia/core/lib/common/preferences/preference-provider';
35
36
 
36
37
  export interface TasksChange {
37
38
  scope: TaskConfigurationScope;
@@ -62,14 +63,8 @@ export class TaskConfigurationManager {
62
63
  @inject(TaskSchemaUpdater)
63
64
  protected readonly taskSchemaProvider: TaskSchemaUpdater;
64
65
 
65
- @inject(PreferenceProvider) @named(PreferenceScope.Folder)
66
- protected readonly folderPreferences: PreferenceProvider;
67
-
68
- @inject(PreferenceProvider) @named(PreferenceScope.User)
69
- protected readonly userPreferences: PreferenceProvider;
70
-
71
- @inject(PreferenceProvider) @named(PreferenceScope.Workspace)
72
- protected readonly workspacePreferences: PreferenceProvider;
66
+ @inject(PreferenceProviderProvider)
67
+ protected readonly preferenceProviderProvider: PreferenceProviderProvider;
73
68
 
74
69
  @inject(PreferenceConfigurations)
75
70
  protected readonly preferenceConfigurations: PreferenceConfigurations;
@@ -84,12 +79,12 @@ export class TaskConfigurationManager {
84
79
  readonly onDidChangeTaskConfig: Event<TasksChange> = this.onDidChangeTaskConfigEmitter.event;
85
80
 
86
81
  protected readonly models = new Map<TaskConfigurationScope, TaskConfigurationModel>();
87
- protected workspaceDelegate: PreferenceProvider;
82
+ protected workspaceDelegate: PreferenceProvider | undefined;
88
83
 
89
84
  @postConstruct()
90
85
  protected init(): void {
91
86
  this.createModels();
92
- this.folderPreferences.onDidPreferencesChanged(e => {
87
+ this.preferenceProviderProvider(PreferenceScope.Folder)?.onDidPreferencesChanged(e => {
93
88
  if (e['tasks']) {
94
89
  this.updateModels();
95
90
  }
@@ -103,7 +98,7 @@ export class TaskConfigurationManager {
103
98
  }
104
99
 
105
100
  protected createModels(): void {
106
- const userModel = new TaskConfigurationModel(TaskScope.Global, this.userPreferences);
101
+ const userModel = new TaskConfigurationModel(TaskScope.Global, this.preferenceProviderProvider(PreferenceScope.User));
107
102
  userModel.onDidChange(() => this.onDidChangeTaskConfigEmitter.fire({ scope: TaskScope.Global, type: FileChangeType.UPDATED }));
108
103
  this.models.set(TaskScope.Global, userModel);
109
104
 
@@ -121,7 +116,7 @@ export class TaskConfigurationManager {
121
116
  const key = rootStat.resource.toString();
122
117
  toDelete.delete(key);
123
118
  if (!this.models.has(key)) {
124
- const model = new TaskConfigurationModel(key, this.folderPreferences);
119
+ const model = new TaskConfigurationModel(key, this.preferenceProviderProvider(PreferenceScope.Folder));
125
120
  model.onDidChange(() => this.onDidChangeTaskConfigEmitter.fire({ scope: key, type: FileChangeType.UPDATED }));
126
121
  model.onDispose(() => this.models.delete(key));
127
122
  this.models.set(key, model);
@@ -198,7 +193,7 @@ export class TaskConfigurationManager {
198
193
  } catch {
199
194
  taskContent = this.taskSchemaProvider.getTaskSchema().default ?? {};
200
195
  }
201
- await model.preferences.setPreference('tasks', taskContent);
196
+ await model.preferences?.setPreference('tasks', taskContent as JSONObject);
202
197
  }
203
198
  }
204
199
  }
@@ -216,7 +211,7 @@ export class TaskConfigurationManager {
216
211
 
217
212
  protected async getInitialConfigurationContent(): Promise<string | undefined> {
218
213
  const selected = await this.quickPickService.show(this.taskTemplateSelector.selectTemplates(), {
219
- placeholder: 'Select a Task Template'
214
+ placeholder: nls.localizeByDefault('Select a Task Template')
220
215
  });
221
216
  if (selected) {
222
217
  return selected.value?.content;
@@ -226,7 +221,7 @@ export class TaskConfigurationManager {
226
221
  protected readonly toDisposeOnDelegateChange = new DisposableCollection();
227
222
  protected updateWorkspaceModel(): void {
228
223
  const isFolderWorkspace = this.workspaceService.opened && !this.workspaceService.saved;
229
- const newDelegate = isFolderWorkspace ? this.folderPreferences : this.workspacePreferences;
224
+ const newDelegate = isFolderWorkspace ? this.preferenceProviderProvider(PreferenceScope.Folder) : this.preferenceProviderProvider(PreferenceScope.Workspace);
230
225
  const effectiveScope = isFolderWorkspace ? this.workspaceService.tryGetRoots()[0]?.resource.toString() : TaskScope.Workspace;
231
226
  if (newDelegate !== this.workspaceDelegate) {
232
227
  this.workspaceDelegate = newDelegate;
@@ -235,7 +230,7 @@ export class TaskConfigurationManager {
235
230
  const workspaceModel = new TaskConfigurationModel(effectiveScope, newDelegate);
236
231
  this.toDisposeOnDelegateChange.push(workspaceModel);
237
232
  // If the delegate is the folder preference provider, its events will be relayed via the folder scope models.
238
- if (newDelegate === this.workspacePreferences) {
233
+ if (newDelegate === this.preferenceProviderProvider(PreferenceScope.Workspace)) {
239
234
  this.toDisposeOnDelegateChange.push(workspaceModel.onDidChange(() => {
240
235
  this.onDidChangeTaskConfigEmitter.fire({ scope: TaskScope.Workspace, type: FileChangeType.UPDATED });
241
236
  }));
@@ -18,8 +18,9 @@ import URI from '@theia/core/lib/common/uri';
18
18
  import { Emitter, Event } from '@theia/core/lib/common/event';
19
19
  import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
20
20
  import { TaskCustomization, TaskConfiguration, TaskConfigurationScope } from '../common/task-protocol';
21
- import { PreferenceProvider, PreferenceProviderDataChanges, PreferenceProviderDataChange } from '@theia/core/lib/browser';
22
- import { isObject } from '@theia/core/lib/common';
21
+ import { PreferenceProviderDataChanges, PreferenceProviderDataChange, isObject } from '@theia/core/lib/common';
22
+ import { PreferenceProvider } from '@theia/core/lib/common/preferences/preference-provider';
23
+ import { JSONValue } from '@theia/core/shared/@lumino/coreutils';
23
24
 
24
25
  /**
25
26
  * Holds the task configurations associated with a particular file. Uses an editor model to facilitate
@@ -38,15 +39,17 @@ export class TaskConfigurationModel implements Disposable {
38
39
 
39
40
  constructor(
40
41
  protected readonly scope: TaskConfigurationScope,
41
- readonly preferences: PreferenceProvider
42
+ readonly preferences: PreferenceProvider | undefined
42
43
  ) {
43
44
  this.reconcile();
44
- this.toDispose.push(this.preferences.onDidPreferencesChanged((e: PreferenceProviderDataChanges) => {
45
- const change = e['tasks'];
46
- if (change && PreferenceProviderDataChange.affects(change, this.getWorkspaceFolder())) {
47
- this.reconcile();
48
- }
49
- }));
45
+ if (this.preferences) {
46
+ this.toDispose.push(this.preferences.onDidPreferencesChanged((e: PreferenceProviderDataChanges) => {
47
+ const change = e['tasks'];
48
+ if (change && PreferenceProviderDataChange.affects(change, this.getWorkspaceFolder())) {
49
+ this.reconcile();
50
+ }
51
+ }));
52
+ }
50
53
  }
51
54
 
52
55
  get uri(): URI | undefined {
@@ -73,21 +76,21 @@ export class TaskConfigurationModel implements Disposable {
73
76
  this.onDidChangeEmitter.fire(undefined);
74
77
  }
75
78
 
76
- setConfigurations(value: object): Promise<boolean> {
77
- return this.preferences.setPreference('tasks.tasks', value, this.getWorkspaceFolder());
79
+ async setConfigurations(value: JSONValue): Promise<boolean> {
80
+ return this.preferences?.setPreference('tasks.tasks', value, this.getWorkspaceFolder()) || false;
78
81
  }
79
82
 
80
83
  protected parseConfigurations(): TaskConfigurationModel.JsonContent {
81
84
  const configurations: (TaskCustomization | TaskConfiguration)[] = [];
82
85
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
83
- const { configUri, value } = this.preferences.resolve<any>('tasks', this.getWorkspaceFolder());
84
- if (isObject(value) && Array.isArray(value.tasks)) {
85
- for (const taskConfig of value.tasks) {
86
+ const res = this.preferences?.resolve<any>('tasks', this.getWorkspaceFolder());
87
+ if (isObject(res?.value) && Array.isArray(res.value.tasks)) {
88
+ for (const taskConfig of res.value.tasks) {
86
89
  configurations.push(taskConfig);
87
90
  }
88
91
  }
89
92
  return {
90
- uri: configUri,
93
+ uri: res?.configUri,
91
94
  configurations
92
95
  };
93
96
  }
@@ -33,7 +33,7 @@ import { TaskDefinitionRegistry } from './task-definition-registry';
33
33
  import { ProblemMatcherRegistry } from './task-problem-matcher-registry';
34
34
  import { ProblemPatternRegistry } from './task-problem-pattern-registry';
35
35
  import { TaskConfigurationManager } from './task-configuration-manager';
36
- import { bindTaskPreferences } from './task-preferences';
36
+ import { bindTaskPreferences } from '../common/task-preferences';
37
37
  import '../../src/browser/style/index.css';
38
38
  import './tasks-monaco-contribution';
39
39
  import { TaskNameResolver } from './task-name-resolver';
@@ -20,7 +20,7 @@
20
20
  *--------------------------------------------------------------------------------------------*/
21
21
 
22
22
  import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
23
- import { Event, Emitter } from '@theia/core/lib/common';
23
+ import { Event, Emitter, nls } from '@theia/core/lib/common';
24
24
  import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
25
25
  import {
26
26
  ApplyToKind, FileLocationKind, NamedProblemMatcher,
@@ -223,7 +223,7 @@ export class ProblemMatcherRegistry {
223
223
  private fillDefaults(): void {
224
224
  this.add({
225
225
  name: 'msCompile',
226
- label: 'Microsoft compiler problems',
226
+ label: nls.localizeByDefault('Microsoft compiler problems'),
227
227
  owner: 'msCompile',
228
228
  applyTo: ApplyToKind.allDocuments,
229
229
  fileLocation: FileLocationKind.Absolute,
@@ -232,7 +232,7 @@ export class ProblemMatcherRegistry {
232
232
 
233
233
  this.add({
234
234
  name: 'lessCompile',
235
- label: 'Less problems',
235
+ label: nls.localizeByDefault('Less problems'),
236
236
  deprecated: true,
237
237
  owner: 'lessCompile',
238
238
  source: 'less',
@@ -244,7 +244,7 @@ export class ProblemMatcherRegistry {
244
244
 
245
245
  this.add({
246
246
  name: 'gulp-tsc',
247
- label: 'Gulp TSC Problems',
247
+ label: nls.localizeByDefault('Gulp TSC Problems'),
248
248
  owner: 'typescript',
249
249
  source: 'ts',
250
250
  applyTo: ApplyToKind.closedDocuments,
@@ -255,7 +255,7 @@ export class ProblemMatcherRegistry {
255
255
 
256
256
  this.add({
257
257
  name: 'jshint',
258
- label: 'JSHint problems',
258
+ label: nls.localizeByDefault('JSHint problems'),
259
259
  owner: 'jshint',
260
260
  source: 'jshint',
261
261
  applyTo: ApplyToKind.allDocuments,
@@ -265,7 +265,7 @@ export class ProblemMatcherRegistry {
265
265
 
266
266
  this.add({
267
267
  name: 'jshint-stylish',
268
- label: 'JSHint stylish problems',
268
+ label: nls.localizeByDefault('JSHint stylish problems'),
269
269
  owner: 'jshint',
270
270
  source: 'jshint',
271
271
  applyTo: ApplyToKind.allDocuments,
@@ -275,7 +275,7 @@ export class ProblemMatcherRegistry {
275
275
 
276
276
  this.add({
277
277
  name: 'eslint-compact',
278
- label: 'ESLint compact problems',
278
+ label: nls.localizeByDefault('ESLint compact problems'),
279
279
  owner: 'eslint',
280
280
  source: 'eslint',
281
281
  applyTo: ApplyToKind.allDocuments,
@@ -286,7 +286,7 @@ export class ProblemMatcherRegistry {
286
286
 
287
287
  this.add({
288
288
  name: 'eslint-stylish',
289
- label: 'ESLint stylish problems',
289
+ label: nls.localizeByDefault('ESLint stylish problems'),
290
290
  owner: 'eslint',
291
291
  source: 'eslint',
292
292
  applyTo: ApplyToKind.allDocuments,
@@ -296,7 +296,7 @@ export class ProblemMatcherRegistry {
296
296
 
297
297
  this.add({
298
298
  name: 'go',
299
- label: 'Go problems',
299
+ label: nls.localizeByDefault('Go problems'),
300
300
  owner: 'go',
301
301
  source: 'go',
302
302
  applyTo: ApplyToKind.allDocuments,