@theia/task 1.77.0-next.99 → 1.78.0-next.0
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.
- package/lib/browser/index.d.ts +6 -6
- package/lib/browser/index.d.ts.map +1 -1
- package/lib/browser/index.js +6 -9
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/process/process-task-contribution.d.ts +2 -2
- package/lib/browser/process/process-task-contribution.d.ts.map +1 -1
- package/lib/browser/process/process-task-contribution.js +8 -12
- package/lib/browser/process/process-task-contribution.js.map +1 -1
- package/lib/browser/process/process-task-frontend-module.js +7 -10
- package/lib/browser/process/process-task-frontend-module.js.map +1 -1
- package/lib/browser/process/process-task-resolver.d.ts +4 -4
- package/lib/browser/process/process-task-resolver.d.ts.map +1 -1
- package/lib/browser/process/process-task-resolver.js +18 -24
- package/lib/browser/process/process-task-resolver.js.map +1 -1
- package/lib/browser/process/process-task-resolver.spec.js +49 -52
- package/lib/browser/process/process-task-resolver.spec.js.map +1 -1
- package/lib/browser/provided-task-configurations.d.ts +3 -3
- package/lib/browser/provided-task-configurations.d.ts.map +1 -1
- package/lib/browser/provided-task-configurations.js +18 -23
- package/lib/browser/provided-task-configurations.js.map +1 -1
- package/lib/browser/provided-task-configurations.spec.js +14 -16
- package/lib/browser/provided-task-configurations.spec.js.map +1 -1
- package/lib/browser/quick-open-task.d.ts +7 -7
- package/lib/browser/quick-open-task.d.ts.map +1 -1
- package/lib/browser/quick-open-task.js +160 -199
- package/lib/browser/quick-open-task.js.map +1 -1
- package/lib/browser/task-configuration-manager.d.ts +4 -4
- package/lib/browser/task-configuration-manager.d.ts.map +1 -1
- package/lib/browser/task-configuration-manager.js +62 -78
- package/lib/browser/task-configuration-manager.js.map +1 -1
- package/lib/browser/task-configuration-model.d.ts +1 -1
- package/lib/browser/task-configuration-model.d.ts.map +1 -1
- package/lib/browser/task-configuration-model.js +9 -13
- package/lib/browser/task-configuration-model.js.map +1 -1
- package/lib/browser/task-configurations.d.ts +6 -6
- package/lib/browser/task-configurations.d.ts.map +1 -1
- package/lib/browser/task-configurations.js +41 -55
- package/lib/browser/task-configurations.js.map +1 -1
- package/lib/browser/task-context-key-service.js +13 -21
- package/lib/browser/task-context-key-service.js.map +1 -1
- package/lib/browser/task-contribution.d.ts +1 -1
- package/lib/browser/task-contribution.d.ts.map +1 -1
- package/lib/browser/task-contribution.js +20 -27
- package/lib/browser/task-contribution.js.map +1 -1
- package/lib/browser/task-definition-registry.d.ts +1 -1
- package/lib/browser/task-definition-registry.d.ts.map +1 -1
- package/lib/browser/task-definition-registry.js +12 -15
- package/lib/browser/task-definition-registry.js.map +1 -1
- package/lib/browser/task-definition-registry.spec.js +20 -22
- package/lib/browser/task-definition-registry.spec.js.map +1 -1
- package/lib/browser/task-frontend-contribution.d.ts +5 -5
- package/lib/browser/task-frontend-contribution.d.ts.map +1 -1
- package/lib/browser/task-frontend-contribution.js +83 -106
- package/lib/browser/task-frontend-contribution.js.map +1 -1
- package/lib/browser/task-frontend-module.d.ts +1 -1
- package/lib/browser/task-frontend-module.d.ts.map +1 -1
- package/lib/browser/task-frontend-module.js +64 -66
- package/lib/browser/task-frontend-module.js.map +1 -1
- package/lib/browser/task-name-resolver.d.ts +3 -3
- package/lib/browser/task-name-resolver.d.ts.map +1 -1
- package/lib/browser/task-name-resolver.js +11 -16
- package/lib/browser/task-name-resolver.js.map +1 -1
- package/lib/browser/task-node.d.ts +1 -1
- package/lib/browser/task-node.d.ts.map +1 -1
- package/lib/browser/task-node.js +1 -5
- package/lib/browser/task-node.js.map +1 -1
- package/lib/browser/task-problem-matcher-registry.d.ts +2 -2
- package/lib/browser/task-problem-matcher-registry.d.ts.map +1 -1
- package/lib/browser/task-problem-matcher-registry.js +64 -72
- package/lib/browser/task-problem-matcher-registry.js.map +1 -1
- package/lib/browser/task-problem-pattern-registry.d.ts +1 -1
- package/lib/browser/task-problem-pattern-registry.d.ts.map +1 -1
- package/lib/browser/task-problem-pattern-registry.js +30 -37
- package/lib/browser/task-problem-pattern-registry.js.map +1 -1
- package/lib/browser/task-schema-updater.d.ts +3 -3
- package/lib/browser/task-schema-updater.d.ts.map +1 -1
- package/lib/browser/task-schema-updater.js +116 -127
- package/lib/browser/task-schema-updater.js.map +1 -1
- package/lib/browser/task-service.d.ts +19 -15
- package/lib/browser/task-service.d.ts.map +1 -1
- package/lib/browser/task-service.js +170 -203
- package/lib/browser/task-service.js.map +1 -1
- package/lib/browser/task-service.spec.js +21 -24
- package/lib/browser/task-service.spec.js.map +1 -1
- package/lib/browser/task-source-resolver.d.ts +2 -2
- package/lib/browser/task-source-resolver.d.ts.map +1 -1
- package/lib/browser/task-source-resolver.js +10 -14
- package/lib/browser/task-source-resolver.js.map +1 -1
- package/lib/browser/task-templates.js +10 -13
- package/lib/browser/task-templates.js.map +1 -1
- package/lib/browser/task-terminal-widget-manager.d.ts +2 -2
- package/lib/browser/task-terminal-widget-manager.d.ts.map +1 -1
- package/lib/browser/task-terminal-widget-manager.js +39 -50
- package/lib/browser/task-terminal-widget-manager.js.map +1 -1
- package/lib/browser/tasks-monaco-contribution.js +1 -4
- package/lib/browser/tasks-monaco-contribution.js.map +1 -1
- package/lib/common/index.d.ts +4 -4
- package/lib/common/index.d.ts.map +1 -1
- package/lib/common/index.js +4 -7
- package/lib/common/index.js.map +1 -1
- package/lib/common/problem-matcher-protocol.js +17 -20
- package/lib/common/problem-matcher-protocol.js.map +1 -1
- package/lib/common/process/task-protocol.d.ts +1 -1
- package/lib/common/process/task-protocol.d.ts.map +1 -1
- package/lib/common/process/task-protocol.js +6 -9
- package/lib/common/process/task-protocol.js.map +1 -1
- package/lib/common/task-common-module.js +3 -6
- package/lib/common/task-common-module.js.map +1 -1
- package/lib/common/task-preferences.js +10 -14
- package/lib/common/task-preferences.js.map +1 -1
- package/lib/common/task-protocol.d.ts +1 -1
- package/lib/common/task-protocol.d.ts.map +1 -1
- package/lib/common/task-protocol.js +15 -18
- package/lib/common/task-protocol.js.map +1 -1
- package/lib/common/task-util.js +2 -6
- package/lib/common/task-util.js.map +1 -1
- package/lib/common/task-watcher.d.ts +1 -1
- package/lib/common/task-watcher.d.ts.map +1 -1
- package/lib/common/task-watcher.js +12 -15
- package/lib/common/task-watcher.js.map +1 -1
- package/lib/node/custom/custom-task-runner-backend-module.js +14 -17
- package/lib/node/custom/custom-task-runner-backend-module.js.map +1 -1
- package/lib/node/custom/custom-task-runner-contribution.d.ts +2 -2
- package/lib/node/custom/custom-task-runner-contribution.d.ts.map +1 -1
- package/lib/node/custom/custom-task-runner-contribution.js +8 -12
- package/lib/node/custom/custom-task-runner-contribution.js.map +1 -1
- package/lib/node/custom/custom-task-runner.d.ts +4 -4
- package/lib/node/custom/custom-task-runner.d.ts.map +1 -1
- package/lib/node/custom/custom-task-runner.js +15 -21
- package/lib/node/custom/custom-task-runner.js.map +1 -1
- package/lib/node/custom/custom-task.d.ts +4 -4
- package/lib/node/custom/custom-task.d.ts.map +1 -1
- package/lib/node/custom/custom-task.js +15 -19
- package/lib/node/custom/custom-task.js.map +1 -1
- package/lib/node/index.d.ts +3 -3
- package/lib/node/index.d.ts.map +1 -1
- package/lib/node/index.js +3 -6
- package/lib/node/index.js.map +1 -1
- package/lib/node/process/process-task-runner-backend-module.js +14 -17
- package/lib/node/process/process-task-runner-backend-module.js.map +1 -1
- package/lib/node/process/process-task-runner-contribution.d.ts +2 -2
- package/lib/node/process/process-task-runner-contribution.d.ts.map +1 -1
- package/lib/node/process/process-task-runner-contribution.js +8 -12
- package/lib/node/process/process-task-runner-contribution.js.map +1 -1
- package/lib/node/process/process-task-runner.d.ts +5 -5
- package/lib/node/process/process-task-runner.d.ts.map +1 -1
- package/lib/node/process/process-task-runner.js +37 -44
- package/lib/node/process/process-task-runner.js.map +1 -1
- package/lib/node/process/process-task.d.ts +5 -5
- package/lib/node/process/process-task.d.ts.map +1 -1
- package/lib/node/process/process-task.js +16 -21
- package/lib/node/process/process-task.js.map +1 -1
- package/lib/node/process/process-task.spec.js +6 -8
- package/lib/node/process/process-task.spec.js.map +1 -1
- package/lib/node/task-abstract-line-matcher.d.ts +1 -1
- package/lib/node/task-abstract-line-matcher.d.ts.map +1 -1
- package/lib/node/task-abstract-line-matcher.js +28 -33
- package/lib/node/task-abstract-line-matcher.js.map +1 -1
- package/lib/node/task-backend-application-contribution.d.ts +1 -1
- package/lib/node/task-backend-application-contribution.d.ts.map +1 -1
- package/lib/node/task-backend-application-contribution.js +12 -17
- package/lib/node/task-backend-application-contribution.js.map +1 -1
- package/lib/node/task-backend-module.js +27 -29
- package/lib/node/task-backend-module.js.map +1 -1
- package/lib/node/task-line-matchers.d.ts +2 -2
- package/lib/node/task-line-matchers.d.ts.map +1 -1
- package/lib/node/task-line-matchers.js +3 -8
- package/lib/node/task-line-matchers.js.map +1 -1
- package/lib/node/task-manager.d.ts +2 -2
- package/lib/node/task-manager.d.ts.map +1 -1
- package/lib/node/task-manager.js +9 -13
- package/lib/node/task-manager.js.map +1 -1
- package/lib/node/task-problem-collector.d.ts +1 -1
- package/lib/node/task-problem-collector.d.ts.map +1 -1
- package/lib/node/task-problem-collector.js +9 -13
- package/lib/node/task-problem-collector.js.map +1 -1
- package/lib/node/task-problem-collector.spec.js +63 -65
- package/lib/node/task-problem-collector.spec.js.map +1 -1
- package/lib/node/task-runner-protocol.d.ts +2 -2
- package/lib/node/task-runner-protocol.d.ts.map +1 -1
- package/lib/node/task-runner-protocol.js +1 -4
- package/lib/node/task-runner-protocol.js.map +1 -1
- package/lib/node/task-runner.d.ts +2 -2
- package/lib/node/task-runner.d.ts.map +1 -1
- package/lib/node/task-runner.js +13 -20
- package/lib/node/task-runner.js.map +1 -1
- package/lib/node/task-server.d.ts +5 -5
- package/lib/node/task-server.d.ts.map +1 -1
- package/lib/node/task-server.js +21 -27
- package/lib/node/task-server.js.map +1 -1
- package/lib/node/task-server.slow-spec.js +58 -60
- package/lib/node/task-server.slow-spec.js.map +1 -1
- package/lib/node/task.d.ts +2 -2
- package/lib/node/task.d.ts.map +1 -1
- package/lib/node/task.js +12 -16
- package/lib/node/task.js.map +1 -1
- package/lib/node/test/task-test-container.js +28 -32
- package/lib/node/test/task-test-container.js.map +1 -1
- package/package.json +24 -13
- package/src/browser/index.ts +6 -6
- package/src/browser/process/process-task-contribution.ts +2 -2
- package/src/browser/process/process-task-frontend-module.ts +3 -3
- package/src/browser/process/process-task-resolver.spec.ts +4 -4
- package/src/browser/process/process-task-resolver.ts +4 -4
- package/src/browser/provided-task-configurations.spec.ts +4 -4
- package/src/browser/provided-task-configurations.ts +3 -3
- package/src/browser/quick-open-task.ts +8 -8
- package/src/browser/task-configuration-manager.ts +6 -6
- package/src/browser/task-configuration-model.ts +2 -2
- package/src/browser/task-configurations.ts +6 -6
- package/src/browser/task-contribution.ts +1 -1
- package/src/browser/task-definition-registry.spec.ts +2 -2
- package/src/browser/task-definition-registry.ts +1 -1
- package/src/browser/task-frontend-contribution.ts +5 -5
- package/src/browser/task-frontend-module.ts +22 -22
- package/src/browser/task-name-resolver.ts +3 -3
- package/src/browser/task-node.ts +1 -1
- package/src/browser/task-problem-matcher-registry.ts +2 -2
- package/src/browser/task-problem-pattern-registry.ts +1 -1
- package/src/browser/task-schema-updater.ts +5 -5
- package/src/browser/task-service.spec.ts +4 -4
- package/src/browser/task-service.ts +20 -16
- package/src/browser/task-source-resolver.ts +2 -2
- package/src/browser/task-terminal-widget-manager.ts +3 -3
- package/src/common/index.ts +4 -4
- package/src/common/process/task-protocol.ts +1 -1
- package/src/common/task-common-module.ts +1 -1
- package/src/common/task-protocol.ts +1 -1
- package/src/common/task-watcher.ts +1 -1
- package/src/node/custom/custom-task-runner-backend-module.ts +4 -4
- package/src/node/custom/custom-task-runner-contribution.ts +2 -2
- package/src/node/custom/custom-task-runner.ts +4 -4
- package/src/node/custom/custom-task.ts +4 -4
- package/src/node/index.ts +3 -3
- package/src/node/process/process-task-runner-backend-module.ts +4 -4
- package/src/node/process/process-task-runner-contribution.ts +2 -2
- package/src/node/process/process-task-runner.ts +5 -5
- package/src/node/process/process-task.spec.ts +1 -1
- package/src/node/process/process-task.ts +5 -5
- package/src/node/task-abstract-line-matcher.ts +1 -1
- package/src/node/task-backend-application-contribution.ts +1 -1
- package/src/node/task-backend-module.ts +9 -9
- package/src/node/task-line-matchers.ts +2 -2
- package/src/node/task-manager.ts +2 -2
- package/src/node/task-problem-collector.spec.ts +2 -2
- package/src/node/task-problem-collector.ts +3 -3
- package/src/node/task-runner-protocol.ts +2 -2
- package/src/node/task-runner.ts +2 -2
- package/src/node/task-server.slow-spec.ts +4 -4
- package/src/node/task-server.ts +8 -8
- package/src/node/task.ts +2 -2
- package/src/node/test/task-test-container.ts +1 -1
package/package.json
CHANGED
|
@@ -1,19 +1,20 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/task",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.78.0-next.0+b0e3080cb",
|
|
4
4
|
"description": "Theia - Task extension. This extension adds support for executing raw or terminal processes in the backend.",
|
|
5
|
+
"type": "module",
|
|
5
6
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.
|
|
7
|
-
"@theia/editor": "1.
|
|
8
|
-
"@theia/filesystem": "1.
|
|
9
|
-
"@theia/markers": "1.
|
|
10
|
-
"@theia/monaco": "1.
|
|
7
|
+
"@theia/core": "1.78.0-next.0+b0e3080cb",
|
|
8
|
+
"@theia/editor": "1.78.0-next.0+b0e3080cb",
|
|
9
|
+
"@theia/filesystem": "1.78.0-next.0+b0e3080cb",
|
|
10
|
+
"@theia/markers": "1.78.0-next.0+b0e3080cb",
|
|
11
|
+
"@theia/monaco": "1.78.0-next.0+b0e3080cb",
|
|
11
12
|
"@theia/monaco-editor-core": "1.108.201",
|
|
12
|
-
"@theia/process": "1.
|
|
13
|
-
"@theia/terminal": "1.
|
|
14
|
-
"@theia/userstorage": "1.
|
|
15
|
-
"@theia/variable-resolver": "1.
|
|
16
|
-
"@theia/workspace": "1.
|
|
13
|
+
"@theia/process": "1.78.0-next.0+b0e3080cb",
|
|
14
|
+
"@theia/terminal": "1.78.0-next.0+b0e3080cb",
|
|
15
|
+
"@theia/userstorage": "1.78.0-next.0+b0e3080cb",
|
|
16
|
+
"@theia/variable-resolver": "1.78.0-next.0+b0e3080cb",
|
|
17
|
+
"@theia/workspace": "1.78.0-next.0+b0e3080cb",
|
|
17
18
|
"async-mutex": "^0.3.2",
|
|
18
19
|
"jsonc-parser": "^3.3.1",
|
|
19
20
|
"p-debounce": "^2.1.0",
|
|
@@ -53,10 +54,20 @@
|
|
|
53
54
|
"watch": "theiaext watch"
|
|
54
55
|
},
|
|
55
56
|
"devDependencies": {
|
|
56
|
-
"@theia/ext-scripts": "1.
|
|
57
|
+
"@theia/ext-scripts": "1.77.0"
|
|
57
58
|
},
|
|
58
59
|
"nyc": {
|
|
59
60
|
"extends": "../../configs/nyc.json"
|
|
60
61
|
},
|
|
61
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "b0e3080cb1b1fff5616555f1bf679834129da171",
|
|
63
|
+
"exports": {
|
|
64
|
+
"./package.json": "./package.json",
|
|
65
|
+
"./lib/browser": "./lib/browser/index.js",
|
|
66
|
+
"./lib/common": "./lib/common/index.js",
|
|
67
|
+
"./lib/node": "./lib/node/index.js",
|
|
68
|
+
"./lib/*.json": "./lib/*.json",
|
|
69
|
+
"./lib/*.js": "./lib/*.js",
|
|
70
|
+
"./lib/*": "./lib/*.js",
|
|
71
|
+
"./*": "./*"
|
|
72
|
+
}
|
|
62
73
|
}
|
package/src/browser/index.ts
CHANGED
|
@@ -14,9 +14,9 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
export * from './task-service';
|
|
18
|
-
export * from './task-contribution';
|
|
19
|
-
export * from './task-definition-registry';
|
|
20
|
-
export * from './task-problem-matcher-registry';
|
|
21
|
-
export * from './task-problem-pattern-registry';
|
|
22
|
-
export * from './task-schema-updater';
|
|
17
|
+
export * from './task-service.js';
|
|
18
|
+
export * from './task-contribution.js';
|
|
19
|
+
export * from './task-definition-registry.js';
|
|
20
|
+
export * from './task-problem-matcher-registry.js';
|
|
21
|
+
export * from './task-problem-pattern-registry.js';
|
|
22
|
+
export * from './task-schema-updater.js';
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { injectable, inject } from '@theia/core/shared/inversify';
|
|
18
|
-
import { ProcessTaskResolver } from './process-task-resolver';
|
|
19
|
-
import { TaskContribution, TaskResolverRegistry } from '../task-contribution';
|
|
18
|
+
import { ProcessTaskResolver } from './process-task-resolver.js';
|
|
19
|
+
import { TaskContribution, TaskResolverRegistry } from '../task-contribution.js';
|
|
20
20
|
|
|
21
21
|
@injectable()
|
|
22
22
|
export class ProcessTaskContribution implements TaskContribution {
|
|
@@ -15,9 +15,9 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { interfaces } from '@theia/core/shared/inversify';
|
|
18
|
-
import { ProcessTaskContribution } from './process-task-contribution';
|
|
19
|
-
import { ProcessTaskResolver } from './process-task-resolver';
|
|
20
|
-
import { TaskContribution } from '../task-contribution';
|
|
18
|
+
import { ProcessTaskContribution } from './process-task-contribution.js';
|
|
19
|
+
import { ProcessTaskResolver } from './process-task-resolver.js';
|
|
20
|
+
import { TaskContribution } from '../task-contribution.js';
|
|
21
21
|
|
|
22
22
|
export function bindProcessTaskModule(bind: interfaces.Bind): void {
|
|
23
23
|
|
|
@@ -30,10 +30,10 @@ import URI from '@theia/core/lib/common/uri';
|
|
|
30
30
|
import { Variable, VariableRegistry } from '@theia/variable-resolver/lib/browser/variable';
|
|
31
31
|
import { VariableResolverService } from '@theia/variable-resolver/lib/browser';
|
|
32
32
|
import { WorkspaceService } from '@theia/workspace/lib/browser';
|
|
33
|
-
import { TaskDefinitionRegistry } from '../task-definition-registry';
|
|
34
|
-
import { TaskScope } from '../../common/task-protocol';
|
|
35
|
-
import { ProcessTaskConfiguration } from '../../common/process/task-protocol';
|
|
36
|
-
import { ProcessTaskResolver } from './process-task-resolver';
|
|
33
|
+
import { TaskDefinitionRegistry } from '../task-definition-registry.js';
|
|
34
|
+
import { TaskScope } from '../../common/task-protocol.js';
|
|
35
|
+
import { ProcessTaskConfiguration } from '../../common/process/task-protocol.js';
|
|
36
|
+
import { ProcessTaskResolver } from './process-task-resolver.js';
|
|
37
37
|
|
|
38
38
|
disableJSDOM();
|
|
39
39
|
|
|
@@ -16,10 +16,10 @@
|
|
|
16
16
|
|
|
17
17
|
import { injectable, inject } from '@theia/core/shared/inversify';
|
|
18
18
|
import { VariableResolveOptions, VariableResolverService } from '@theia/variable-resolver/lib/browser';
|
|
19
|
-
import { TaskResolver } from '../task-contribution';
|
|
20
|
-
import { TaskConfiguration } from '../../common/task-protocol';
|
|
21
|
-
import { CommandProperties, ProcessTaskConfiguration } from '../../common/process/task-protocol';
|
|
22
|
-
import { TaskDefinitionRegistry } from '../task-definition-registry';
|
|
19
|
+
import { TaskResolver } from '../task-contribution.js';
|
|
20
|
+
import { TaskConfiguration } from '../../common/task-protocol.js';
|
|
21
|
+
import { CommandProperties, ProcessTaskConfiguration } from '../../common/process/task-protocol.js';
|
|
22
|
+
import { TaskDefinitionRegistry } from '../task-definition-registry.js';
|
|
23
23
|
import URI from '@theia/core/lib/common/uri';
|
|
24
24
|
import { WorkspaceService } from '@theia/workspace/lib/browser';
|
|
25
25
|
import { cancelled } from '@theia/core/lib/common/cancellation';
|
|
@@ -16,10 +16,10 @@
|
|
|
16
16
|
|
|
17
17
|
import { assert } from 'chai';
|
|
18
18
|
import { Container } from '@theia/core/shared/inversify';
|
|
19
|
-
import { ProvidedTaskConfigurations } from './provided-task-configurations';
|
|
20
|
-
import { TaskDefinitionRegistry } from './task-definition-registry';
|
|
21
|
-
import { TaskProviderRegistry } from './task-contribution';
|
|
22
|
-
import { TaskConfiguration } from '../common';
|
|
19
|
+
import { ProvidedTaskConfigurations } from './provided-task-configurations.js';
|
|
20
|
+
import { TaskDefinitionRegistry } from './task-definition-registry.js';
|
|
21
|
+
import { TaskProviderRegistry } from './task-contribution.js';
|
|
22
|
+
import { TaskConfiguration } from '../common/index.js';
|
|
23
23
|
|
|
24
24
|
describe('provided-task-configurations', () => {
|
|
25
25
|
let container: Container;
|
|
@@ -15,9 +15,9 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
18
|
-
import { TaskProviderRegistry, TaskProvider } from './task-contribution';
|
|
19
|
-
import { TaskDefinitionRegistry } from './task-definition-registry';
|
|
20
|
-
import { TaskConfiguration, TaskCustomization, TaskOutputPresentation, TaskConfigurationScope, TaskScope } from '../common';
|
|
18
|
+
import { TaskProviderRegistry, TaskProvider } from './task-contribution.js';
|
|
19
|
+
import { TaskDefinitionRegistry } from './task-definition-registry.js';
|
|
20
|
+
import { TaskConfiguration, TaskCustomization, TaskOutputPresentation, TaskConfigurationScope, TaskScope } from '../common/index.js';
|
|
21
21
|
|
|
22
22
|
export const ALL_TASK_TYPES: string = '*';
|
|
23
23
|
|
|
@@ -15,22 +15,22 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { inject, injectable, optional } from '@theia/core/shared/inversify';
|
|
18
|
-
import { TaskService } from './task-service';
|
|
19
|
-
import { TaskInfo, TaskConfiguration, TaskCustomization, TaskScope, TaskConfigurationScope, TaskDefinition } from '../common/task-protocol';
|
|
20
|
-
import { TaskDefinitionRegistry } from './task-definition-registry';
|
|
18
|
+
import { TaskService } from './task-service.js';
|
|
19
|
+
import { TaskInfo, TaskConfiguration, TaskCustomization, TaskScope, TaskConfigurationScope, TaskDefinition } from '../common/task-protocol.js';
|
|
20
|
+
import { TaskDefinitionRegistry } from './task-definition-registry.js';
|
|
21
21
|
import URI from '@theia/core/lib/common/uri';
|
|
22
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
|
-
import { ALL_TASK_TYPES } from './provided-task-configurations';
|
|
26
|
-
import { TaskNameResolver } from './task-name-resolver';
|
|
27
|
-
import { TaskSourceResolver } from './task-source-resolver';
|
|
28
|
-
import { TaskConfigurationManager } from './task-configuration-manager';
|
|
25
|
+
import { ALL_TASK_TYPES } from './provided-task-configurations.js';
|
|
26
|
+
import { TaskNameResolver } from './task-name-resolver.js';
|
|
27
|
+
import { TaskSourceResolver } from './task-source-resolver.js';
|
|
28
|
+
import { TaskConfigurationManager } from './task-configuration-manager.js';
|
|
29
29
|
import { filterItems, QuickInputButton, QuickPickItem, QuickPickItemOrSeparator, QuickPicks, QuickPickInput, QuickPickValue } from
|
|
30
30
|
'@theia/core/lib/browser/quick-input/quick-input-service';
|
|
31
31
|
import { CancellationToken, PreferenceService } from '@theia/core/lib/common';
|
|
32
32
|
import { nls } from '@theia/core/lib/common/nls';
|
|
33
|
-
import { TriggerAction } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/browser/pickerQuickAccess';
|
|
33
|
+
import { TriggerAction } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/browser/pickerQuickAccess.js';
|
|
34
34
|
|
|
35
35
|
export namespace ConfigureTaskAction {
|
|
36
36
|
export const ID = 'workbench.action.tasks.configureTaskRunner';
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import * as jsoncparser from 'jsonc-parser';
|
|
18
|
-
import debounce
|
|
18
|
+
import debounce from 'p-debounce';
|
|
19
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';
|
|
@@ -23,14 +23,14 @@ import { EditorManager, EditorWidget } from '@theia/editor/lib/browser';
|
|
|
23
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
|
-
import { TaskConfigurationModel } from './task-configuration-model';
|
|
27
|
-
import { TaskTemplateSelector } from './task-templates';
|
|
28
|
-
import { TaskCustomization, TaskConfiguration, TaskConfigurationScope, TaskScope } from '../common/task-protocol';
|
|
26
|
+
import { TaskConfigurationModel } from './task-configuration-model.js';
|
|
27
|
+
import { TaskTemplateSelector } from './task-templates.js';
|
|
28
|
+
import { TaskCustomization, TaskConfiguration, TaskConfigurationScope, TaskScope } from '../common/task-protocol.js';
|
|
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
31
|
import { PreferenceConfigurations } from '@theia/core/lib/common/preferences/preference-configurations';
|
|
32
32
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
33
|
-
import { TaskSchemaUpdater } from './task-schema-updater';
|
|
33
|
+
import { TaskSchemaUpdater } from './task-schema-updater.js';
|
|
34
34
|
import { JSONObject } from '@theia/core/shared/@lumino/coreutils';
|
|
35
35
|
import { PreferenceProvider } from '@theia/core/lib/common/preferences/preference-provider';
|
|
36
36
|
|
|
@@ -85,7 +85,7 @@ export class TaskConfigurationManager {
|
|
|
85
85
|
protected init(): void {
|
|
86
86
|
this.createModels();
|
|
87
87
|
this.preferenceProviderProvider(PreferenceScope.Folder)?.onDidPreferencesChanged(e => {
|
|
88
|
-
if (e
|
|
88
|
+
if (e.some(change => change.preferenceName === 'tasks')) {
|
|
89
89
|
this.updateModels();
|
|
90
90
|
}
|
|
91
91
|
});
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
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
|
-
import { TaskCustomization, TaskConfiguration, TaskConfigurationScope } from '../common/task-protocol';
|
|
20
|
+
import { TaskCustomization, TaskConfiguration, TaskConfigurationScope } from '../common/task-protocol.js';
|
|
21
21
|
import { PreferenceProviderDataChanges, PreferenceProviderDataChange, isObject } from '@theia/core/lib/common';
|
|
22
22
|
import { PreferenceProvider } from '@theia/core/lib/common/preferences/preference-provider';
|
|
23
23
|
import { JSONValue } from '@theia/core/shared/@lumino/coreutils';
|
|
@@ -44,7 +44,7 @@ export class TaskConfigurationModel implements Disposable {
|
|
|
44
44
|
this.reconcile();
|
|
45
45
|
if (this.preferences) {
|
|
46
46
|
this.toDispose.push(this.preferences.onDidPreferencesChanged((e: PreferenceProviderDataChanges) => {
|
|
47
|
-
const change = e
|
|
47
|
+
const change = e.find(c => c.preferenceName === 'tasks');
|
|
48
48
|
if (change && PreferenceProviderDataChange.affects(change, this.getWorkspaceFolder())) {
|
|
49
49
|
this.reconcile();
|
|
50
50
|
}
|
|
@@ -23,12 +23,12 @@ import {
|
|
|
23
23
|
TaskConfigurationScope,
|
|
24
24
|
TaskScope,
|
|
25
25
|
asVariableName
|
|
26
|
-
} from '../common';
|
|
27
|
-
import { TaskDefinitionRegistry } from './task-definition-registry';
|
|
28
|
-
import { ProvidedTaskConfigurations } from './provided-task-configurations';
|
|
29
|
-
import { TaskConfigurationManager, TasksChange } from './task-configuration-manager';
|
|
30
|
-
import { TaskSchemaUpdater } from './task-schema-updater';
|
|
31
|
-
import { TaskSourceResolver } from './task-source-resolver';
|
|
26
|
+
} from '../common/index.js';
|
|
27
|
+
import { TaskDefinitionRegistry } from './task-definition-registry.js';
|
|
28
|
+
import { ProvidedTaskConfigurations } from './provided-task-configurations.js';
|
|
29
|
+
import { TaskConfigurationManager, TasksChange } from './task-configuration-manager.js';
|
|
30
|
+
import { TaskSchemaUpdater } from './task-schema-updater.js';
|
|
31
|
+
import { TaskSourceResolver } from './task-source-resolver.js';
|
|
32
32
|
import { Disposable, DisposableCollection } from '@theia/core/lib/common';
|
|
33
33
|
import { FileChangeType } from '@theia/filesystem/lib/common/filesystem-watcher-protocol';
|
|
34
34
|
import { WorkspaceService } from '@theia/workspace/lib/browser';
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
import { injectable, postConstruct, inject, named } from '@theia/core/shared/inversify';
|
|
18
18
|
import { Disposable } from '@theia/core/lib/common/disposable';
|
|
19
|
-
import { TaskConfiguration } from '../common/task-protocol';
|
|
19
|
+
import { TaskConfiguration } from '../common/task-protocol.js';
|
|
20
20
|
import { WaitUntilEvent, Emitter } from '@theia/core/lib/common/event';
|
|
21
21
|
import { ILogger } from '@theia/core';
|
|
22
22
|
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { expect } from 'chai';
|
|
18
|
-
import { PanelKind, RevealKind, TaskScope, TaskDefinition } from '../common';
|
|
19
|
-
import { TaskDefinitionRegistry } from './task-definition-registry';
|
|
18
|
+
import { PanelKind, RevealKind, TaskScope, TaskDefinition } from '../common/index.js';
|
|
19
|
+
import { TaskDefinitionRegistry } from './task-definition-registry.js';
|
|
20
20
|
|
|
21
21
|
describe('TaskDefinitionRegistry', () => {
|
|
22
22
|
let registry: TaskDefinitionRegistry;
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
import { injectable } from '@theia/core/shared/inversify';
|
|
18
18
|
import { JSONExt } from '@theia/core/shared/@lumino/coreutils';
|
|
19
19
|
import { Event, Emitter } from '@theia/core/lib/common';
|
|
20
|
-
import { TaskConfiguration, TaskDefinition, TaskCustomization } from '../common';
|
|
20
|
+
import { TaskConfiguration, TaskDefinition, TaskCustomization } from '../common/index.js';
|
|
21
21
|
import { Disposable } from '@theia/core/lib/common/disposable';
|
|
22
22
|
|
|
23
23
|
@injectable()
|
|
@@ -16,17 +16,17 @@
|
|
|
16
16
|
|
|
17
17
|
import { inject, injectable, named, postConstruct } from '@theia/core/shared/inversify';
|
|
18
18
|
import { ILogger, ContributionProvider, CommandContribution, Command, CommandRegistry, MenuContribution, MenuModelRegistry, nls } from '@theia/core/lib/common';
|
|
19
|
-
import { QuickOpenTask, TaskTerminateQuickOpen, TaskRunningQuickOpen, TaskRestartRunningQuickOpen } from './quick-open-task';
|
|
19
|
+
import { QuickOpenTask, TaskTerminateQuickOpen, TaskRunningQuickOpen, TaskRestartRunningQuickOpen } from './quick-open-task.js';
|
|
20
20
|
import {
|
|
21
21
|
FrontendApplication, FrontendApplicationContribution, QuickAccessContribution,
|
|
22
22
|
KeybindingRegistry, KeybindingContribution, StorageService, StatusBar, StatusBarAlignment, CommonMenus
|
|
23
23
|
} from '@theia/core/lib/browser';
|
|
24
24
|
import { WidgetManager } from '@theia/core/lib/browser/widget-manager';
|
|
25
|
-
import { TaskContribution, TaskResolverRegistry, TaskProviderRegistry } from './task-contribution';
|
|
26
|
-
import { TaskService } from './task-service';
|
|
25
|
+
import { TaskContribution, TaskResolverRegistry, TaskProviderRegistry } from './task-contribution.js';
|
|
26
|
+
import { TaskService } from './task-service.js';
|
|
27
27
|
import { TerminalMenus } from '@theia/terminal/lib/browser/terminal-frontend-contribution';
|
|
28
|
-
import { TaskSchemaUpdater } from './task-schema-updater';
|
|
29
|
-
import { TaskConfiguration, TaskWatcher } from '../common';
|
|
28
|
+
import { TaskSchemaUpdater } from './task-schema-updater.js';
|
|
29
|
+
import { TaskConfiguration, TaskWatcher } from '../common/index.js';
|
|
30
30
|
import { EditorManager } from '@theia/editor/lib/browser';
|
|
31
31
|
import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
|
|
32
32
|
|
|
@@ -18,31 +18,31 @@ import { ContainerModule } from '@theia/core/shared/inversify';
|
|
|
18
18
|
import { FrontendApplicationContribution, KeybindingContribution } from '@theia/core/lib/browser';
|
|
19
19
|
import { CommandContribution, MenuContribution, bindRootContributionProvider, nls } from '@theia/core/lib/common';
|
|
20
20
|
import { WebSocketConnectionProvider } from '@theia/core/lib/browser/messaging';
|
|
21
|
-
import { QuickOpenTask, TaskTerminateQuickOpen, TaskRestartRunningQuickOpen, TaskRunningQuickOpen } from './quick-open-task';
|
|
22
|
-
import { TaskContribution, TaskProviderRegistry, TaskResolverRegistry } from './task-contribution';
|
|
23
|
-
import { TaskService } from './task-service';
|
|
24
|
-
import { TaskConfigurations } from './task-configurations';
|
|
25
|
-
import { ProvidedTaskConfigurations } from './provided-task-configurations';
|
|
26
|
-
import { TaskFrontendContribution } from './task-frontend-contribution';
|
|
27
|
-
import { createCommonBindings } from '../common/task-common-module';
|
|
28
|
-
import { TaskServer, taskPath } from '../common/task-protocol';
|
|
29
|
-
import { TaskWatcher } from '../common/task-watcher';
|
|
30
|
-
import { bindProcessTaskModule } from './process/process-task-frontend-module';
|
|
31
|
-
import { TaskSchemaUpdater } from './task-schema-updater';
|
|
32
|
-
import { TaskDefinitionRegistry } from './task-definition-registry';
|
|
33
|
-
import { ProblemMatcherRegistry } from './task-problem-matcher-registry';
|
|
34
|
-
import { ProblemPatternRegistry } from './task-problem-pattern-registry';
|
|
35
|
-
import { TaskConfigurationManager } from './task-configuration-manager';
|
|
36
|
-
import { bindTaskPreferences } from '../common/task-preferences';
|
|
21
|
+
import { QuickOpenTask, TaskTerminateQuickOpen, TaskRestartRunningQuickOpen, TaskRunningQuickOpen } from './quick-open-task.js';
|
|
22
|
+
import { TaskContribution, TaskProviderRegistry, TaskResolverRegistry } from './task-contribution.js';
|
|
23
|
+
import { TaskService } from './task-service.js';
|
|
24
|
+
import { TaskConfigurations } from './task-configurations.js';
|
|
25
|
+
import { ProvidedTaskConfigurations } from './provided-task-configurations.js';
|
|
26
|
+
import { TaskFrontendContribution } from './task-frontend-contribution.js';
|
|
27
|
+
import { createCommonBindings } from '../common/task-common-module.js';
|
|
28
|
+
import { TaskServer, taskPath } from '../common/task-protocol.js';
|
|
29
|
+
import { TaskWatcher } from '../common/task-watcher.js';
|
|
30
|
+
import { bindProcessTaskModule } from './process/process-task-frontend-module.js';
|
|
31
|
+
import { TaskSchemaUpdater } from './task-schema-updater.js';
|
|
32
|
+
import { TaskDefinitionRegistry } from './task-definition-registry.js';
|
|
33
|
+
import { ProblemMatcherRegistry } from './task-problem-matcher-registry.js';
|
|
34
|
+
import { ProblemPatternRegistry } from './task-problem-pattern-registry.js';
|
|
35
|
+
import { TaskConfigurationManager } from './task-configuration-manager.js';
|
|
36
|
+
import { bindTaskPreferences } from '../common/task-preferences.js';
|
|
37
37
|
import '../../src/browser/style/index.css';
|
|
38
|
-
import './tasks-monaco-contribution';
|
|
39
|
-
import { TaskNameResolver } from './task-name-resolver';
|
|
40
|
-
import { TaskSourceResolver } from './task-source-resolver';
|
|
41
|
-
import { TaskTemplateSelector } from './task-templates';
|
|
42
|
-
import { TaskTerminalWidgetManager } from './task-terminal-widget-manager';
|
|
38
|
+
import './tasks-monaco-contribution.js';
|
|
39
|
+
import { TaskNameResolver } from './task-name-resolver.js';
|
|
40
|
+
import { TaskSourceResolver } from './task-source-resolver.js';
|
|
41
|
+
import { TaskTemplateSelector } from './task-templates.js';
|
|
42
|
+
import { TaskTerminalWidgetManager } from './task-terminal-widget-manager.js';
|
|
43
43
|
import { JsonSchemaContribution } from '@theia/core/lib/browser/json-schema-store';
|
|
44
44
|
import { QuickAccessContribution } from '@theia/core/lib/browser/quick-input/quick-access';
|
|
45
|
-
import { TaskContextKeyService } from './task-context-key-service';
|
|
45
|
+
import { TaskContextKeyService } from './task-context-key-service.js';
|
|
46
46
|
import { WorkspaceRestrictionContribution, WorkspaceRestriction } from '@theia/workspace/lib/browser/workspace-trust-service';
|
|
47
47
|
|
|
48
48
|
export default new ContainerModule(bind => {
|
|
@@ -15,9 +15,9 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
18
|
-
import { TaskConfiguration } from '../common';
|
|
19
|
-
import { TaskDefinitionRegistry } from './task-definition-registry';
|
|
20
|
-
import { TaskConfigurations } from './task-configurations';
|
|
18
|
+
import { TaskConfiguration } from '../common/index.js';
|
|
19
|
+
import { TaskDefinitionRegistry } from './task-definition-registry.js';
|
|
20
|
+
import { TaskConfigurations } from './task-configurations.js';
|
|
21
21
|
|
|
22
22
|
@injectable()
|
|
23
23
|
export class TaskNameResolver {
|
package/src/browser/task-node.ts
CHANGED
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
//
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
|
-
import { TaskConfiguration } from '../common';
|
|
16
|
+
import { TaskConfiguration } from '../common/index.js';
|
|
17
17
|
|
|
18
18
|
export class TaskNode {
|
|
19
19
|
|
|
@@ -26,8 +26,8 @@ import {
|
|
|
26
26
|
ApplyToKind, FileLocationKind, NamedProblemMatcher,
|
|
27
27
|
ProblemPattern, ProblemMatcher, ProblemMatcherContribution, WatchingMatcher,
|
|
28
28
|
fromVariableName
|
|
29
|
-
} from '../common';
|
|
30
|
-
import { ProblemPatternRegistry } from './task-problem-pattern-registry';
|
|
29
|
+
} from '../common/index.js';
|
|
30
|
+
import { ProblemPatternRegistry } from './task-problem-pattern-registry.js';
|
|
31
31
|
import { Severity } from '@theia/core/lib/common/severity';
|
|
32
32
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
33
33
|
import { ILogger } from '@theia/core';
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
23
23
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
24
24
|
import { injectable, inject, postConstruct, named } from '@theia/core/shared/inversify';
|
|
25
|
-
import { NamedProblemPattern, ProblemLocationKind, ProblemPattern, ProblemPatternContribution } from '../common';
|
|
25
|
+
import { NamedProblemPattern, ProblemLocationKind, ProblemPattern, ProblemPatternContribution } from '../common/index.js';
|
|
26
26
|
import { ILogger } from '@theia/core';
|
|
27
27
|
|
|
28
28
|
@injectable()
|
|
@@ -21,20 +21,20 @@
|
|
|
21
21
|
*--------------------------------------------------------------------------------------------*/
|
|
22
22
|
|
|
23
23
|
import Ajv from '@theia/core/shared/ajv';
|
|
24
|
-
import debounce
|
|
24
|
+
import debounce from 'p-debounce';
|
|
25
25
|
import { postConstruct, injectable, inject } from '@theia/core/shared/inversify';
|
|
26
26
|
import { JsonSchemaContribution, JsonSchemaDataStore, JsonSchemaRegisterContext } from '@theia/core/lib/browser/json-schema-store';
|
|
27
27
|
import { deepClone, Emitter, nls } from '@theia/core/lib/common';
|
|
28
28
|
import { IJSONSchema } from '@theia/core/lib/common/json-schema';
|
|
29
29
|
import { inputsSchema } from '@theia/variable-resolver/lib/browser/variable-input-schema';
|
|
30
30
|
import URI from '@theia/core/lib/common/uri';
|
|
31
|
-
import { ProblemMatcherRegistry } from './task-problem-matcher-registry';
|
|
32
|
-
import { TaskDefinitionRegistry } from './task-definition-registry';
|
|
33
|
-
import { TaskServer, asVariableName } from '../common';
|
|
31
|
+
import { ProblemMatcherRegistry } from './task-problem-matcher-registry.js';
|
|
32
|
+
import { TaskDefinitionRegistry } from './task-definition-registry.js';
|
|
33
|
+
import { TaskServer, asVariableName } from '../common/index.js';
|
|
34
34
|
import { UserStorageUri } from '@theia/userstorage/lib/browser';
|
|
35
35
|
import { WorkspaceService } from '@theia/workspace/lib/browser';
|
|
36
36
|
import { JSONObject } from '@theia/core/shared/@lumino/coreutils';
|
|
37
|
-
import { taskSchemaId } from '../common/task-preferences';
|
|
37
|
+
import { taskSchemaId } from '../common/task-preferences.js';
|
|
38
38
|
|
|
39
39
|
@injectable()
|
|
40
40
|
export class TaskSchemaUpdater implements JsonSchemaContribution {
|
|
@@ -28,10 +28,10 @@ const canvasContext = sinon.stub(HTMLCanvasElement.prototype, 'getContext');
|
|
|
28
28
|
import { expect } from 'chai';
|
|
29
29
|
import { cancelled } from '@theia/core/lib/common/cancellation';
|
|
30
30
|
import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
|
|
31
|
-
import { RunTaskOption, TaskConfiguration, TaskInfo, TaskScope } from '../common';
|
|
32
|
-
import { TaskResolverRegistry } from './task-contribution';
|
|
33
|
-
import { TaskDefinitionRegistry } from './task-definition-registry';
|
|
34
|
-
import { TaskService } from './task-service';
|
|
31
|
+
import { RunTaskOption, TaskConfiguration, TaskInfo, TaskScope } from '../common/index.js';
|
|
32
|
+
import { TaskResolverRegistry } from './task-contribution.js';
|
|
33
|
+
import { TaskDefinitionRegistry } from './task-definition-registry.js';
|
|
34
|
+
import { TaskService } from './task-service.js';
|
|
35
35
|
|
|
36
36
|
canvasContext.restore();
|
|
37
37
|
disableJSDOM();
|
|
@@ -51,24 +51,24 @@ import {
|
|
|
51
51
|
TaskOutputProcessedEvent,
|
|
52
52
|
TaskServer,
|
|
53
53
|
asVariableName
|
|
54
|
-
} from '../common';
|
|
55
|
-
import { TaskWatcher } from '../common/task-watcher';
|
|
56
|
-
import { ProvidedTaskConfigurations } from './provided-task-configurations';
|
|
57
|
-
import { TaskConfigurationClient, TaskConfigurations } from './task-configurations';
|
|
58
|
-
import { TaskResolverRegistry } from './task-contribution';
|
|
59
|
-
import { TaskDefinitionRegistry } from './task-definition-registry';
|
|
60
|
-
import { TaskNameResolver } from './task-name-resolver';
|
|
61
|
-
import { TaskSourceResolver } from './task-source-resolver';
|
|
62
|
-
import { ProblemMatcherRegistry } from './task-problem-matcher-registry';
|
|
63
|
-
import { TaskSchemaUpdater } from './task-schema-updater';
|
|
64
|
-
import { TaskConfigurationManager } from './task-configuration-manager';
|
|
54
|
+
} from '../common/index.js';
|
|
55
|
+
import { TaskWatcher } from '../common/task-watcher.js';
|
|
56
|
+
import { ProvidedTaskConfigurations } from './provided-task-configurations.js';
|
|
57
|
+
import { TaskConfigurationClient, TaskConfigurations } from './task-configurations.js';
|
|
58
|
+
import { TaskResolverRegistry } from './task-contribution.js';
|
|
59
|
+
import { TaskDefinitionRegistry } from './task-definition-registry.js';
|
|
60
|
+
import { TaskNameResolver } from './task-name-resolver.js';
|
|
61
|
+
import { TaskSourceResolver } from './task-source-resolver.js';
|
|
62
|
+
import { ProblemMatcherRegistry } from './task-problem-matcher-registry.js';
|
|
63
|
+
import { TaskSchemaUpdater } from './task-schema-updater.js';
|
|
64
|
+
import { TaskConfigurationManager } from './task-configuration-manager.js';
|
|
65
65
|
import { PROBLEMS_WIDGET_ID, ProblemWidget } from '@theia/markers/lib/browser/problem/problem-widget';
|
|
66
|
-
import { TaskNode } from './task-node';
|
|
66
|
+
import { TaskNode } from './task-node.js';
|
|
67
67
|
import { MonacoWorkspace } from '@theia/monaco/lib/browser/monaco-workspace';
|
|
68
|
-
import { TaskTerminalWidgetManager } from './task-terminal-widget-manager';
|
|
68
|
+
import { TaskTerminalWidgetManager } from './task-terminal-widget-manager.js';
|
|
69
69
|
import { ShellTerminalServerProxy } from '@theia/terminal/lib/common/shell-terminal-protocol';
|
|
70
70
|
import { Mutex } from 'async-mutex';
|
|
71
|
-
import { TaskContextKeyService } from './task-context-key-service';
|
|
71
|
+
import { TaskContextKeyService } from './task-context-key-service.js';
|
|
72
72
|
import { TerminalPreferences } from '@theia/terminal/lib/common/terminal-preferences';
|
|
73
73
|
|
|
74
74
|
export interface QuickPickProblemMatcherItem {
|
|
@@ -798,7 +798,7 @@ export class TaskService implements TaskConfigurationClient {
|
|
|
798
798
|
}
|
|
799
799
|
const terminateTaskAction = nls.localizeByDefault('Terminate Task');
|
|
800
800
|
const restartTaskAction = nls.localizeByDefault('Restart Running Task');
|
|
801
|
-
const selectedAction = await this.messageService.info(nls.localizeByDefault('Task
|
|
801
|
+
const selectedAction = await this.messageService.info(nls.localizeByDefault('Task \'{0}\' is already running.', taskName), terminateTaskAction, restartTaskAction);
|
|
802
802
|
if (selectedAction === terminateTaskAction) {
|
|
803
803
|
await this.terminateTask(matchedRunningTaskInfo);
|
|
804
804
|
} else if (selectedAction === restartTaskAction) {
|
|
@@ -1143,7 +1143,11 @@ export class TaskService implements TaskConfigurationClient {
|
|
|
1143
1143
|
await this.taskConfigurations.configure(token, task);
|
|
1144
1144
|
}
|
|
1145
1145
|
|
|
1146
|
-
|
|
1146
|
+
/**
|
|
1147
|
+
* @param context the context of a task event, see {@link TaskInfo.ctx}
|
|
1148
|
+
* @returns whether the event is for a task started by this client
|
|
1149
|
+
*/
|
|
1150
|
+
isEventForThisClient(context: string | undefined): boolean {
|
|
1147
1151
|
if (context === this.getContext()) {
|
|
1148
1152
|
return true;
|
|
1149
1153
|
}
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
18
|
-
import { TaskConfiguration, TaskScope } from '../common';
|
|
19
|
-
import { TaskDefinitionRegistry } from './task-definition-registry';
|
|
18
|
+
import { TaskConfiguration, TaskScope } from '../common/index.js';
|
|
19
|
+
import { TaskDefinitionRegistry } from './task-definition-registry.js';
|
|
20
20
|
|
|
21
21
|
@injectable()
|
|
22
22
|
export class TaskSourceResolver {
|
|
@@ -19,9 +19,9 @@ import { WidgetOpenerOptions } from '@theia/core/lib/browser';
|
|
|
19
19
|
import { TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
|
|
20
20
|
import { TerminalWidgetFactoryOptions } from '@theia/terminal/lib/browser/terminal-widget-impl';
|
|
21
21
|
import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
|
|
22
|
-
import { PanelKind, TaskConfiguration, TaskWatcher, TaskExitedEvent, TaskServer, TaskOutputPresentation, TaskInfo } from '../common';
|
|
23
|
-
import { ProcessTaskInfo } from '../common/process/task-protocol';
|
|
24
|
-
import { TaskDefinitionRegistry } from './task-definition-registry';
|
|
22
|
+
import { PanelKind, TaskConfiguration, TaskWatcher, TaskExitedEvent, TaskServer, TaskOutputPresentation, TaskInfo } from '../common/index.js';
|
|
23
|
+
import { ProcessTaskInfo } from '../common/process/task-protocol.js';
|
|
24
|
+
import { TaskDefinitionRegistry } from './task-definition-registry.js';
|
|
25
25
|
import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
|
|
26
26
|
import URI from '@theia/core/lib/common/uri';
|
|
27
27
|
import { nls } from '@theia/core';
|
package/src/common/index.ts
CHANGED
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
export * from './task-protocol';
|
|
18
|
-
export * from './task-watcher';
|
|
19
|
-
export * from './problem-matcher-protocol';
|
|
20
|
-
export * from './task-util';
|
|
17
|
+
export * from './task-protocol.js';
|
|
18
|
+
export * from './task-watcher.js';
|
|
19
|
+
export * from './problem-matcher-protocol.js';
|
|
20
|
+
export * from './task-util.js';
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { TaskConfiguration, TaskInfo } from '../task-protocol';
|
|
17
|
+
import { TaskConfiguration, TaskInfo } from '../task-protocol.js';
|
|
18
18
|
import { ApplicationError } from '@theia/core/lib/common/application-error';
|
|
19
19
|
|
|
20
20
|
export type ProcessType = 'shell' | 'process';
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { interfaces } from '@theia/core/shared/inversify';
|
|
18
|
-
import { TaskWatcher } from './task-watcher';
|
|
18
|
+
import { TaskWatcher } from './task-watcher.js';
|
|
19
19
|
|
|
20
20
|
/**
|
|
21
21
|
* Create the bindings common to node and browser.
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
import { Event } from '@theia/core';
|
|
18
18
|
import { RpcServer } from '@theia/core/lib/common/messaging/proxy-factory';
|
|
19
19
|
import { IJSONSchema } from '@theia/core/lib/common/json-schema';
|
|
20
|
-
import { ProblemMatcher, ProblemMatch, WatchingMatcherContribution, ProblemMatcherContribution, ProblemPatternContribution } from './problem-matcher-protocol';
|
|
20
|
+
import { ProblemMatcher, ProblemMatch, WatchingMatcherContribution, ProblemMatcherContribution, ProblemPatternContribution } from './problem-matcher-protocol.js';
|
|
21
21
|
export { WatchingMatcherContribution, ProblemMatcherContribution, ProblemPatternContribution };
|
|
22
22
|
|
|
23
23
|
export const taskPath = '/services/task';
|