@theia/task 1.77.0-next.95 → 1.77.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/lib/browser/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
export * from './task-service';
|
|
2
|
-
export * from './task-contribution';
|
|
3
|
-
export * from './task-definition-registry';
|
|
4
|
-
export * from './task-problem-matcher-registry';
|
|
5
|
-
export * from './task-problem-pattern-registry';
|
|
6
|
-
export * from './task-schema-updater';
|
|
1
|
+
export * from './task-service.js';
|
|
2
|
+
export * from './task-contribution.js';
|
|
3
|
+
export * from './task-definition-registry.js';
|
|
4
|
+
export * from './task-problem-matcher-registry.js';
|
|
5
|
+
export * from './task-problem-pattern-registry.js';
|
|
6
|
+
export * from './task-schema-updater.js';
|
|
7
7
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAgBA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAgBA,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oCAAoC,CAAC;AACnD,cAAc,oCAAoC,CAAC;AACnD,cAAc,0BAA0B,CAAC"}
|
package/lib/browser/index.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2017 Ericsson and others.
|
|
4
3
|
//
|
|
@@ -14,12 +13,10 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
tslib_1.__exportStar(require("./task-problem-pattern-registry"), exports);
|
|
24
|
-
tslib_1.__exportStar(require("./task-schema-updater"), exports);
|
|
16
|
+
export * from './task-service.js';
|
|
17
|
+
export * from './task-contribution.js';
|
|
18
|
+
export * from './task-definition-registry.js';
|
|
19
|
+
export * from './task-problem-matcher-registry.js';
|
|
20
|
+
export * from './task-problem-pattern-registry.js';
|
|
21
|
+
export * from './task-schema-updater.js';
|
|
25
22
|
//# sourceMappingURL=index.js.map
|
package/lib/browser/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAEhF,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oCAAoC,CAAC;AACnD,cAAc,oCAAoC,CAAC;AACnD,cAAc,0BAA0B,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ProcessTaskResolver } from './process-task-resolver';
|
|
2
|
-
import { TaskContribution, TaskResolverRegistry } from '../task-contribution';
|
|
1
|
+
import { ProcessTaskResolver } from './process-task-resolver.js';
|
|
2
|
+
import { TaskContribution, TaskResolverRegistry } from '../task-contribution.js';
|
|
3
3
|
export declare class ProcessTaskContribution implements TaskContribution {
|
|
4
4
|
protected readonly processTaskResolver: ProcessTaskResolver;
|
|
5
5
|
registerResolvers(resolvers: TaskResolverRegistry): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-task-contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/process/process-task-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"process-task-contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/process/process-task-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAEjF,qBACa,uBAAwB,YAAW,gBAAgB;IAG5D,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAE5D,iBAAiB,CAAC,SAAS,EAAE,oBAAoB,GAAG,IAAI;CAI3D"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2018 Red Hat, Inc. and others.
|
|
4
3
|
//
|
|
@@ -14,23 +13,20 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
const inversify_1 = require("@theia/core/shared/inversify");
|
|
21
|
-
const process_task_resolver_1 = require("./process-task-resolver");
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { injectable, inject } from '@theia/core/shared/inversify';
|
|
18
|
+
import { ProcessTaskResolver } from './process-task-resolver.js';
|
|
22
19
|
let ProcessTaskContribution = class ProcessTaskContribution {
|
|
23
20
|
registerResolvers(resolvers) {
|
|
24
21
|
resolvers.registerExecutionResolver('process', this.processTaskResolver);
|
|
25
22
|
resolvers.registerExecutionResolver('shell', this.processTaskResolver);
|
|
26
23
|
}
|
|
27
24
|
};
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
(0, inversify_1.inject)(process_task_resolver_1.ProcessTaskResolver),
|
|
31
|
-
tslib_1.__metadata("design:type", process_task_resolver_1.ProcessTaskResolver)
|
|
25
|
+
__decorate([
|
|
26
|
+
inject(ProcessTaskResolver)
|
|
32
27
|
], ProcessTaskContribution.prototype, "processTaskResolver", void 0);
|
|
33
|
-
|
|
34
|
-
|
|
28
|
+
ProcessTaskContribution = __decorate([
|
|
29
|
+
injectable()
|
|
35
30
|
], ProcessTaskContribution);
|
|
31
|
+
export { ProcessTaskContribution };
|
|
36
32
|
//# sourceMappingURL=process-task-contribution.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-task-contribution.js","sourceRoot":"","sources":["../../../src/browser/process/process-task-contribution.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"process-task-contribution.js","sourceRoot":"","sources":["../../../src/browser/process/process-task-contribution.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAI1D,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAKhC,iBAAiB,CAAC,SAA+B;QAC7C,SAAS,CAAC,yBAAyB,CAAC,SAAS,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACzE,SAAS,CAAC,yBAAyB,CAAC,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAC3E,CAAC;CACJ,CAAA;AANsB;IADlB,MAAM,CAAC,mBAAmB,CAAC;oEACgC;AAHnD,uBAAuB;IADnC,UAAU,EAAE;GACA,uBAAuB,CASnC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2018 Red Hat, Inc. and others.
|
|
4
3
|
//
|
|
@@ -14,14 +13,12 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
bind(
|
|
24
|
-
bind(process_task_contribution_1.ProcessTaskContribution).toSelf().inSingletonScope();
|
|
25
|
-
bind(task_contribution_1.TaskContribution).toService(process_task_contribution_1.ProcessTaskContribution);
|
|
16
|
+
import { ProcessTaskContribution } from './process-task-contribution.js';
|
|
17
|
+
import { ProcessTaskResolver } from './process-task-resolver.js';
|
|
18
|
+
import { TaskContribution } from '../task-contribution.js';
|
|
19
|
+
export function bindProcessTaskModule(bind) {
|
|
20
|
+
bind(ProcessTaskResolver).toSelf().inSingletonScope();
|
|
21
|
+
bind(ProcessTaskContribution).toSelf().inSingletonScope();
|
|
22
|
+
bind(TaskContribution).toService(ProcessTaskContribution);
|
|
26
23
|
}
|
|
27
24
|
//# sourceMappingURL=process-task-frontend-module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-task-frontend-module.js","sourceRoot":"","sources":["../../../src/browser/process/process-task-frontend-module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"process-task-frontend-module.js","sourceRoot":"","sources":["../../../src/browser/process/process-task-frontend-module.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAGhF,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,MAAM,UAAU,qBAAqB,CAAC,IAAqB;IAEvD,IAAI,CAAC,mBAAmB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACtD,IAAI,CAAC,uBAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;AAC9D,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { VariableResolveOptions, VariableResolverService } from '@theia/variable-resolver/lib/browser';
|
|
2
|
-
import { TaskResolver } from '../task-contribution';
|
|
3
|
-
import { TaskConfiguration } from '../../common/task-protocol';
|
|
4
|
-
import { CommandProperties } from '../../common/process/task-protocol';
|
|
5
|
-
import { TaskDefinitionRegistry } from '../task-definition-registry';
|
|
2
|
+
import { TaskResolver } from '../task-contribution.js';
|
|
3
|
+
import { TaskConfiguration } from '../../common/task-protocol.js';
|
|
4
|
+
import { CommandProperties } from '../../common/process/task-protocol.js';
|
|
5
|
+
import { TaskDefinitionRegistry } from '../task-definition-registry.js';
|
|
6
6
|
import { WorkspaceService } from '@theia/workspace/lib/browser';
|
|
7
7
|
export declare class ProcessTaskResolver implements TaskResolver {
|
|
8
8
|
protected readonly variableResolverService: VariableResolverService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-task-resolver.d.ts","sourceRoot":"","sources":["../../../src/browser/process/process-task-resolver.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AACvG,OAAO,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"process-task-resolver.d.ts","sourceRoot":"","sources":["../../../src/browser/process/process-task-resolver.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AACvG,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAA4B,MAAM,uCAAuC,CAAC;AACpG,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAExE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAGhE,qBACa,mBAAoB,YAAW,YAAY;IAGpD,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAGpE,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAGlE,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAEtD;;;;;;OAMG;IACG,WAAW,CAAC,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;cAgC5D,wBAAwB,CACpC,UAAU,EAAE,iBAAiB,GAAG,SAAS,EACzC,uBAAuB,EAAE,sBAAsB,GAChD,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;cAezB,eAAe,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;CAUxG"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2018 Red Hat, Inc. and others.
|
|
4
3
|
//
|
|
@@ -14,15 +13,13 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
const browser_2 = require("@theia/workspace/lib/browser");
|
|
25
|
-
const cancellation_1 = require("@theia/core/lib/common/cancellation");
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { injectable, inject } from '@theia/core/shared/inversify';
|
|
18
|
+
import { VariableResolverService } from '@theia/variable-resolver/lib/browser';
|
|
19
|
+
import { TaskDefinitionRegistry } from '../task-definition-registry.js';
|
|
20
|
+
import URI from '@theia/core/lib/common/uri';
|
|
21
|
+
import { WorkspaceService } from '@theia/workspace/lib/browser';
|
|
22
|
+
import { cancelled } from '@theia/core/lib/common/cancellation';
|
|
26
23
|
let ProcessTaskResolver = class ProcessTaskResolver {
|
|
27
24
|
/**
|
|
28
25
|
* Perform some adjustments to the task launch configuration, before sending
|
|
@@ -36,7 +33,7 @@ let ProcessTaskResolver = class ProcessTaskResolver {
|
|
|
36
33
|
if (type !== 'process' && type !== 'shell') {
|
|
37
34
|
throw new Error('Unsupported task configuration type.');
|
|
38
35
|
}
|
|
39
|
-
const context = typeof taskConfig._scope === 'string' ? new
|
|
36
|
+
const context = typeof taskConfig._scope === 'string' ? new URI(taskConfig._scope) : undefined;
|
|
40
37
|
const variableResolverOptions = {
|
|
41
38
|
context, configurationSection: 'tasks'
|
|
42
39
|
};
|
|
@@ -81,25 +78,22 @@ let ProcessTaskResolver = class ProcessTaskResolver {
|
|
|
81
78
|
}
|
|
82
79
|
const resolved = await this.variableResolverService.resolve(value, options);
|
|
83
80
|
if (resolved === undefined) {
|
|
84
|
-
throw
|
|
81
|
+
throw cancelled();
|
|
85
82
|
}
|
|
86
83
|
return resolved;
|
|
87
84
|
}
|
|
88
85
|
};
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
(0, inversify_1.inject)(browser_1.VariableResolverService),
|
|
92
|
-
tslib_1.__metadata("design:type", browser_1.VariableResolverService)
|
|
86
|
+
__decorate([
|
|
87
|
+
inject(VariableResolverService)
|
|
93
88
|
], ProcessTaskResolver.prototype, "variableResolverService", void 0);
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
tslib_1.__metadata("design:type", task_definition_registry_1.TaskDefinitionRegistry)
|
|
89
|
+
__decorate([
|
|
90
|
+
inject(TaskDefinitionRegistry)
|
|
97
91
|
], ProcessTaskResolver.prototype, "taskDefinitionRegistry", void 0);
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
tslib_1.__metadata("design:type", browser_2.WorkspaceService)
|
|
92
|
+
__decorate([
|
|
93
|
+
inject(WorkspaceService)
|
|
101
94
|
], ProcessTaskResolver.prototype, "workspaceService", void 0);
|
|
102
|
-
|
|
103
|
-
|
|
95
|
+
ProcessTaskResolver = __decorate([
|
|
96
|
+
injectable()
|
|
104
97
|
], ProcessTaskResolver);
|
|
98
|
+
export { ProcessTaskResolver };
|
|
105
99
|
//# sourceMappingURL=process-task-resolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-task-resolver.js","sourceRoot":"","sources":["../../../src/browser/process/process-task-resolver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"process-task-resolver.js","sourceRoot":"","sources":["../../../src/browser/process/process-task-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2026 Md. Mehedi Hasan.
|
|
4
3
|
//
|
|
@@ -14,28 +13,26 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
const task_protocol_1 = require("../../common/task-protocol");
|
|
34
|
-
const process_task_resolver_1 = require("./process-task-resolver");
|
|
16
|
+
import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
|
|
17
|
+
let disableJSDOM = enableJSDOM();
|
|
18
|
+
import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
|
|
19
|
+
FrontendApplicationConfigProvider.set({});
|
|
20
|
+
import { cancelled, isCancelled } from '@theia/core/lib/common/cancellation';
|
|
21
|
+
import { ILogger } from '@theia/core/lib/common/logger';
|
|
22
|
+
import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
|
|
23
|
+
import { Container } from '@theia/core/shared/inversify';
|
|
24
|
+
import { expect } from 'chai';
|
|
25
|
+
import URI from '@theia/core/lib/common/uri';
|
|
26
|
+
import { VariableRegistry } from '@theia/variable-resolver/lib/browser/variable';
|
|
27
|
+
import { VariableResolverService } from '@theia/variable-resolver/lib/browser';
|
|
28
|
+
import { WorkspaceService } from '@theia/workspace/lib/browser';
|
|
29
|
+
import { TaskDefinitionRegistry } from '../task-definition-registry.js';
|
|
30
|
+
import { TaskScope } from '../../common/task-protocol.js';
|
|
31
|
+
import { ProcessTaskResolver } from './process-task-resolver.js';
|
|
35
32
|
disableJSDOM();
|
|
36
33
|
describe('ProcessTaskResolver', () => {
|
|
37
34
|
before(() => {
|
|
38
|
-
disableJSDOM =
|
|
35
|
+
disableJSDOM = enableJSDOM();
|
|
39
36
|
});
|
|
40
37
|
after(() => {
|
|
41
38
|
disableJSDOM();
|
|
@@ -45,35 +42,35 @@ describe('ProcessTaskResolver', () => {
|
|
|
45
42
|
label: 'task with input variables',
|
|
46
43
|
type: 'shell',
|
|
47
44
|
command: 'node',
|
|
48
|
-
_scope:
|
|
45
|
+
_scope: TaskScope.Workspace,
|
|
49
46
|
...overrides
|
|
50
47
|
};
|
|
51
48
|
}
|
|
52
49
|
let requestedInputs;
|
|
53
50
|
function createResolver(inputValue, workspaceRoot) {
|
|
54
51
|
requestedInputs = [];
|
|
55
|
-
const container = new
|
|
56
|
-
container.bind(
|
|
57
|
-
container.bind(
|
|
58
|
-
container.bind(
|
|
59
|
-
container.bind(
|
|
60
|
-
container.bind(
|
|
52
|
+
const container = new Container();
|
|
53
|
+
container.bind(ILogger).to(MockLogger);
|
|
54
|
+
container.bind(VariableRegistry).toSelf().inSingletonScope();
|
|
55
|
+
container.bind(VariableResolverService).toSelf().inSingletonScope();
|
|
56
|
+
container.bind(TaskDefinitionRegistry).toSelf().inSingletonScope();
|
|
57
|
+
container.bind(WorkspaceService).toConstantValue({
|
|
61
58
|
getWorkspaceRootUri: () => workspaceRoot
|
|
62
59
|
});
|
|
63
|
-
container.bind(
|
|
64
|
-
const variableRegistry = container.get(
|
|
60
|
+
container.bind(ProcessTaskResolver).toSelf();
|
|
61
|
+
const variableRegistry = container.get(VariableRegistry);
|
|
65
62
|
const input = {
|
|
66
63
|
name: 'input',
|
|
67
64
|
resolve: (_context, inputId) => {
|
|
68
65
|
requestedInputs.push(inputId);
|
|
69
66
|
if (inputValue === undefined) {
|
|
70
|
-
throw
|
|
67
|
+
throw cancelled();
|
|
71
68
|
}
|
|
72
69
|
return inputValue;
|
|
73
70
|
}
|
|
74
71
|
};
|
|
75
72
|
variableRegistry.registerVariable(input);
|
|
76
|
-
return container.get(
|
|
73
|
+
return container.get(ProcessTaskResolver);
|
|
77
74
|
}
|
|
78
75
|
const cancellationCases = [
|
|
79
76
|
{
|
|
@@ -120,7 +117,7 @@ describe('ProcessTaskResolver', () => {
|
|
|
120
117
|
catch (e) {
|
|
121
118
|
error = e;
|
|
122
119
|
}
|
|
123
|
-
|
|
120
|
+
expect(isCancelled(error)).to.equal(true);
|
|
124
121
|
});
|
|
125
122
|
}
|
|
126
123
|
}
|
|
@@ -137,8 +134,8 @@ describe('ProcessTaskResolver', () => {
|
|
|
137
134
|
catch (e) {
|
|
138
135
|
error = e;
|
|
139
136
|
}
|
|
140
|
-
|
|
141
|
-
|
|
137
|
+
expect(isCancelled(error)).to.equal(true);
|
|
138
|
+
expect(requestedInputs).to.deep.equal(['first']);
|
|
142
139
|
});
|
|
143
140
|
it('resolves command properties and preserves unrelated options', async () => {
|
|
144
141
|
const resolver = createResolver('resolved-value');
|
|
@@ -152,14 +149,14 @@ describe('ProcessTaskResolver', () => {
|
|
|
152
149
|
}
|
|
153
150
|
});
|
|
154
151
|
const resolved = await resolver.resolveTask(task);
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
152
|
+
expect(resolved.command).to.equal('resolved-value');
|
|
153
|
+
expect(resolved.args).to.deep.equal(['before', 'resolved-value', 'after']);
|
|
154
|
+
expect(resolved.options).to.deep.equal({
|
|
158
155
|
cwd: 'resolved-value',
|
|
159
156
|
env: { KEEP: 'unchanged', INPUT: 'resolved-value' },
|
|
160
157
|
shell: { executable: 'bash', args: ['-c'] }
|
|
161
158
|
});
|
|
162
|
-
|
|
159
|
+
expect(task.command).to.equal('${input:value}');
|
|
163
160
|
});
|
|
164
161
|
it('preserves an accepted empty input in arguments and the environment', async () => {
|
|
165
162
|
const resolver = createResolver('');
|
|
@@ -167,25 +164,25 @@ describe('ProcessTaskResolver', () => {
|
|
|
167
164
|
args: ['${input:value}'],
|
|
168
165
|
options: { env: { INPUT: '${input:value}' } }
|
|
169
166
|
}));
|
|
170
|
-
|
|
171
|
-
|
|
167
|
+
expect(resolved.args).to.deep.equal(['']);
|
|
168
|
+
expect(resolved.options?.env).to.deep.equal({ INPUT: '' });
|
|
172
169
|
});
|
|
173
170
|
it('uses the workspace root when no working directory is configured', async () => {
|
|
174
|
-
const workspaceRoot = new
|
|
171
|
+
const workspaceRoot = new URI('file:///workspace');
|
|
175
172
|
const resolver = createResolver('resolved-value', workspaceRoot);
|
|
176
173
|
const resolved = await resolver.resolveTask(createTask());
|
|
177
|
-
|
|
174
|
+
expect(resolved.options?.cwd).to.equal(workspaceRoot.toString());
|
|
178
175
|
});
|
|
179
176
|
it('does not treat absent optional properties as cancellation', async () => {
|
|
180
177
|
const resolver = createResolver(undefined);
|
|
181
178
|
const resolved = await resolver.resolveTask(createTask());
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
179
|
+
expect(resolved.command).to.equal('node');
|
|
180
|
+
expect(resolved.args).to.equal(undefined);
|
|
181
|
+
expect(resolved.options?.cwd).to.equal(undefined);
|
|
182
|
+
expect(resolved.options?.env).to.equal(undefined);
|
|
183
|
+
expect(resolved.windows).to.equal(undefined);
|
|
184
|
+
expect(resolved.osx).to.equal(undefined);
|
|
185
|
+
expect(resolved.linux).to.equal(undefined);
|
|
189
186
|
});
|
|
190
187
|
for (const platform of ['windows', 'osx', 'linux']) {
|
|
191
188
|
it(`resolves ${platform} overrides without changing the original configuration`, async () => {
|
|
@@ -201,7 +198,7 @@ describe('ProcessTaskResolver', () => {
|
|
|
201
198
|
};
|
|
202
199
|
const task = createTask({ [platform]: overrides });
|
|
203
200
|
const resolved = await resolver.resolveTask(task);
|
|
204
|
-
|
|
201
|
+
expect(resolved[platform]).to.deep.equal({
|
|
205
202
|
command: 'resolved-value',
|
|
206
203
|
args: ['resolved-value'],
|
|
207
204
|
options: {
|
|
@@ -210,8 +207,8 @@ describe('ProcessTaskResolver', () => {
|
|
|
210
207
|
shell: { executable: 'custom-shell', args: ['-c'] }
|
|
211
208
|
}
|
|
212
209
|
});
|
|
213
|
-
|
|
214
|
-
|
|
210
|
+
expect(task[platform]).to.equal(overrides);
|
|
211
|
+
expect(overrides.options.env.INPUT).to.equal('${input:value}');
|
|
215
212
|
});
|
|
216
213
|
}
|
|
217
214
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-task-resolver.spec.js","sourceRoot":"","sources":["../../../src/browser/process/process-task-resolver.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"process-task-resolver.spec.js","sourceRoot":"","sources":["../../../src/browser/process/process-task-resolver.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { TaskProviderRegistry, TaskProvider } from './task-contribution';
|
|
2
|
-
import { TaskDefinitionRegistry } from './task-definition-registry';
|
|
3
|
-
import { TaskConfiguration, TaskCustomization, TaskConfigurationScope } from '../common';
|
|
1
|
+
import { TaskProviderRegistry, TaskProvider } from './task-contribution.js';
|
|
2
|
+
import { TaskDefinitionRegistry } from './task-definition-registry.js';
|
|
3
|
+
import { TaskConfiguration, TaskCustomization, TaskConfigurationScope } from '../common/index.js';
|
|
4
4
|
export declare const ALL_TASK_TYPES: string;
|
|
5
5
|
export declare class ProvidedTaskConfigurations {
|
|
6
6
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provided-task-configurations.d.ts","sourceRoot":"","sources":["../../src/browser/provided-task-configurations.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"provided-task-configurations.d.ts","sourceRoot":"","sources":["../../src/browser/provided-task-configurations.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAA0B,sBAAsB,EAAa,MAAM,oBAAoB,CAAC;AAErI,eAAO,MAAM,cAAc,EAAE,MAAY,CAAC;AAE1C,qBACa,0BAA0B;IACnC;;;;OAIG;IACH,SAAS,CAAC,QAAQ,uEAA8E;IAGhG,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAG9D,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAElE,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,uBAAuB,CAAgB;IAC/C,OAAO,CAAC,SAAS,CAAK;IAEtB,eAAe,IAAI,MAAM;IAIzB,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAO/C,SAAS,CAAC,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAM5D,SAAS,CAAC,8BAA8B,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO;IAOpE;;;OAGG;cACa,iBAAiB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOnE,8FAA8F;IACxF,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;cAe1D,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAa7D,yBAAyB,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAgBnG,uFAAuF;IACjF,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAKtI;;;;;;;OAOG;IACG,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,iBAAiB,EAAE,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAuChJ,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,sBAAsB,GAAG,iBAAiB,GAAG,SAAS;IAazH,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,iBAAiB,EAAE,GAAG,IAAI;CAwBzD"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2019 Ericsson and others.
|
|
4
3
|
//
|
|
@@ -14,14 +13,12 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
const
|
|
23
|
-
const common_1 = require("../common");
|
|
24
|
-
exports.ALL_TASK_TYPES = '*';
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
18
|
+
import { TaskProviderRegistry } from './task-contribution.js';
|
|
19
|
+
import { TaskDefinitionRegistry } from './task-definition-registry.js';
|
|
20
|
+
import { TaskOutputPresentation, TaskScope } from '../common/index.js';
|
|
21
|
+
export const ALL_TASK_TYPES = '*';
|
|
25
22
|
let ProvidedTaskConfigurations = class ProvidedTaskConfigurations {
|
|
26
23
|
constructor() {
|
|
27
24
|
/**
|
|
@@ -49,7 +46,7 @@ let ProvidedTaskConfigurations = class ProvidedTaskConfigurations {
|
|
|
49
46
|
}
|
|
50
47
|
}
|
|
51
48
|
isTaskProviderActivationNeeded(taskType) {
|
|
52
|
-
if (!taskType || this.activatedProvidersTypes.includes(taskType) || this.activatedProvidersTypes.includes(
|
|
49
|
+
if (!taskType || this.activatedProvidersTypes.includes(taskType) || this.activatedProvidersTypes.includes(ALL_TASK_TYPES)) {
|
|
53
50
|
return false;
|
|
54
51
|
}
|
|
55
52
|
return true;
|
|
@@ -71,7 +68,7 @@ let ProvidedTaskConfigurations = class ProvidedTaskConfigurations {
|
|
|
71
68
|
for (const taskLabelMap of this.tasksMap.values()) {
|
|
72
69
|
for (const taskScopeMap of taskLabelMap.values()) {
|
|
73
70
|
for (const task of taskScopeMap.values()) {
|
|
74
|
-
if (!type || task.type === type || type ===
|
|
71
|
+
if (!type || task.type === type || type === ALL_TASK_TYPES) {
|
|
75
72
|
tasks.push(task);
|
|
76
73
|
}
|
|
77
74
|
}
|
|
@@ -93,13 +90,13 @@ let ProvidedTaskConfigurations = class ProvidedTaskConfigurations {
|
|
|
93
90
|
async resolveTaskConfigurations(taskProvider) {
|
|
94
91
|
return (await taskProvider.provideTasks())
|
|
95
92
|
// Global/User tasks from providers are not supported.
|
|
96
|
-
.filter(task => task.scope !==
|
|
93
|
+
.filter(task => task.scope !== TaskScope.Global)
|
|
97
94
|
.map(providedTask => {
|
|
98
95
|
const originalPresentation = providedTask.presentation || {};
|
|
99
96
|
return {
|
|
100
97
|
...providedTask,
|
|
101
98
|
presentation: {
|
|
102
|
-
...
|
|
99
|
+
...TaskOutputPresentation.getDefault(),
|
|
103
100
|
...originalPresentation
|
|
104
101
|
}
|
|
105
102
|
};
|
|
@@ -145,7 +142,7 @@ let ProvidedTaskConfigurations = class ProvidedTaskConfigurations {
|
|
|
145
142
|
}
|
|
146
143
|
// Tasks with scope set to 'Workspace' can be customized in a workspace root, and will not match
|
|
147
144
|
// providers scope 'TaskScope.Workspace' unless specifically included as below.
|
|
148
|
-
const scopes = [scope,
|
|
145
|
+
const scopes = [scope, TaskScope.Workspace];
|
|
149
146
|
// find the task that matches the `customization`.
|
|
150
147
|
// The scenario where more than one match is found should not happen unless users manually enter multiple customizations for one type of task
|
|
151
148
|
// If this does happen, return the first match
|
|
@@ -191,16 +188,14 @@ let ProvidedTaskConfigurations = class ProvidedTaskConfigurations {
|
|
|
191
188
|
}
|
|
192
189
|
}
|
|
193
190
|
};
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
(0, inversify_1.inject)(task_contribution_1.TaskProviderRegistry),
|
|
197
|
-
tslib_1.__metadata("design:type", task_contribution_1.TaskProviderRegistry)
|
|
191
|
+
__decorate([
|
|
192
|
+
inject(TaskProviderRegistry)
|
|
198
193
|
], ProvidedTaskConfigurations.prototype, "taskProviderRegistry", void 0);
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
tslib_1.__metadata("design:type", task_definition_registry_1.TaskDefinitionRegistry)
|
|
194
|
+
__decorate([
|
|
195
|
+
inject(TaskDefinitionRegistry)
|
|
202
196
|
], ProvidedTaskConfigurations.prototype, "taskDefinitionRegistry", void 0);
|
|
203
|
-
|
|
204
|
-
|
|
197
|
+
ProvidedTaskConfigurations = __decorate([
|
|
198
|
+
injectable()
|
|
205
199
|
], ProvidedTaskConfigurations);
|
|
200
|
+
export { ProvidedTaskConfigurations };
|
|
206
201
|
//# sourceMappingURL=provided-task-configurations.js.map
|