@theia/task 1.77.0-next.0 → 1.77.0-next.101

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 (257) hide show
  1. package/lib/browser/index.d.ts +6 -6
  2. package/lib/browser/index.d.ts.map +1 -1
  3. package/lib/browser/index.js +6 -9
  4. package/lib/browser/index.js.map +1 -1
  5. package/lib/browser/process/process-task-contribution.d.ts +2 -2
  6. package/lib/browser/process/process-task-contribution.d.ts.map +1 -1
  7. package/lib/browser/process/process-task-contribution.js +8 -12
  8. package/lib/browser/process/process-task-contribution.js.map +1 -1
  9. package/lib/browser/process/process-task-frontend-module.js +7 -10
  10. package/lib/browser/process/process-task-frontend-module.js.map +1 -1
  11. package/lib/browser/process/process-task-resolver.d.ts +8 -4
  12. package/lib/browser/process/process-task-resolver.d.ts.map +1 -1
  13. package/lib/browser/process/process-task-resolver.js +50 -44
  14. package/lib/browser/process/process-task-resolver.js.map +1 -1
  15. package/lib/browser/process/process-task-resolver.spec.d.ts +2 -0
  16. package/lib/browser/process/process-task-resolver.spec.d.ts.map +1 -0
  17. package/lib/browser/process/process-task-resolver.spec.js +215 -0
  18. package/lib/browser/process/process-task-resolver.spec.js.map +1 -0
  19. package/lib/browser/provided-task-configurations.d.ts +3 -3
  20. package/lib/browser/provided-task-configurations.d.ts.map +1 -1
  21. package/lib/browser/provided-task-configurations.js +18 -23
  22. package/lib/browser/provided-task-configurations.js.map +1 -1
  23. package/lib/browser/provided-task-configurations.spec.js +14 -16
  24. package/lib/browser/provided-task-configurations.spec.js.map +1 -1
  25. package/lib/browser/quick-open-task.d.ts +7 -7
  26. package/lib/browser/quick-open-task.d.ts.map +1 -1
  27. package/lib/browser/quick-open-task.js +160 -199
  28. package/lib/browser/quick-open-task.js.map +1 -1
  29. package/lib/browser/task-configuration-manager.d.ts +4 -4
  30. package/lib/browser/task-configuration-manager.d.ts.map +1 -1
  31. package/lib/browser/task-configuration-manager.js +61 -77
  32. package/lib/browser/task-configuration-manager.js.map +1 -1
  33. package/lib/browser/task-configuration-model.d.ts +1 -1
  34. package/lib/browser/task-configuration-model.d.ts.map +1 -1
  35. package/lib/browser/task-configuration-model.js +8 -12
  36. package/lib/browser/task-configuration-model.js.map +1 -1
  37. package/lib/browser/task-configurations.d.ts +6 -6
  38. package/lib/browser/task-configurations.d.ts.map +1 -1
  39. package/lib/browser/task-configurations.js +41 -55
  40. package/lib/browser/task-configurations.js.map +1 -1
  41. package/lib/browser/task-context-key-service.js +13 -21
  42. package/lib/browser/task-context-key-service.js.map +1 -1
  43. package/lib/browser/task-contribution.d.ts +1 -1
  44. package/lib/browser/task-contribution.d.ts.map +1 -1
  45. package/lib/browser/task-contribution.js +20 -27
  46. package/lib/browser/task-contribution.js.map +1 -1
  47. package/lib/browser/task-definition-registry.d.ts +1 -1
  48. package/lib/browser/task-definition-registry.d.ts.map +1 -1
  49. package/lib/browser/task-definition-registry.js +12 -15
  50. package/lib/browser/task-definition-registry.js.map +1 -1
  51. package/lib/browser/task-definition-registry.spec.js +20 -22
  52. package/lib/browser/task-definition-registry.spec.js.map +1 -1
  53. package/lib/browser/task-frontend-contribution.d.ts +5 -5
  54. package/lib/browser/task-frontend-contribution.d.ts.map +1 -1
  55. package/lib/browser/task-frontend-contribution.js +83 -106
  56. package/lib/browser/task-frontend-contribution.js.map +1 -1
  57. package/lib/browser/task-frontend-module.d.ts +1 -1
  58. package/lib/browser/task-frontend-module.d.ts.map +1 -1
  59. package/lib/browser/task-frontend-module.js +64 -66
  60. package/lib/browser/task-frontend-module.js.map +1 -1
  61. package/lib/browser/task-name-resolver.d.ts +3 -3
  62. package/lib/browser/task-name-resolver.d.ts.map +1 -1
  63. package/lib/browser/task-name-resolver.js +11 -16
  64. package/lib/browser/task-name-resolver.js.map +1 -1
  65. package/lib/browser/task-node.d.ts +1 -1
  66. package/lib/browser/task-node.d.ts.map +1 -1
  67. package/lib/browser/task-node.js +1 -5
  68. package/lib/browser/task-node.js.map +1 -1
  69. package/lib/browser/task-problem-matcher-registry.d.ts +2 -2
  70. package/lib/browser/task-problem-matcher-registry.d.ts.map +1 -1
  71. package/lib/browser/task-problem-matcher-registry.js +64 -72
  72. package/lib/browser/task-problem-matcher-registry.js.map +1 -1
  73. package/lib/browser/task-problem-pattern-registry.d.ts +1 -1
  74. package/lib/browser/task-problem-pattern-registry.d.ts.map +1 -1
  75. package/lib/browser/task-problem-pattern-registry.js +30 -37
  76. package/lib/browser/task-problem-pattern-registry.js.map +1 -1
  77. package/lib/browser/task-schema-updater.d.ts +4 -4
  78. package/lib/browser/task-schema-updater.d.ts.map +1 -1
  79. package/lib/browser/task-schema-updater.js +115 -126
  80. package/lib/browser/task-schema-updater.js.map +1 -1
  81. package/lib/browser/task-service.d.ts +14 -14
  82. package/lib/browser/task-service.d.ts.map +1 -1
  83. package/lib/browser/task-service.js +168 -202
  84. package/lib/browser/task-service.js.map +1 -1
  85. package/lib/browser/task-service.spec.d.ts +2 -0
  86. package/lib/browser/task-service.spec.d.ts.map +1 -0
  87. package/lib/browser/task-service.spec.js +91 -0
  88. package/lib/browser/task-service.spec.js.map +1 -0
  89. package/lib/browser/task-source-resolver.d.ts +2 -2
  90. package/lib/browser/task-source-resolver.d.ts.map +1 -1
  91. package/lib/browser/task-source-resolver.js +10 -14
  92. package/lib/browser/task-source-resolver.js.map +1 -1
  93. package/lib/browser/task-templates.js +10 -13
  94. package/lib/browser/task-templates.js.map +1 -1
  95. package/lib/browser/task-terminal-widget-manager.d.ts +2 -2
  96. package/lib/browser/task-terminal-widget-manager.d.ts.map +1 -1
  97. package/lib/browser/task-terminal-widget-manager.js +39 -50
  98. package/lib/browser/task-terminal-widget-manager.js.map +1 -1
  99. package/lib/browser/tasks-monaco-contribution.js +1 -3
  100. package/lib/browser/tasks-monaco-contribution.js.map +1 -1
  101. package/lib/common/index.d.ts +4 -4
  102. package/lib/common/index.d.ts.map +1 -1
  103. package/lib/common/index.js +4 -7
  104. package/lib/common/index.js.map +1 -1
  105. package/lib/common/problem-matcher-protocol.js +17 -20
  106. package/lib/common/problem-matcher-protocol.js.map +1 -1
  107. package/lib/common/process/task-protocol.d.ts +1 -1
  108. package/lib/common/process/task-protocol.d.ts.map +1 -1
  109. package/lib/common/process/task-protocol.js +6 -9
  110. package/lib/common/process/task-protocol.js.map +1 -1
  111. package/lib/common/task-common-module.js +3 -6
  112. package/lib/common/task-common-module.js.map +1 -1
  113. package/lib/common/task-preferences.js +10 -14
  114. package/lib/common/task-preferences.js.map +1 -1
  115. package/lib/common/task-protocol.d.ts +1 -1
  116. package/lib/common/task-protocol.d.ts.map +1 -1
  117. package/lib/common/task-protocol.js +15 -18
  118. package/lib/common/task-protocol.js.map +1 -1
  119. package/lib/common/task-util.js +2 -6
  120. package/lib/common/task-util.js.map +1 -1
  121. package/lib/common/task-watcher.d.ts +1 -1
  122. package/lib/common/task-watcher.d.ts.map +1 -1
  123. package/lib/common/task-watcher.js +12 -15
  124. package/lib/common/task-watcher.js.map +1 -1
  125. package/lib/node/custom/custom-task-runner-backend-module.js +14 -17
  126. package/lib/node/custom/custom-task-runner-backend-module.js.map +1 -1
  127. package/lib/node/custom/custom-task-runner-contribution.d.ts +2 -2
  128. package/lib/node/custom/custom-task-runner-contribution.d.ts.map +1 -1
  129. package/lib/node/custom/custom-task-runner-contribution.js +8 -12
  130. package/lib/node/custom/custom-task-runner-contribution.js.map +1 -1
  131. package/lib/node/custom/custom-task-runner.d.ts +4 -4
  132. package/lib/node/custom/custom-task-runner.d.ts.map +1 -1
  133. package/lib/node/custom/custom-task-runner.js +15 -21
  134. package/lib/node/custom/custom-task-runner.js.map +1 -1
  135. package/lib/node/custom/custom-task.d.ts +4 -4
  136. package/lib/node/custom/custom-task.d.ts.map +1 -1
  137. package/lib/node/custom/custom-task.js +15 -19
  138. package/lib/node/custom/custom-task.js.map +1 -1
  139. package/lib/node/index.d.ts +3 -3
  140. package/lib/node/index.d.ts.map +1 -1
  141. package/lib/node/index.js +3 -6
  142. package/lib/node/index.js.map +1 -1
  143. package/lib/node/process/process-task-runner-backend-module.js +14 -17
  144. package/lib/node/process/process-task-runner-backend-module.js.map +1 -1
  145. package/lib/node/process/process-task-runner-contribution.d.ts +2 -2
  146. package/lib/node/process/process-task-runner-contribution.d.ts.map +1 -1
  147. package/lib/node/process/process-task-runner-contribution.js +8 -12
  148. package/lib/node/process/process-task-runner-contribution.js.map +1 -1
  149. package/lib/node/process/process-task-runner.d.ts +5 -5
  150. package/lib/node/process/process-task-runner.d.ts.map +1 -1
  151. package/lib/node/process/process-task-runner.js +37 -44
  152. package/lib/node/process/process-task-runner.js.map +1 -1
  153. package/lib/node/process/process-task.d.ts +5 -5
  154. package/lib/node/process/process-task.d.ts.map +1 -1
  155. package/lib/node/process/process-task.js +16 -21
  156. package/lib/node/process/process-task.js.map +1 -1
  157. package/lib/node/process/process-task.spec.js +6 -8
  158. package/lib/node/process/process-task.spec.js.map +1 -1
  159. package/lib/node/task-abstract-line-matcher.d.ts +1 -1
  160. package/lib/node/task-abstract-line-matcher.d.ts.map +1 -1
  161. package/lib/node/task-abstract-line-matcher.js +28 -32
  162. package/lib/node/task-abstract-line-matcher.js.map +1 -1
  163. package/lib/node/task-backend-application-contribution.d.ts +1 -1
  164. package/lib/node/task-backend-application-contribution.d.ts.map +1 -1
  165. package/lib/node/task-backend-application-contribution.js +12 -17
  166. package/lib/node/task-backend-application-contribution.js.map +1 -1
  167. package/lib/node/task-backend-module.js +27 -29
  168. package/lib/node/task-backend-module.js.map +1 -1
  169. package/lib/node/task-line-matchers.d.ts +2 -2
  170. package/lib/node/task-line-matchers.d.ts.map +1 -1
  171. package/lib/node/task-line-matchers.js +3 -8
  172. package/lib/node/task-line-matchers.js.map +1 -1
  173. package/lib/node/task-manager.d.ts +2 -2
  174. package/lib/node/task-manager.d.ts.map +1 -1
  175. package/lib/node/task-manager.js +9 -13
  176. package/lib/node/task-manager.js.map +1 -1
  177. package/lib/node/task-problem-collector.d.ts +1 -1
  178. package/lib/node/task-problem-collector.d.ts.map +1 -1
  179. package/lib/node/task-problem-collector.js +9 -13
  180. package/lib/node/task-problem-collector.js.map +1 -1
  181. package/lib/node/task-problem-collector.spec.js +63 -65
  182. package/lib/node/task-problem-collector.spec.js.map +1 -1
  183. package/lib/node/task-runner-protocol.d.ts +2 -2
  184. package/lib/node/task-runner-protocol.d.ts.map +1 -1
  185. package/lib/node/task-runner-protocol.js +1 -4
  186. package/lib/node/task-runner-protocol.js.map +1 -1
  187. package/lib/node/task-runner.d.ts +2 -2
  188. package/lib/node/task-runner.d.ts.map +1 -1
  189. package/lib/node/task-runner.js +13 -20
  190. package/lib/node/task-runner.js.map +1 -1
  191. package/lib/node/task-server.d.ts +5 -5
  192. package/lib/node/task-server.d.ts.map +1 -1
  193. package/lib/node/task-server.js +21 -27
  194. package/lib/node/task-server.js.map +1 -1
  195. package/lib/node/task-server.slow-spec.d.ts.map +1 -1
  196. package/lib/node/task-server.slow-spec.js +58 -61
  197. package/lib/node/task-server.slow-spec.js.map +1 -1
  198. package/lib/node/task.d.ts +2 -2
  199. package/lib/node/task.d.ts.map +1 -1
  200. package/lib/node/task.js +12 -16
  201. package/lib/node/task.js.map +1 -1
  202. package/lib/node/test/task-test-container.js +28 -31
  203. package/lib/node/test/task-test-container.js.map +1 -1
  204. package/package.json +23 -12
  205. package/src/browser/index.ts +6 -6
  206. package/src/browser/process/process-task-contribution.ts +2 -2
  207. package/src/browser/process/process-task-frontend-module.ts +3 -3
  208. package/src/browser/process/process-task-resolver.spec.ts +247 -0
  209. package/src/browser/process/process-task-resolver.ts +44 -27
  210. package/src/browser/provided-task-configurations.spec.ts +4 -4
  211. package/src/browser/provided-task-configurations.ts +3 -3
  212. package/src/browser/quick-open-task.ts +8 -8
  213. package/src/browser/task-configuration-manager.ts +5 -5
  214. package/src/browser/task-configuration-model.ts +1 -1
  215. package/src/browser/task-configurations.ts +6 -6
  216. package/src/browser/task-contribution.ts +1 -1
  217. package/src/browser/task-definition-registry.spec.ts +2 -2
  218. package/src/browser/task-definition-registry.ts +1 -1
  219. package/src/browser/task-frontend-contribution.ts +5 -5
  220. package/src/browser/task-frontend-module.ts +22 -22
  221. package/src/browser/task-name-resolver.ts +3 -3
  222. package/src/browser/task-node.ts +1 -1
  223. package/src/browser/task-problem-matcher-registry.ts +2 -2
  224. package/src/browser/task-problem-pattern-registry.ts +1 -1
  225. package/src/browser/task-schema-updater.ts +6 -6
  226. package/src/browser/task-service.spec.ts +102 -0
  227. package/src/browser/task-service.ts +20 -17
  228. package/src/browser/task-source-resolver.ts +2 -2
  229. package/src/browser/task-terminal-widget-manager.ts +3 -3
  230. package/src/common/index.ts +4 -4
  231. package/src/common/process/task-protocol.ts +1 -1
  232. package/src/common/task-common-module.ts +1 -1
  233. package/src/common/task-protocol.ts +1 -1
  234. package/src/common/task-watcher.ts +1 -1
  235. package/src/node/custom/custom-task-runner-backend-module.ts +4 -4
  236. package/src/node/custom/custom-task-runner-contribution.ts +2 -2
  237. package/src/node/custom/custom-task-runner.ts +4 -4
  238. package/src/node/custom/custom-task.ts +4 -4
  239. package/src/node/index.ts +3 -3
  240. package/src/node/process/process-task-runner-backend-module.ts +4 -4
  241. package/src/node/process/process-task-runner-contribution.ts +2 -2
  242. package/src/node/process/process-task-runner.ts +5 -5
  243. package/src/node/process/process-task.spec.ts +1 -1
  244. package/src/node/process/process-task.ts +5 -5
  245. package/src/node/task-abstract-line-matcher.ts +1 -1
  246. package/src/node/task-backend-application-contribution.ts +1 -1
  247. package/src/node/task-backend-module.ts +9 -9
  248. package/src/node/task-line-matchers.ts +2 -2
  249. package/src/node/task-manager.ts +2 -2
  250. package/src/node/task-problem-collector.spec.ts +2 -2
  251. package/src/node/task-problem-collector.ts +3 -3
  252. package/src/node/task-runner-protocol.ts +2 -2
  253. package/src/node/task-runner.ts +2 -2
  254. package/src/node/task-server.slow-spec.ts +4 -5
  255. package/src/node/task-server.ts +8 -8
  256. package/src/node/task.ts +2 -2
  257. package/src/node/test/task-test-container.ts +1 -1
@@ -1,4 +1,3 @@
1
- "use strict";
2
1
  // *****************************************************************************
3
2
  // Copyright (C) 2017 Ericsson and others.
4
3
  //
@@ -14,50 +13,48 @@
14
13
  //
15
14
  // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
16
15
  // *****************************************************************************
17
- Object.defineProperty(exports, "__esModule", { value: true });
18
- exports.TaskService = exports.TaskEndedTypes = void 0;
19
- const tslib_1 = require("tslib");
20
- const browser_1 = require("@theia/core/lib/browser");
21
- const opener_service_1 = require("@theia/core/lib/browser/opener-service");
22
- const common_1 = require("@theia/core/lib/common");
23
- const message_service_1 = require("@theia/core/lib/common/message-service");
24
- const promise_util_1 = require("@theia/core/lib/common/promise-util");
25
- const quick_pick_service_1 = require("@theia/core/lib/common/quick-pick-service");
26
- const label_provider_1 = require("@theia/core/lib/browser/label-provider");
27
- const uri_1 = require("@theia/core/lib/common/uri");
28
- const browser_2 = require("@theia/editor/lib/browser");
29
- const problem_manager_1 = require("@theia/markers/lib/browser/problem/problem-manager");
30
- const terminal_service_1 = require("@theia/terminal/lib/browser/base/terminal-service");
31
- const terminal_widget_impl_1 = require("@theia/terminal/lib/browser/terminal-widget-impl");
32
- const browser_3 = require("@theia/variable-resolver/lib/browser");
33
- const workspace_service_1 = require("@theia/workspace/lib/browser/workspace-service");
34
- const browser_4 = require("@theia/workspace/lib/browser");
35
- const inversify_1 = require("@theia/core/shared/inversify");
36
- const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
37
- const common_2 = require("../common");
38
- const task_watcher_1 = require("../common/task-watcher");
39
- const provided_task_configurations_1 = require("./provided-task-configurations");
40
- const task_configurations_1 = require("./task-configurations");
41
- const task_contribution_1 = require("./task-contribution");
42
- const task_definition_registry_1 = require("./task-definition-registry");
43
- const task_name_resolver_1 = require("./task-name-resolver");
44
- const task_source_resolver_1 = require("./task-source-resolver");
45
- const task_problem_matcher_registry_1 = require("./task-problem-matcher-registry");
46
- const task_schema_updater_1 = require("./task-schema-updater");
47
- const task_configuration_manager_1 = require("./task-configuration-manager");
48
- const problem_widget_1 = require("@theia/markers/lib/browser/problem/problem-widget");
49
- const task_node_1 = require("./task-node");
50
- const monaco_workspace_1 = require("@theia/monaco/lib/browser/monaco-workspace");
51
- const task_terminal_widget_manager_1 = require("./task-terminal-widget-manager");
52
- const shell_terminal_protocol_1 = require("@theia/terminal/lib/common/shell-terminal-protocol");
53
- const async_mutex_1 = require("async-mutex");
54
- const task_context_key_service_1 = require("./task-context-key-service");
55
- const terminal_preferences_1 = require("@theia/terminal/lib/common/terminal-preferences");
56
- var TaskEndedTypes;
16
+ import { __decorate } from "tslib";
17
+ import { ApplicationShell, FrontendApplication, WidgetManager } from '@theia/core/lib/browser';
18
+ import { open, OpenerService } from '@theia/core/lib/browser/opener-service';
19
+ import { CommandService, ILogger, isCancelled, nls } from '@theia/core/lib/common';
20
+ import { MessageService } from '@theia/core/lib/common/message-service';
21
+ import { Deferred } from '@theia/core/lib/common/promise-util';
22
+ import { QuickPickService } from '@theia/core/lib/common/quick-pick-service';
23
+ import { LabelProvider } from '@theia/core/lib/browser/label-provider';
24
+ import URI from '@theia/core/lib/common/uri';
25
+ import { EditorManager } from '@theia/editor/lib/browser';
26
+ import { ProblemManager } from '@theia/markers/lib/browser/problem/problem-manager';
27
+ import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
28
+ import { nextTerminalCreationToken } from '@theia/terminal/lib/browser/terminal-widget-impl';
29
+ import { VariableResolverService } from '@theia/variable-resolver/lib/browser';
30
+ import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
31
+ import { WorkspaceTrustService } from '@theia/workspace/lib/browser';
32
+ import { inject, injectable, named, postConstruct } from '@theia/core/shared/inversify';
33
+ import { DiagnosticSeverity, Range } from '@theia/core/shared/vscode-languageserver-protocol';
34
+ import { ApplyToKind, DependsOrder, ProblemMatchData, RevealKind, TaskOutputPresentation, TaskServer, asVariableName } from '../common/index.js';
35
+ import { TaskWatcher } from '../common/task-watcher.js';
36
+ import { ProvidedTaskConfigurations } from './provided-task-configurations.js';
37
+ import { TaskConfigurations } from './task-configurations.js';
38
+ import { TaskResolverRegistry } from './task-contribution.js';
39
+ import { TaskDefinitionRegistry } from './task-definition-registry.js';
40
+ import { TaskNameResolver } from './task-name-resolver.js';
41
+ import { TaskSourceResolver } from './task-source-resolver.js';
42
+ import { ProblemMatcherRegistry } from './task-problem-matcher-registry.js';
43
+ import { TaskSchemaUpdater } from './task-schema-updater.js';
44
+ import { TaskConfigurationManager } from './task-configuration-manager.js';
45
+ import { PROBLEMS_WIDGET_ID } from '@theia/markers/lib/browser/problem/problem-widget';
46
+ import { TaskNode } from './task-node.js';
47
+ import { MonacoWorkspace } from '@theia/monaco/lib/browser/monaco-workspace';
48
+ import { TaskTerminalWidgetManager } from './task-terminal-widget-manager.js';
49
+ import { ShellTerminalServerProxy } from '@theia/terminal/lib/common/shell-terminal-protocol';
50
+ import { Mutex } from 'async-mutex';
51
+ import { TaskContextKeyService } from './task-context-key-service.js';
52
+ import { TerminalPreferences } from '@theia/terminal/lib/common/terminal-preferences';
53
+ export var TaskEndedTypes;
57
54
  (function (TaskEndedTypes) {
58
55
  TaskEndedTypes[TaskEndedTypes["TaskExited"] = 0] = "TaskExited";
59
56
  TaskEndedTypes[TaskEndedTypes["BackgroundTaskEnded"] = 1] = "BackgroundTaskEnded";
60
- })(TaskEndedTypes || (exports.TaskEndedTypes = TaskEndedTypes = {}));
57
+ })(TaskEndedTypes || (TaskEndedTypes = {}));
61
58
  let TaskService = class TaskService {
62
59
  constructor() {
63
60
  /**
@@ -66,14 +63,14 @@ let TaskService = class TaskService {
66
63
  this.lastTask = { resolvedTask: undefined, option: undefined };
67
64
  this.cachedRecentTasks = [];
68
65
  this.runningTasks = new Map();
69
- this.taskStartingLock = new async_mutex_1.Mutex();
66
+ this.taskStartingLock = new Mutex();
70
67
  }
71
68
  init() {
72
69
  this.getRunningTasks().then(tasks => tasks.forEach(task => {
73
70
  if (!this.runningTasks.has(task.taskId)) {
74
71
  this.runningTasks.set(task.taskId, {
75
- exitCode: new promise_util_1.Deferred(), terminateSignal: new promise_util_1.Deferred(),
76
- isBackgroundTaskEnded: new promise_util_1.Deferred()
72
+ exitCode: new Deferred(), terminateSignal: new Deferred(),
73
+ isBackgroundTaskEnded: new Deferred()
77
74
  });
78
75
  }
79
76
  }));
@@ -83,9 +80,9 @@ let TaskService = class TaskService {
83
80
  return;
84
81
  }
85
82
  this.runningTasks.set(event.taskId, {
86
- exitCode: new promise_util_1.Deferred(),
87
- terminateSignal: new promise_util_1.Deferred(),
88
- isBackgroundTaskEnded: new promise_util_1.Deferred()
83
+ exitCode: new Deferred(),
84
+ terminateSignal: new Deferred(),
85
+ isBackgroundTaskEnded: new Deferred()
89
86
  });
90
87
  });
91
88
  this.taskWatcher.onOutputProcessed(async (event) => {
@@ -100,14 +97,14 @@ let TaskService = class TaskService {
100
97
  return this.taskDefinitionRegistry.compareTasks(taskConfig, event.config);
101
98
  });
102
99
  const isTaskActiveAndOutputSilent = matchedRunningTaskInfo &&
103
- matchedRunningTaskInfo.config.presentation && matchedRunningTaskInfo.config.presentation.reveal === common_2.RevealKind.Silent;
100
+ matchedRunningTaskInfo.config.presentation && matchedRunningTaskInfo.config.presentation.reveal === RevealKind.Silent;
104
101
  event.problems.forEach(problem => {
105
102
  const existingMarkers = this.problemManager.findMarkers({ owner: problem.description.owner });
106
103
  const uris = new Set();
107
104
  existingMarkers.forEach(marker => uris.add(marker.uri));
108
- if (common_2.ProblemMatchData.is(problem) && problem.resource) {
105
+ if (ProblemMatchData.is(problem) && problem.resource) {
109
106
  // When task.presentation.reveal === RevealKind.Silent, put focus on the terminal only if it is an error
110
- if (isTaskActiveAndOutputSilent && problem.marker.severity === vscode_languageserver_protocol_1.DiagnosticSeverity.Error) {
107
+ if (isTaskActiveAndOutputSilent && problem.marker.severity === DiagnosticSeverity.Error) {
111
108
  const terminalId = matchedRunningTaskInfo.terminalId;
112
109
  if (terminalId) {
113
110
  const terminal = this.terminalService.getByTerminalId(terminalId);
@@ -124,9 +121,9 @@ let TaskService = class TaskService {
124
121
  }
125
122
  const uri = problem.resource.withScheme(problem.resource.scheme);
126
123
  const document = this.monacoWorkspace.getTextDocument(uri.toString());
127
- if (problem.description.applyTo === common_2.ApplyToKind.openDocuments && !!document ||
128
- problem.description.applyTo === common_2.ApplyToKind.closedDocuments && !document ||
129
- problem.description.applyTo === common_2.ApplyToKind.allDocuments) {
124
+ if (problem.description.applyTo === ApplyToKind.openDocuments && !!document ||
125
+ problem.description.applyTo === ApplyToKind.closedDocuments && !document ||
126
+ problem.description.applyTo === ApplyToKind.allDocuments) {
130
127
  if (uris.has(uri.toString())) {
131
128
  const newData = [
132
129
  ...existingMarkers
@@ -142,7 +139,7 @@ let TaskService = class TaskService {
142
139
  }
143
140
  }
144
141
  else { // should have received an event for finding the "background task begins" pattern
145
- uris.forEach(uriString => this.problemManager.setMarkers(new uri_1.default(uriString), problem.description.owner, []));
142
+ uris.forEach(uriString => this.problemManager.setMarkers(new URI(uriString), problem.description.owner, []));
146
143
  }
147
144
  });
148
145
  }
@@ -153,9 +150,9 @@ let TaskService = class TaskService {
153
150
  }
154
151
  if (!this.runningTasks.has(event.taskId)) {
155
152
  this.runningTasks.set(event.taskId, {
156
- exitCode: new promise_util_1.Deferred(),
157
- terminateSignal: new promise_util_1.Deferred(),
158
- isBackgroundTaskEnded: new promise_util_1.Deferred()
153
+ exitCode: new Deferred(),
154
+ terminateSignal: new Deferred(),
155
+ isBackgroundTaskEnded: new Deferred()
159
156
  });
160
157
  }
161
158
  this.runningTasks.get(event.taskId).isBackgroundTaskEnded.resolve(true);
@@ -167,9 +164,9 @@ let TaskService = class TaskService {
167
164
  }
168
165
  if (!this.runningTasks.has(event.taskId)) {
169
166
  this.runningTasks.set(event.taskId, {
170
- exitCode: new promise_util_1.Deferred(),
171
- terminateSignal: new promise_util_1.Deferred(),
172
- isBackgroundTaskEnded: new promise_util_1.Deferred()
167
+ exitCode: new Deferred(),
168
+ terminateSignal: new Deferred(),
169
+ isBackgroundTaskEnded: new Deferred()
173
170
  });
174
171
  }
175
172
  this.runningTasks.get(event.taskId).exitCode.resolve(event.code);
@@ -180,7 +177,7 @@ let TaskService = class TaskService {
180
177
  if (event.code !== undefined) {
181
178
  if (event.code !== 0) {
182
179
  const eventTaskConfig = event.config;
183
- if (eventTaskConfig && eventTaskConfig.presentation && eventTaskConfig.presentation.reveal === common_2.RevealKind.Silent && event.terminalId) {
180
+ if (eventTaskConfig && eventTaskConfig.presentation && eventTaskConfig.presentation.reveal === RevealKind.Silent && event.terminalId) {
184
181
  const terminal = this.terminalService.getByTerminalId(event.terminalId);
185
182
  const focus = !!eventTaskConfig.presentation.focus;
186
183
  if (terminal) {
@@ -192,11 +189,11 @@ let TaskService = class TaskService {
192
189
  }
193
190
  }
194
191
  }
195
- this.messageService.error(common_1.nls.localize('theia/task/taskExitedWithCode', "Task '{0}' has exited with code {1}.", taskIdentifier, event.code));
192
+ this.messageService.error(nls.localize('theia/task/taskExitedWithCode', "Task '{0}' has exited with code {1}.", taskIdentifier, event.code));
196
193
  }
197
194
  }
198
195
  else if (event.signal !== undefined) {
199
- this.messageService.info(common_1.nls.localize('theia/task/taskTerminatedBySignal', "Task '{0}' was terminated by signal {1}.", taskIdentifier, event.signal));
196
+ this.messageService.info(nls.localize('theia/task/taskTerminatedBySignal', "Task '{0}' was terminated by signal {1}.", taskIdentifier, event.signal));
200
197
  }
201
198
  else {
202
199
  this.logger.error('Invalid TaskExitedEvent received, neither code nor signal is set.');
@@ -206,7 +203,7 @@ let TaskService = class TaskService {
206
203
  getTaskIdentifier(taskConfig) {
207
204
  const taskName = this.taskNameResolver.resolve(taskConfig);
208
205
  const sourceStrUri = this.taskSourceResolver.resolve(taskConfig);
209
- return `${taskName} (${this.labelProvider.getName(new uri_1.default(sourceStrUri))})`;
206
+ return `${taskName} (${this.labelProvider.getName(new URI(sourceStrUri))})`;
210
207
  }
211
208
  /**
212
209
  * Client should call this method to indicate that a new user-level action related to tasks has been started,
@@ -238,7 +235,7 @@ let TaskService = class TaskService {
238
235
  async getConfiguredTasks(token) {
239
236
  const invalidTaskConfig = this.taskConfigurations.getInvalidTaskConfigurations()[0];
240
237
  if (invalidTaskConfig) {
241
- const widget = await this.widgetManager.getOrCreateWidget(problem_widget_1.PROBLEMS_WIDGET_ID);
238
+ const widget = await this.widgetManager.getOrCreateWidget(PROBLEMS_WIDGET_ID);
242
239
  const isProblemsWidgetVisible = widget && widget.isVisible;
243
240
  const currentEditorUri = this.editorManager.currentEditor && this.editorManager.currentEditor.editor.getResourceUri();
244
241
  let isInvalidTaskConfigFileOpen = false;
@@ -248,9 +245,9 @@ let TaskService = class TaskService {
248
245
  isInvalidTaskConfigFileOpen = true;
249
246
  }
250
247
  }
251
- const warningMessage = common_1.nls.localize('theia/task/invalidTaskConfigs', 'Invalid task configurations are found. Open tasks.json and find details in the Problems view.');
248
+ const warningMessage = nls.localize('theia/task/invalidTaskConfigs', 'Invalid task configurations are found. Open tasks.json and find details in the Problems view.');
252
249
  if (!isProblemsWidgetVisible || !isInvalidTaskConfigFileOpen) {
253
- this.messageService.warn(warningMessage, common_1.nls.localizeByDefault('Open')).then(actionOpen => {
250
+ this.messageService.warn(warningMessage, nls.localizeByDefault('Open')).then(actionOpen => {
254
251
  if (actionOpen) {
255
252
  if (invalidTaskConfig && invalidTaskConfig._scope) {
256
253
  this.taskConfigurationManager.openConfiguration(invalidTaskConfig._scope);
@@ -396,7 +393,7 @@ let TaskService = class TaskService {
396
393
  // ask the user what s/he wants to use to parse the task output
397
394
  const items = this.getCustomizeProblemMatcherItems();
398
395
  const selected = await this.quickPickService.show(items, {
399
- placeholder: common_1.nls.localizeByDefault('Select for which kind of errors and warnings to scan the task output')
396
+ placeholder: nls.localizeByDefault('Select for which kind of errors and warnings to scan the task output')
400
397
  });
401
398
  if (selected && ('value' in selected)) {
402
399
  if (selected.value?.problemMatchers) {
@@ -412,7 +409,7 @@ let TaskService = class TaskService {
412
409
  this.updateTaskConfiguration(token, task, { problemMatcher: matcherNames });
413
410
  }
414
411
  else if (selected.value?.learnMore) { // user wants to learn more about parsing task output
415
- (0, opener_service_1.open)(this.openerService, new uri_1.default('https://code.visualstudio.com/docs/editor/tasks#_processing-task-output-with-problem-matchers'));
412
+ open(this.openerService, new URI('https://code.visualstudio.com/docs/editor/tasks#_processing-task-output-with-problem-matchers'));
416
413
  }
417
414
  // else, continue the task with no parser
418
415
  }
@@ -443,7 +440,7 @@ let TaskService = class TaskService {
443
440
  async runCompoundTask(token, task, option) {
444
441
  const tasks = await this.getWorkspaceTasks(token, task._scope);
445
442
  try {
446
- const rootNode = new task_node_1.TaskNode(task, [], []);
443
+ const rootNode = new TaskNode(task, [], []);
447
444
  this.detectDirectedAcyclicGraph(task, rootNode, tasks);
448
445
  }
449
446
  catch (error) {
@@ -473,14 +470,14 @@ let TaskService = class TaskService {
473
470
  const resolvedMatchers = await this.resolveProblemMatchers(dependentTask, taskCustomization);
474
471
  dependentTasks.push({ 'task': dependentTask, 'taskCustomization': taskCustomization, 'resolvedMatchers': resolvedMatchers });
475
472
  // In case the 'dependsOrder' is 'sequence'
476
- if (task.dependsOrder && task.dependsOrder === common_2.DependsOrder.Sequence) {
473
+ if (task.dependsOrder && task.dependsOrder === DependsOrder.Sequence) {
477
474
  await this.runTasksGraph(dependentTask, tasks, {
478
475
  customization: { ...taskCustomization, ...{ problemMatcher: resolvedMatchers } }
479
476
  });
480
477
  }
481
478
  }
482
479
  // In case the 'dependsOrder' is 'parallel'
483
- if (((!task.dependsOrder) || (task.dependsOrder && task.dependsOrder === common_2.DependsOrder.Parallel))) {
480
+ if (((!task.dependsOrder) || (task.dependsOrder && task.dependsOrder === DependsOrder.Parallel))) {
484
481
  const promises = dependentTasks.map(item => this.runTasksGraph(item.task, tasks, {
485
482
  customization: { ...item.taskCustomization, ...{ problemMatcher: item.resolvedMatchers } }
486
483
  }));
@@ -540,9 +537,9 @@ let TaskService = class TaskService {
540
537
  taskNode.parentsID.filter(t => this.taskDefinitionRegistry.compareTasks(childTaskConfiguration, t)).length > 0) {
541
538
  const fromNode = task.label;
542
539
  const toNode = childTaskConfiguration.label;
543
- throw new Error(common_1.nls.localize('theia/task/circularReferenceDetected', 'Circular reference detected: {0} --> {1}', fromNode, toNode));
540
+ throw new Error(nls.localize('theia/task/circularReferenceDetected', 'Circular reference detected: {0} --> {1}', fromNode, toNode));
544
541
  }
545
- const childNode = new task_node_1.TaskNode(childTaskConfiguration, [], Object.assign([], taskNode.parentsID));
542
+ const childNode = new TaskNode(childTaskConfiguration, [], Object.assign([], taskNode.parentsID));
546
543
  childNode.addParentDependency(taskNode.taskId);
547
544
  taskNode.addChildDependency(childNode);
548
545
  return { 'taskConfiguration': childTaskConfiguration, 'node': childNode };
@@ -555,7 +552,7 @@ let TaskService = class TaskService {
555
552
  * @returns the correct TaskConfiguration object which matches the taskIdentifier
556
553
  */
557
554
  getDependentTask(taskIdentifier, tasks) {
558
- const notEnoughDataError = common_1.nls.localize('theia/task/notEnoughDataInDependsOn', 'The information provided in the "dependsOn" is not enough for matching the correct task!');
555
+ const notEnoughDataError = nls.localize('theia/task/notEnoughDataInDependsOn', 'The information provided in the "dependsOn" is not enough for matching the correct task!');
559
556
  let currentTaskChildConfiguration;
560
557
  if (typeof (taskIdentifier) !== 'string') {
561
558
  // TaskIdentifier object does not support tasks of type 'shell' (The same behavior as in VS Code).
@@ -617,17 +614,17 @@ let TaskService = class TaskService {
617
614
  if (terminalId) {
618
615
  const terminal = this.terminalService.getByTerminalId(terminalId);
619
616
  if (terminal) {
620
- if (common_2.TaskOutputPresentation.shouldSetFocusToTerminal(task)) { // assign focus to the terminal if presentation.focus is true
617
+ if (TaskOutputPresentation.shouldSetFocusToTerminal(task)) { // assign focus to the terminal if presentation.focus is true
621
618
  this.terminalService.open(terminal, { mode: 'activate' });
622
619
  }
623
- else if (common_2.TaskOutputPresentation.shouldAlwaysRevealTerminal(task)) { // show the terminal but not assign focus
620
+ else if (TaskOutputPresentation.shouldAlwaysRevealTerminal(task)) { // show the terminal but not assign focus
624
621
  this.terminalService.open(terminal, { mode: 'reveal' });
625
622
  }
626
623
  }
627
624
  }
628
- const terminateTaskAction = common_1.nls.localizeByDefault('Terminate Task');
629
- const restartTaskAction = common_1.nls.localizeByDefault('Restart Running Task');
630
- const selectedAction = await this.messageService.info(common_1.nls.localizeByDefault('Task `{0}` is already running.', taskName), terminateTaskAction, restartTaskAction);
625
+ const terminateTaskAction = nls.localizeByDefault('Terminate Task');
626
+ const restartTaskAction = nls.localizeByDefault('Restart Running Task');
627
+ const selectedAction = await this.messageService.info(nls.localizeByDefault('Task `{0}` is already running.', taskName), terminateTaskAction, restartTaskAction);
631
628
  if (selectedAction === terminateTaskAction) {
632
629
  await this.terminateTask(matchedRunningTaskInfo);
633
630
  }
@@ -691,6 +688,9 @@ let TaskService = class TaskService {
691
688
  return this.runResolvedTask(taskToRun, option);
692
689
  }
693
690
  catch (error) {
691
+ if (isCancelled(error)) {
692
+ return undefined;
693
+ }
694
694
  const errMessage = `Error resolving task '${task.label}': ${error}`;
695
695
  this.logger.error(errMessage);
696
696
  }
@@ -727,7 +727,7 @@ let TaskService = class TaskService {
727
727
  const taskCustomization = await this.getTaskCustomization(task);
728
728
  const resolvedMatchers = await this.resolveProblemMatchers(task, taskCustomization);
729
729
  try {
730
- const rootNode = new task_node_1.TaskNode(task, [], []);
730
+ const rootNode = new TaskNode(task, [], []);
731
731
  this.detectDirectedAcyclicGraph(task, rootNode, tasks);
732
732
  }
733
733
  catch (error) {
@@ -754,10 +754,10 @@ let TaskService = class TaskService {
754
754
  async updateTaskConfiguration(token, task, update) {
755
755
  if (update.problemMatcher) {
756
756
  if (Array.isArray(update.problemMatcher)) {
757
- update.problemMatcher.forEach((_name, index) => update.problemMatcher[index] = (0, common_2.asVariableName)(update.problemMatcher[index]));
757
+ update.problemMatcher.forEach((_name, index) => update.problemMatcher[index] = asVariableName(update.problemMatcher[index]));
758
758
  }
759
759
  else {
760
- update.problemMatcher = (0, common_2.asVariableName)(update.problemMatcher);
760
+ update.problemMatcher = asVariableName(update.problemMatcher);
761
761
  }
762
762
  }
763
763
  this.taskConfigurations.updateTaskConfig(token, task, update);
@@ -786,7 +786,7 @@ let TaskService = class TaskService {
786
786
  const scope = task._scope || task._source;
787
787
  if (resolvedMatcher.filePrefix && scope) {
788
788
  const options = {
789
- context: new uri_1.default(scope).withScheme('file'),
789
+ context: new URI(scope).withScheme('file'),
790
790
  configurationSection: 'tasks'
791
791
  };
792
792
  const resolvedPrefix = await this.variableResolverService.resolve(resolvedMatcher.filePrefix, options);
@@ -823,7 +823,7 @@ let TaskService = class TaskService {
823
823
  const existingMarkers = this.problemManager.findMarkers({ owner: matcher.owner });
824
824
  const uris = new Set();
825
825
  existingMarkers.forEach(marker => uris.add(marker.uri));
826
- uris.forEach(uriString => this.problemManager.setMarkers(new uri_1.default(uriString), matcher.owner, []));
826
+ uris.forEach(uriString => this.problemManager.setMarkers(new URI(uriString), matcher.owner, []));
827
827
  }
828
828
  }
829
829
  }
@@ -857,7 +857,7 @@ let TaskService = class TaskService {
857
857
  }
858
858
  catch (error) {
859
859
  this.logger.error(`Error launching task '${taskLabel}': ${error.message}`);
860
- this.messageService.error(common_1.nls.localize('theia/task/errorLaunchingTask', "Error launching task '{0}': {1}", taskLabel, error.message));
860
+ this.messageService.error(nls.localize('theia/task/errorLaunchingTask', "Error launching task '{0}': {1}", taskLabel, error.message));
861
861
  if (taskInfo && typeof taskInfo.terminalId === 'number') {
862
862
  this.shellTerminalServer.onAttachAttempted(taskInfo.terminalId);
863
863
  }
@@ -866,15 +866,15 @@ let TaskService = class TaskService {
866
866
  getCustomizeProblemMatcherItems() {
867
867
  const items = [];
868
868
  items.push({
869
- label: common_1.nls.localizeByDefault('Continue without scanning the task output'),
869
+ label: nls.localizeByDefault('Continue without scanning the task output'),
870
870
  value: { problemMatchers: undefined }
871
871
  });
872
872
  items.push({
873
- label: common_1.nls.localize('theia/task/neverScanTaskOutput', 'Never scan the task output'),
873
+ label: nls.localize('theia/task/neverScanTaskOutput', 'Never scan the task output'),
874
874
  value: { problemMatchers: [] }
875
875
  });
876
876
  items.push({
877
- label: common_1.nls.localizeByDefault('Learn more about scanning the task output'),
877
+ label: nls.localizeByDefault('Learn more about scanning the task output'),
878
878
  value: { problemMatchers: undefined, learnMore: true }
879
879
  });
880
880
  items.push({ type: 'separator', label: 'registered parsers' });
@@ -882,7 +882,7 @@ let TaskService = class TaskService {
882
882
  items.push(...registeredProblemMatchers.map(matcher => ({
883
883
  label: matcher.label,
884
884
  value: { problemMatchers: [matcher] },
885
- description: (0, common_2.asVariableName)(matcher.name)
885
+ description: asVariableName(matcher.name)
886
886
  })));
887
887
  return items;
888
888
  }
@@ -897,15 +897,15 @@ let TaskService = class TaskService {
897
897
  const startCharacter = this.editorManager.currentEditor.editor.selection.start.character;
898
898
  const endLine = this.editorManager.currentEditor.editor.selection.end.line;
899
899
  const endCharacter = this.editorManager.currentEditor.editor.selection.end.character;
900
- let selectedRange = vscode_languageserver_protocol_1.Range.create(startLine, startCharacter, endLine, endCharacter);
900
+ let selectedRange = Range.create(startLine, startCharacter, endLine, endCharacter);
901
901
  // if no text is selected, default to selecting entire line
902
902
  if (startLine === endLine && startCharacter === endCharacter) {
903
- selectedRange = vscode_languageserver_protocol_1.Range.create(startLine, 0, endLine + 1, 0);
903
+ selectedRange = Range.create(startLine, 0, endLine + 1, 0);
904
904
  }
905
905
  const selectedText = this.editorManager.currentEditor.editor.document.getText(selectedRange).trimRight() + '\n';
906
906
  let terminal = this.terminalService.lastUsedTerminal;
907
907
  if (!terminal || terminal.kind !== 'user' || (await terminal.hasChildProcesses())) {
908
- terminal = await this.terminalService.newTerminal({ created: (0, terminal_widget_impl_1.nextTerminalCreationToken)() });
908
+ terminal = await this.terminalService.newTerminal({ created: nextTerminalCreationToken() });
909
909
  await terminal.start();
910
910
  this.terminalService.open(terminal);
911
911
  }
@@ -916,11 +916,11 @@ let TaskService = class TaskService {
916
916
  if (taskInfo) {
917
917
  const terminalWidget = this.terminalService.getByTerminalId(terminalId);
918
918
  if (terminalWidget) {
919
- this.messageService.error(common_1.nls.localize('theia/task/taskAlreadyRunningInTerminal', 'Task is already running in terminal'));
919
+ this.messageService.error(nls.localize('theia/task/taskAlreadyRunningInTerminal', 'Task is already running in terminal'));
920
920
  return this.terminalService.open(terminalWidget, { mode: 'activate' });
921
921
  }
922
- if (common_2.TaskOutputPresentation.shouldAlwaysRevealTerminal(taskInfo.config)) {
923
- if (common_2.TaskOutputPresentation.shouldSetFocusToTerminal(taskInfo.config)) { // assign focus to the terminal if presentation.focus is true
922
+ if (TaskOutputPresentation.shouldAlwaysRevealTerminal(taskInfo.config)) {
923
+ if (TaskOutputPresentation.shouldSetFocusToTerminal(taskInfo.config)) { // assign focus to the terminal if presentation.focus is true
924
924
  widgetOpenMode = 'activate';
925
925
  }
926
926
  else { // show the terminal but not assign focus
@@ -931,9 +931,9 @@ let TaskService = class TaskService {
931
931
  const { taskId } = taskInfo;
932
932
  // Create / find a terminal widget to display an execution output of a task that was launched as a command inside a shell.
933
933
  const widget = await this.taskTerminalWidgetManager.open({
934
- created: (0, terminal_widget_impl_1.nextTerminalCreationToken)(),
934
+ created: nextTerminalCreationToken(),
935
935
  id: this.getTerminalWidgetId(terminalId),
936
- title: common_1.nls.localizeByDefault('Task: {0}', taskInfo.config.label || common_1.nls.localize('theia/task/taskIdLabel', '#{0}', taskId)),
936
+ title: nls.localizeByDefault('Task: {0}', taskInfo.config.label || nls.localize('theia/task/taskIdLabel', '#{0}', taskId)),
937
937
  destroyTermOnClose: true,
938
938
  useServerTitle: false
939
939
  }, {
@@ -978,7 +978,7 @@ let TaskService = class TaskService {
978
978
  }
979
979
  catch (error) {
980
980
  this.logger.error(`Error killing task '${id}': ${error}`);
981
- this.messageService.error(common_1.nls.localize('theia/task/errorKillingTask', "Error killing task '{0}': {1}", id, error));
981
+ this.messageService.error(nls.localize('theia/task/errorKillingTask', "Error killing task '{0}': {1}", id, error));
982
982
  return;
983
983
  }
984
984
  this.logger.debug(`Task killed. Task id: ${id}`);
@@ -1018,139 +1018,105 @@ let TaskService = class TaskService {
1018
1018
  return trusted === true;
1019
1019
  }
1020
1020
  };
1021
- exports.TaskService = TaskService;
1022
- tslib_1.__decorate([
1023
- (0, inversify_1.inject)(browser_1.FrontendApplication),
1024
- tslib_1.__metadata("design:type", browser_1.FrontendApplication)
1021
+ __decorate([
1022
+ inject(FrontendApplication)
1025
1023
  ], TaskService.prototype, "app", void 0);
1026
- tslib_1.__decorate([
1027
- (0, inversify_1.inject)(browser_1.ApplicationShell),
1028
- tslib_1.__metadata("design:type", browser_1.ApplicationShell)
1024
+ __decorate([
1025
+ inject(ApplicationShell)
1029
1026
  ], TaskService.prototype, "shell", void 0);
1030
- tslib_1.__decorate([
1031
- (0, inversify_1.inject)(common_2.TaskServer),
1032
- tslib_1.__metadata("design:type", Object)
1027
+ __decorate([
1028
+ inject(TaskServer)
1033
1029
  ], TaskService.prototype, "taskServer", void 0);
1034
- tslib_1.__decorate([
1035
- (0, inversify_1.inject)(common_1.ILogger),
1036
- (0, inversify_1.named)('task:TaskService'),
1037
- tslib_1.__metadata("design:type", Object)
1030
+ __decorate([
1031
+ inject(ILogger),
1032
+ named('task:TaskService')
1038
1033
  ], TaskService.prototype, "logger", void 0);
1039
- tslib_1.__decorate([
1040
- (0, inversify_1.inject)(browser_1.WidgetManager),
1041
- tslib_1.__metadata("design:type", browser_1.WidgetManager)
1034
+ __decorate([
1035
+ inject(WidgetManager)
1042
1036
  ], TaskService.prototype, "widgetManager", void 0);
1043
- tslib_1.__decorate([
1044
- (0, inversify_1.inject)(task_watcher_1.TaskWatcher),
1045
- tslib_1.__metadata("design:type", task_watcher_1.TaskWatcher)
1037
+ __decorate([
1038
+ inject(TaskWatcher)
1046
1039
  ], TaskService.prototype, "taskWatcher", void 0);
1047
- tslib_1.__decorate([
1048
- (0, inversify_1.inject)(message_service_1.MessageService),
1049
- tslib_1.__metadata("design:type", message_service_1.MessageService)
1040
+ __decorate([
1041
+ inject(MessageService)
1050
1042
  ], TaskService.prototype, "messageService", void 0);
1051
- tslib_1.__decorate([
1052
- (0, inversify_1.inject)(workspace_service_1.WorkspaceService),
1053
- tslib_1.__metadata("design:type", workspace_service_1.WorkspaceService)
1043
+ __decorate([
1044
+ inject(WorkspaceService)
1054
1045
  ], TaskService.prototype, "workspaceService", void 0);
1055
- tslib_1.__decorate([
1056
- (0, inversify_1.inject)(task_configurations_1.TaskConfigurations),
1057
- tslib_1.__metadata("design:type", task_configurations_1.TaskConfigurations)
1046
+ __decorate([
1047
+ inject(TaskConfigurations)
1058
1048
  ], TaskService.prototype, "taskConfigurations", void 0);
1059
- tslib_1.__decorate([
1060
- (0, inversify_1.inject)(provided_task_configurations_1.ProvidedTaskConfigurations),
1061
- tslib_1.__metadata("design:type", provided_task_configurations_1.ProvidedTaskConfigurations)
1049
+ __decorate([
1050
+ inject(ProvidedTaskConfigurations)
1062
1051
  ], TaskService.prototype, "providedTaskConfigurations", void 0);
1063
- tslib_1.__decorate([
1064
- (0, inversify_1.inject)(browser_3.VariableResolverService),
1065
- tslib_1.__metadata("design:type", browser_3.VariableResolverService)
1052
+ __decorate([
1053
+ inject(VariableResolverService)
1066
1054
  ], TaskService.prototype, "variableResolverService", void 0);
1067
- tslib_1.__decorate([
1068
- (0, inversify_1.inject)(task_contribution_1.TaskResolverRegistry),
1069
- tslib_1.__metadata("design:type", task_contribution_1.TaskResolverRegistry)
1055
+ __decorate([
1056
+ inject(TaskResolverRegistry)
1070
1057
  ], TaskService.prototype, "taskResolverRegistry", void 0);
1071
- tslib_1.__decorate([
1072
- (0, inversify_1.inject)(terminal_service_1.TerminalService),
1073
- tslib_1.__metadata("design:type", Object)
1058
+ __decorate([
1059
+ inject(TerminalService)
1074
1060
  ], TaskService.prototype, "terminalService", void 0);
1075
- tslib_1.__decorate([
1076
- (0, inversify_1.inject)(browser_2.EditorManager),
1077
- tslib_1.__metadata("design:type", browser_2.EditorManager)
1061
+ __decorate([
1062
+ inject(EditorManager)
1078
1063
  ], TaskService.prototype, "editorManager", void 0);
1079
- tslib_1.__decorate([
1080
- (0, inversify_1.inject)(problem_manager_1.ProblemManager),
1081
- tslib_1.__metadata("design:type", problem_manager_1.ProblemManager)
1064
+ __decorate([
1065
+ inject(ProblemManager)
1082
1066
  ], TaskService.prototype, "problemManager", void 0);
1083
- tslib_1.__decorate([
1084
- (0, inversify_1.inject)(task_definition_registry_1.TaskDefinitionRegistry),
1085
- tslib_1.__metadata("design:type", task_definition_registry_1.TaskDefinitionRegistry)
1067
+ __decorate([
1068
+ inject(TaskDefinitionRegistry)
1086
1069
  ], TaskService.prototype, "taskDefinitionRegistry", void 0);
1087
- tslib_1.__decorate([
1088
- (0, inversify_1.inject)(task_problem_matcher_registry_1.ProblemMatcherRegistry),
1089
- tslib_1.__metadata("design:type", task_problem_matcher_registry_1.ProblemMatcherRegistry)
1070
+ __decorate([
1071
+ inject(ProblemMatcherRegistry)
1090
1072
  ], TaskService.prototype, "problemMatcherRegistry", void 0);
1091
- tslib_1.__decorate([
1092
- (0, inversify_1.inject)(quick_pick_service_1.QuickPickService),
1093
- tslib_1.__metadata("design:type", Object)
1073
+ __decorate([
1074
+ inject(QuickPickService)
1094
1075
  ], TaskService.prototype, "quickPickService", void 0);
1095
- tslib_1.__decorate([
1096
- (0, inversify_1.inject)(opener_service_1.OpenerService),
1097
- tslib_1.__metadata("design:type", Object)
1076
+ __decorate([
1077
+ inject(OpenerService)
1098
1078
  ], TaskService.prototype, "openerService", void 0);
1099
- tslib_1.__decorate([
1100
- (0, inversify_1.inject)(shell_terminal_protocol_1.ShellTerminalServerProxy),
1101
- tslib_1.__metadata("design:type", Object)
1079
+ __decorate([
1080
+ inject(ShellTerminalServerProxy)
1102
1081
  ], TaskService.prototype, "shellTerminalServer", void 0);
1103
- tslib_1.__decorate([
1104
- (0, inversify_1.inject)(task_name_resolver_1.TaskNameResolver),
1105
- tslib_1.__metadata("design:type", task_name_resolver_1.TaskNameResolver)
1082
+ __decorate([
1083
+ inject(TaskNameResolver)
1106
1084
  ], TaskService.prototype, "taskNameResolver", void 0);
1107
- tslib_1.__decorate([
1108
- (0, inversify_1.inject)(task_source_resolver_1.TaskSourceResolver),
1109
- tslib_1.__metadata("design:type", task_source_resolver_1.TaskSourceResolver)
1085
+ __decorate([
1086
+ inject(TaskSourceResolver)
1110
1087
  ], TaskService.prototype, "taskSourceResolver", void 0);
1111
- tslib_1.__decorate([
1112
- (0, inversify_1.inject)(task_schema_updater_1.TaskSchemaUpdater),
1113
- tslib_1.__metadata("design:type", task_schema_updater_1.TaskSchemaUpdater)
1088
+ __decorate([
1089
+ inject(TaskSchemaUpdater)
1114
1090
  ], TaskService.prototype, "taskSchemaUpdater", void 0);
1115
- tslib_1.__decorate([
1116
- (0, inversify_1.inject)(task_configuration_manager_1.TaskConfigurationManager),
1117
- tslib_1.__metadata("design:type", task_configuration_manager_1.TaskConfigurationManager)
1091
+ __decorate([
1092
+ inject(TaskConfigurationManager)
1118
1093
  ], TaskService.prototype, "taskConfigurationManager", void 0);
1119
- tslib_1.__decorate([
1120
- (0, inversify_1.inject)(common_1.CommandService),
1121
- tslib_1.__metadata("design:type", Object)
1094
+ __decorate([
1095
+ inject(CommandService)
1122
1096
  ], TaskService.prototype, "commands", void 0);
1123
- tslib_1.__decorate([
1124
- (0, inversify_1.inject)(label_provider_1.LabelProvider),
1125
- tslib_1.__metadata("design:type", label_provider_1.LabelProvider)
1097
+ __decorate([
1098
+ inject(LabelProvider)
1126
1099
  ], TaskService.prototype, "labelProvider", void 0);
1127
- tslib_1.__decorate([
1128
- (0, inversify_1.inject)(monaco_workspace_1.MonacoWorkspace),
1129
- tslib_1.__metadata("design:type", monaco_workspace_1.MonacoWorkspace)
1100
+ __decorate([
1101
+ inject(MonacoWorkspace)
1130
1102
  ], TaskService.prototype, "monacoWorkspace", void 0);
1131
- tslib_1.__decorate([
1132
- (0, inversify_1.inject)(task_terminal_widget_manager_1.TaskTerminalWidgetManager),
1133
- tslib_1.__metadata("design:type", task_terminal_widget_manager_1.TaskTerminalWidgetManager)
1103
+ __decorate([
1104
+ inject(TaskTerminalWidgetManager)
1134
1105
  ], TaskService.prototype, "taskTerminalWidgetManager", void 0);
1135
- tslib_1.__decorate([
1136
- (0, inversify_1.inject)(task_context_key_service_1.TaskContextKeyService),
1137
- tslib_1.__metadata("design:type", task_context_key_service_1.TaskContextKeyService)
1106
+ __decorate([
1107
+ inject(TaskContextKeyService)
1138
1108
  ], TaskService.prototype, "taskContextKeyService", void 0);
1139
- tslib_1.__decorate([
1140
- (0, inversify_1.inject)(browser_4.WorkspaceTrustService),
1141
- tslib_1.__metadata("design:type", browser_4.WorkspaceTrustService)
1109
+ __decorate([
1110
+ inject(WorkspaceTrustService)
1142
1111
  ], TaskService.prototype, "workspaceTrustService", void 0);
1143
- tslib_1.__decorate([
1144
- (0, inversify_1.inject)(terminal_preferences_1.TerminalPreferences),
1145
- tslib_1.__metadata("design:type", Object)
1112
+ __decorate([
1113
+ inject(TerminalPreferences)
1146
1114
  ], TaskService.prototype, "terminalPreferences", void 0);
1147
- tslib_1.__decorate([
1148
- (0, inversify_1.postConstruct)(),
1149
- tslib_1.__metadata("design:type", Function),
1150
- tslib_1.__metadata("design:paramtypes", []),
1151
- tslib_1.__metadata("design:returntype", void 0)
1115
+ __decorate([
1116
+ postConstruct()
1152
1117
  ], TaskService.prototype, "init", null);
1153
- exports.TaskService = TaskService = tslib_1.__decorate([
1154
- (0, inversify_1.injectable)()
1118
+ TaskService = __decorate([
1119
+ injectable()
1155
1120
  ], TaskService);
1121
+ export { TaskService };
1156
1122
  //# sourceMappingURL=task-service.js.map