@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
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2019 Ericsson and others.
|
|
4
3
|
//
|
|
@@ -14,36 +13,35 @@
|
|
|
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 task_problem_collector_1 = require("./task-problem-collector");
|
|
16
|
+
import { Severity } from '@theia/core/lib/common/severity';
|
|
17
|
+
import { DiagnosticSeverity } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
18
|
+
import { expect } from 'chai';
|
|
19
|
+
import { ApplyToKind, FileLocationKind, ProblemLocationKind } from '../common/problem-matcher-protocol.js';
|
|
20
|
+
import { ProblemCollector } from './task-problem-collector.js';
|
|
23
21
|
const startStopMatcher1 = {
|
|
24
22
|
owner: 'test1',
|
|
25
23
|
source: 'test1',
|
|
26
|
-
applyTo:
|
|
27
|
-
fileLocation:
|
|
24
|
+
applyTo: ApplyToKind.allDocuments,
|
|
25
|
+
fileLocation: FileLocationKind.Absolute,
|
|
28
26
|
pattern: {
|
|
29
27
|
regexp: /^([^:]*: )?((.:)?[^:]*):(\d+)(:(\d+))?: (.*)$/.source,
|
|
30
|
-
kind:
|
|
28
|
+
kind: ProblemLocationKind.Location,
|
|
31
29
|
file: 2,
|
|
32
30
|
line: 4,
|
|
33
31
|
character: 6,
|
|
34
32
|
message: 7
|
|
35
33
|
},
|
|
36
|
-
severity:
|
|
34
|
+
severity: Severity.Error
|
|
37
35
|
};
|
|
38
36
|
const startStopMatcher2 = {
|
|
39
37
|
owner: 'test2',
|
|
40
38
|
source: 'test2',
|
|
41
|
-
applyTo:
|
|
42
|
-
fileLocation:
|
|
39
|
+
applyTo: ApplyToKind.allDocuments,
|
|
40
|
+
fileLocation: FileLocationKind.Absolute,
|
|
43
41
|
pattern: [
|
|
44
42
|
{
|
|
45
43
|
regexp: /^([^\s].*)$/.source,
|
|
46
|
-
kind:
|
|
44
|
+
kind: ProblemLocationKind.Location,
|
|
47
45
|
file: 1
|
|
48
46
|
},
|
|
49
47
|
{
|
|
@@ -56,17 +54,17 @@ const startStopMatcher2 = {
|
|
|
56
54
|
loop: true
|
|
57
55
|
}
|
|
58
56
|
],
|
|
59
|
-
severity:
|
|
57
|
+
severity: Severity.Error
|
|
60
58
|
};
|
|
61
59
|
const startStopMatcher3 = {
|
|
62
60
|
owner: 'test2',
|
|
63
61
|
source: 'test2',
|
|
64
|
-
applyTo:
|
|
65
|
-
fileLocation:
|
|
62
|
+
applyTo: ApplyToKind.allDocuments,
|
|
63
|
+
fileLocation: FileLocationKind.Absolute,
|
|
66
64
|
pattern: [
|
|
67
65
|
{
|
|
68
66
|
regexp: /^([^\s].*)$/.source,
|
|
69
|
-
kind:
|
|
67
|
+
kind: ProblemLocationKind.File,
|
|
70
68
|
file: 1
|
|
71
69
|
},
|
|
72
70
|
{
|
|
@@ -77,12 +75,12 @@ const startStopMatcher3 = {
|
|
|
77
75
|
loop: true
|
|
78
76
|
}
|
|
79
77
|
],
|
|
80
|
-
severity:
|
|
78
|
+
severity: Severity.Error
|
|
81
79
|
};
|
|
82
80
|
const watchMatcher = {
|
|
83
81
|
owner: 'test3',
|
|
84
|
-
applyTo:
|
|
85
|
-
fileLocation:
|
|
82
|
+
applyTo: ApplyToKind.closedDocuments,
|
|
83
|
+
fileLocation: FileLocationKind.Absolute,
|
|
86
84
|
pattern: {
|
|
87
85
|
regexp: /Error: ([^(]+)\((\d+|\d+,\d+|\d+,\d+,\d+,\d+)\): (.*)$/.source,
|
|
88
86
|
file: 1,
|
|
@@ -110,7 +108,7 @@ describe('ProblemCollector', () => {
|
|
|
110
108
|
allMatches.length = 0;
|
|
111
109
|
});
|
|
112
110
|
it('should find problems from start-stop task when problem matcher is associated with one problem pattern', () => {
|
|
113
|
-
collector = new
|
|
111
|
+
collector = new ProblemCollector([startStopMatcher1]);
|
|
114
112
|
collectMatches([
|
|
115
113
|
'npm WARN lifecycle The node binary used for scripts is /tmp/yarn--1557403301319-0.5645247996849125/node but npm is using /usr/local/bin/node itself.',
|
|
116
114
|
'Use the `--scripts-prepend-node-path` option to include the path for the node binary npm was executed with.',
|
|
@@ -120,31 +118,31 @@ describe('ProblemCollector', () => {
|
|
|
120
118
|
'/home/test/hello.go:10:6: undefined: numb',
|
|
121
119
|
'/home/test/hello.go:15:9: undefined: stri'
|
|
122
120
|
]);
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
121
|
+
expect(allMatches.length).to.eq(3);
|
|
122
|
+
expect(allMatches[0].resource.path.toString()).eq('/home/test/hello.go');
|
|
123
|
+
expect(allMatches[0].marker).deep.equal({
|
|
126
124
|
range: { start: { line: 8, character: 1 }, end: { line: 8, character: 1 } },
|
|
127
|
-
severity:
|
|
125
|
+
severity: DiagnosticSeverity.Error,
|
|
128
126
|
source: 'test1',
|
|
129
127
|
message: 'undefined: fmt.Pntln'
|
|
130
128
|
});
|
|
131
|
-
|
|
132
|
-
|
|
129
|
+
expect(allMatches[1].resource.path.toString()).eq('/home/test/hello.go');
|
|
130
|
+
expect(allMatches[1].marker).deep.equal({
|
|
133
131
|
range: { start: { line: 9, character: 5 }, end: { line: 9, character: 5 } },
|
|
134
|
-
severity:
|
|
132
|
+
severity: DiagnosticSeverity.Error,
|
|
135
133
|
source: 'test1',
|
|
136
134
|
message: 'undefined: numb'
|
|
137
135
|
});
|
|
138
|
-
|
|
139
|
-
|
|
136
|
+
expect(allMatches[2].resource.path.toString()).eq('/home/test/hello.go');
|
|
137
|
+
expect(allMatches[2].marker).deep.equal({
|
|
140
138
|
range: { start: { line: 14, character: 8 }, end: { line: 14, character: 8 } },
|
|
141
|
-
severity:
|
|
139
|
+
severity: DiagnosticSeverity.Error,
|
|
142
140
|
source: 'test1',
|
|
143
141
|
message: 'undefined: stri'
|
|
144
142
|
});
|
|
145
143
|
});
|
|
146
144
|
it('should find problems from start-stop task when problem matcher is associated with more than one problem pattern', () => {
|
|
147
|
-
collector = new
|
|
145
|
+
collector = new ProblemCollector([startStopMatcher2]);
|
|
148
146
|
collectMatches([
|
|
149
147
|
'> test@0.1.0 lint /home/test',
|
|
150
148
|
'> eslint .',
|
|
@@ -161,40 +159,40 @@ describe('ProblemCollector', () => {
|
|
|
161
159
|
'✖ 3 problems (1 error, 2 warnings)',
|
|
162
160
|
' 0 errors and 2 warnings potentially fixable with the `--fix` option.'
|
|
163
161
|
]);
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
162
|
+
expect(allMatches.length).to.eq(4);
|
|
163
|
+
expect(allMatches[0].resource.path.toString()).eq('/home/test/test-dir.js');
|
|
164
|
+
expect(allMatches[0].marker).deep.equal({
|
|
167
165
|
range: { start: { line: 13, character: 20 }, end: { line: 13, character: 20 } },
|
|
168
|
-
severity:
|
|
166
|
+
severity: DiagnosticSeverity.Warning,
|
|
169
167
|
source: 'test2',
|
|
170
168
|
message: 'Missing semicolon',
|
|
171
169
|
code: 'semi'
|
|
172
170
|
});
|
|
173
|
-
|
|
174
|
-
|
|
171
|
+
expect(allMatches[1].resource.path.toString()).eq('/home/test/test-dir.js');
|
|
172
|
+
expect(allMatches[1].marker).deep.equal({
|
|
175
173
|
range: { start: { line: 14, character: 22 }, end: { line: 14, character: 22 } },
|
|
176
|
-
severity:
|
|
174
|
+
severity: DiagnosticSeverity.Warning,
|
|
177
175
|
source: 'test2',
|
|
178
176
|
message: 'Missing semicolon',
|
|
179
177
|
code: 'semi'
|
|
180
178
|
});
|
|
181
|
-
|
|
182
|
-
|
|
179
|
+
expect(allMatches[2].resource.path.toString()).eq('/home/test/test-dir.js');
|
|
180
|
+
expect(allMatches[2].marker).deep.equal({
|
|
183
181
|
range: { start: { line: 102, character: 8 }, end: { line: 102, character: 8 } },
|
|
184
|
-
severity:
|
|
182
|
+
severity: DiagnosticSeverity.Error,
|
|
185
183
|
source: 'test2',
|
|
186
184
|
message: 'Parsing error: Unexpected token inte'
|
|
187
185
|
});
|
|
188
|
-
|
|
189
|
-
|
|
186
|
+
expect(allMatches[3].resource.path.toString()).eq('/home/test/more-test.js');
|
|
187
|
+
expect(allMatches[3].marker).deep.equal({
|
|
190
188
|
range: { start: { line: 12, character: 8 }, end: { line: 12, character: 8 } },
|
|
191
|
-
severity:
|
|
189
|
+
severity: DiagnosticSeverity.Error,
|
|
192
190
|
source: 'test2',
|
|
193
191
|
message: 'Parsing error: Unexpected token 1000'
|
|
194
192
|
});
|
|
195
193
|
});
|
|
196
194
|
it('should find problems from start-stop task when problem matcher is associated with more than one problem pattern and kind is file', () => {
|
|
197
|
-
collector = new
|
|
195
|
+
collector = new ProblemCollector([startStopMatcher3]);
|
|
198
196
|
collectMatches([
|
|
199
197
|
'> test@0.1.0 lint /home/test',
|
|
200
198
|
'> eslint .',
|
|
@@ -211,40 +209,40 @@ describe('ProblemCollector', () => {
|
|
|
211
209
|
'✖ 3 problems (1 error, 2 warnings)',
|
|
212
210
|
' 0 errors and 2 warnings potentially fixable with the `--fix` option.'
|
|
213
211
|
]);
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
212
|
+
expect(allMatches.length).to.eq(4);
|
|
213
|
+
expect(allMatches[0].resource?.path.toString()).eq('/home/test/test-dir.js');
|
|
214
|
+
expect(allMatches[0].marker).deep.equal({
|
|
217
215
|
range: { start: { line: 0, character: 0 }, end: { line: 0, character: 0 } },
|
|
218
|
-
severity:
|
|
216
|
+
severity: DiagnosticSeverity.Warning,
|
|
219
217
|
source: 'test2',
|
|
220
218
|
message: 'Missing semicolon',
|
|
221
219
|
code: 'semi'
|
|
222
220
|
});
|
|
223
|
-
|
|
224
|
-
|
|
221
|
+
expect(allMatches[1].resource?.path.toString()).eq('/home/test/test-dir.js');
|
|
222
|
+
expect(allMatches[1].marker).deep.equal({
|
|
225
223
|
range: { start: { line: 0, character: 0 }, end: { line: 0, character: 0 } },
|
|
226
|
-
severity:
|
|
224
|
+
severity: DiagnosticSeverity.Warning,
|
|
227
225
|
source: 'test2',
|
|
228
226
|
message: 'Missing semicolon',
|
|
229
227
|
code: 'semi'
|
|
230
228
|
});
|
|
231
|
-
|
|
232
|
-
|
|
229
|
+
expect(allMatches[2].resource?.path.toString()).eq('/home/test/test-dir.js');
|
|
230
|
+
expect(allMatches[2].marker).deep.equal({
|
|
233
231
|
range: { start: { line: 0, character: 0 }, end: { line: 0, character: 0 } },
|
|
234
|
-
severity:
|
|
232
|
+
severity: DiagnosticSeverity.Error,
|
|
235
233
|
source: 'test2',
|
|
236
234
|
message: 'Parsing error: Unexpected token inte'
|
|
237
235
|
});
|
|
238
|
-
|
|
239
|
-
|
|
236
|
+
expect(allMatches[3].resource?.path.toString()).eq('/home/test/more-test.js');
|
|
237
|
+
expect(allMatches[3].marker).deep.equal({
|
|
240
238
|
range: { start: { line: 0, character: 0 }, end: { line: 0, character: 0 } },
|
|
241
|
-
severity:
|
|
239
|
+
severity: DiagnosticSeverity.Error,
|
|
242
240
|
source: 'test2',
|
|
243
241
|
message: 'Parsing error: Unexpected token 1000'
|
|
244
242
|
});
|
|
245
243
|
});
|
|
246
244
|
it('should search and find defined problems from watch task\'s output', () => {
|
|
247
|
-
collector = new
|
|
245
|
+
collector = new ProblemCollector([watchMatcher]);
|
|
248
246
|
collectMatches([
|
|
249
247
|
'> code-oss-dev@1.33.1 watch /home/test/vscode',
|
|
250
248
|
'> gulp watch --max_old_space_size=4095',
|
|
@@ -291,12 +289,12 @@ describe('ProblemCollector', () => {
|
|
|
291
289
|
"[09:20:25] Error: /home/test/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts(517,57): ';' expected.", // problem 9
|
|
292
290
|
'[09:20:25] Finished compilation with 4 errors after 441 ms'
|
|
293
291
|
]);
|
|
294
|
-
|
|
292
|
+
expect(allMatches.length).to.eq(14); // 9 events for problems + 5 events for beginner pattern
|
|
295
293
|
});
|
|
296
294
|
it('should return an empty array if no problems are found', () => {
|
|
297
|
-
collector = new
|
|
295
|
+
collector = new ProblemCollector([startStopMatcher2]);
|
|
298
296
|
collectMatches([]);
|
|
299
|
-
|
|
297
|
+
expect(allMatches.length).to.eq(0);
|
|
300
298
|
collectMatches([
|
|
301
299
|
'> test@0.1.0 lint /home/test',
|
|
302
300
|
'> eslint .',
|
|
@@ -304,7 +302,7 @@ describe('ProblemCollector', () => {
|
|
|
304
302
|
'',
|
|
305
303
|
'0 problems (0 error, 0 warnings)',
|
|
306
304
|
]);
|
|
307
|
-
|
|
305
|
+
expect(allMatches.length).to.eq(0);
|
|
308
306
|
});
|
|
309
307
|
});
|
|
310
308
|
//# sourceMappingURL=task-problem-collector.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-problem-collector.spec.js","sourceRoot":"","sources":["../../src/node/task-problem-collector.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"task-problem-collector.spec.js","sourceRoot":"","sources":["../../src/node/task-problem-collector.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { TaskConfiguration } from '../common';
|
|
2
|
-
import { Task } from './task';
|
|
1
|
+
import { TaskConfiguration } from '../common/index.js';
|
|
2
|
+
import { Task } from './task.js';
|
|
3
3
|
export declare const TaskRunner: unique symbol;
|
|
4
4
|
/**
|
|
5
5
|
* A {@link TaskRunner} knows how to run a task configuration of a particular type.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner-protocol.d.ts","sourceRoot":"","sources":["../../src/node/task-runner-protocol.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"task-runner-protocol.d.ts","sourceRoot":"","sources":["../../src/node/task-runner-protocol.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,eAAO,MAAM,UAAU,eAAuB,CAAC;AAC/C;;GAEG;AACH,MAAM,WAAW,UAAU;IACvB;;;;;;OAMG;IACH,GAAG,CAAC,SAAS,EAAE,iBAAiB,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClE"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2022 Ericsson and others.
|
|
4
3
|
//
|
|
@@ -14,7 +13,5 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
exports.TaskRunner = void 0;
|
|
19
|
-
exports.TaskRunner = Symbol('TaskRunner');
|
|
16
|
+
export const TaskRunner = Symbol('TaskRunner');
|
|
20
17
|
//# sourceMappingURL=task-runner-protocol.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner-protocol.js","sourceRoot":"","sources":["../../src/node/task-runner-protocol.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"task-runner-protocol.js","sourceRoot":"","sources":["../../src/node/task-runner-protocol.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;AAKhF,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Disposable } from '@theia/core/lib/common/disposable';
|
|
2
|
-
import { ProcessTaskRunner } from './process/process-task-runner';
|
|
3
|
-
import { TaskRunner } from './task-runner-protocol';
|
|
2
|
+
import { ProcessTaskRunner } from './process/process-task-runner.js';
|
|
3
|
+
import { TaskRunner } from './task-runner-protocol.js';
|
|
4
4
|
export { TaskRunner };
|
|
5
5
|
export declare const TaskRunnerContribution: unique symbol;
|
|
6
6
|
/** The {@link TaskRunnerContribution} can be used to contribute custom {@link TaskRunner}s. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner.d.ts","sourceRoot":"","sources":["../../src/node/task-runner.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM
|
|
1
|
+
{"version":3,"file":"task-runner.d.ts","sourceRoot":"","sources":["../../src/node/task-runner.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,CAAC;AAEtB,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AAEvE,+FAA+F;AAC/F,MAAM,WAAW,sBAAsB;IACnC;;;OAGG;IACH,cAAc,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAAC;CACrD;AAED;;;;;GAKG;AACH,qBACa,kBAAkB;IAE3B,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC3C,yFAAyF;IACzF,SAAS,CAAC,aAAa,EAAE,UAAU,CAAC;IAGpC,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,IAAI,IAAI,IAAI;IAItB;;;;;;;;OAQG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,UAAU;IAO5D;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,UAAU;IAUzC;;;;OAIG;IACH,cAAc,IAAI,MAAM,EAAE;CAG7B"}
|
package/lib/node/task-runner.js
CHANGED
|
@@ -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
|
-
const
|
|
23
|
-
Object.defineProperty(exports, "TaskRunner", { enumerable: true, get: function () { return task_runner_protocol_1.TaskRunner; } });
|
|
24
|
-
exports.TaskRunnerContribution = Symbol('TaskRunnerContribution');
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
|
|
18
|
+
import { ProcessTaskRunner } from './process/process-task-runner.js';
|
|
19
|
+
import { TaskRunner } from './task-runner-protocol.js';
|
|
20
|
+
export { TaskRunner };
|
|
21
|
+
export const TaskRunnerContribution = Symbol('TaskRunnerContribution');
|
|
25
22
|
/**
|
|
26
23
|
* The {@link TaskRunnerRegistry} is the common component for the registration and provisioning of
|
|
27
24
|
* {@link TaskRunner}s. Theia will collect all {@link TaskRunner}s and invoke {@link TaskRunnerContribution#registerRunner}
|
|
@@ -73,18 +70,14 @@ let TaskRunnerRegistry = class TaskRunnerRegistry {
|
|
|
73
70
|
return [...this.runners.keys()];
|
|
74
71
|
}
|
|
75
72
|
};
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
(0, inversify_1.inject)(process_task_runner_1.ProcessTaskRunner),
|
|
79
|
-
tslib_1.__metadata("design:type", process_task_runner_1.ProcessTaskRunner)
|
|
73
|
+
__decorate([
|
|
74
|
+
inject(ProcessTaskRunner)
|
|
80
75
|
], TaskRunnerRegistry.prototype, "processTaskRunner", void 0);
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
tslib_1.__metadata("design:type", Function),
|
|
84
|
-
tslib_1.__metadata("design:paramtypes", []),
|
|
85
|
-
tslib_1.__metadata("design:returntype", void 0)
|
|
76
|
+
__decorate([
|
|
77
|
+
postConstruct()
|
|
86
78
|
], TaskRunnerRegistry.prototype, "init", null);
|
|
87
|
-
|
|
88
|
-
|
|
79
|
+
TaskRunnerRegistry = __decorate([
|
|
80
|
+
injectable()
|
|
89
81
|
], TaskRunnerRegistry);
|
|
82
|
+
export { TaskRunnerRegistry };
|
|
90
83
|
//# sourceMappingURL=task-runner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner.js","sourceRoot":"","sources":["../../src/node/task-runner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"task-runner.js","sourceRoot":"","sources":["../../src/node/task-runner.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,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAEjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,CAAC;AAEtB,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAWvE;;;;;GAKG;AAEI,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAUjB,IAAI;QACV,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC;IAChD,CAAC;IACD;;;;;;;;OAQG;IACH,cAAc,CAAC,IAAY,EAAE,MAAkB;QAC3C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/B,OAAO;YACH,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;SAC3C,CAAC;IACN,CAAC;IAED;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,KAAe;QACxB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,MAAM,EAAE,CAAC;gBACT,OAAO,MAAM,CAAC;YAClB,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED;;;;OAIG;IACH,cAAc;QACV,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACpC,CAAC;CACJ,CAAA;AAhDsB;IADlB,MAAM,CAAC,iBAAiB,CAAC;6DAC8B;AAG9C;IADT,aAAa,EAAE;8CAIf;AAbQ,kBAAkB;IAD9B,UAAU,EAAE;GACA,kBAAkB,CAuD9B"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { Disposable, DisposableCollection, ILogger } from '@theia/core/lib/common
|
|
2
|
-
import { TaskClient, TaskExitedEvent, TaskInfo, TaskServer, TaskConfiguration, TaskOutputProcessedEvent, RunTaskOption, BackgroundTaskEndedEvent } from '../common';
|
|
3
|
-
import { TaskManager } from './task-manager';
|
|
4
|
-
import { TaskRunnerRegistry } from './task-runner';
|
|
5
|
-
import { Task } from './task';
|
|
1
|
+
import { Disposable, DisposableCollection, ILogger } from '@theia/core/lib/common';
|
|
2
|
+
import { TaskClient, TaskExitedEvent, TaskInfo, TaskServer, TaskConfiguration, TaskOutputProcessedEvent, RunTaskOption, BackgroundTaskEndedEvent } from '../common/index.js';
|
|
3
|
+
import { TaskManager } from './task-manager.js';
|
|
4
|
+
import { TaskRunnerRegistry } from './task-runner.js';
|
|
5
|
+
import { Task } from './task.js';
|
|
6
6
|
export declare class TaskServerImpl implements TaskServer, Disposable {
|
|
7
7
|
/** Task clients, to send notifications-to. */
|
|
8
8
|
protected clients: TaskClient[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-server.d.ts","sourceRoot":"","sources":["../../src/node/task-server.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"task-server.d.ts","sourceRoot":"","sources":["../../src/node/task-server.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACnF,OAAO,EACH,UAAU,EACV,eAAe,EACf,QAAQ,EACR,UAAU,EACV,iBAAiB,EACjB,wBAAwB,EACxB,aAAa,EACb,wBAAwB,EAC3B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAKjC,qBACa,cAAe,YAAW,UAAU,EAAE,UAAU;IAEzD,8CAA8C;IAC9C,SAAS,CAAC,OAAO,EAAE,UAAU,EAAE,CAAM;IACrC,yCAAyC;IACzC,SAAS,CAAC,QAAQ,CAAC,SAAS,oCAA2C;IAEvE,iDAAiD;IAEjD,SAAS,CAAC,QAAQ,CAAC,uBAAuB;kBAAiC,OAAO;OAAM;IAGxF,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAG5C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,kBAAkB,CAAC;IAEtD,mDAAmD;IACnD,OAAO,CAAC,iBAAiB,CAAyD;IAElF,OAAO,IAAI,IAAI;IAQf,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAWzC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAa/C,GAAG,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,QAAQ,CAAC;IA8ElG,sBAAsB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI3C,uBAAuB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtF,SAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI;IAcxE,SAAS,CAAC,oBAAoB,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI;IAclE,SAAS,CAAC,4BAA4B,CAAC,KAAK,EAAE,wBAAwB,GAAG,IAAI;IAI7E,SAAS,CAAC,4BAA4B,CAAC,KAAK,EAAE,wBAAwB,GAAG,IAAI;IAI7E,6DAA6D;IACvD,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWrC,mCAAmC;IACnC,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAKnC,yCAAyC;IACzC,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAQ1C,OAAO,CAAC,yBAAyB;IAMjC,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,6BAA6B;CAKxC"}
|
package/lib/node/task-server.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2017 Ericsson 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 process_task_1 = require("./process/process-task");
|
|
25
|
-
const task_problem_collector_1 = require("./task-problem-collector");
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { inject, injectable, named } from '@theia/core/shared/inversify';
|
|
18
|
+
import { DisposableCollection, ILogger } from '@theia/core/lib/common';
|
|
19
|
+
import { TaskManager } from './task-manager.js';
|
|
20
|
+
import { TaskRunnerRegistry } from './task-runner.js';
|
|
21
|
+
import { ProcessTask } from './process/process-task.js';
|
|
22
|
+
import { ProblemCollector } from './task-problem-collector.js';
|
|
26
23
|
let TaskServerImpl = class TaskServerImpl {
|
|
27
24
|
constructor() {
|
|
28
25
|
/** Task clients, to send notifications-to. */
|
|
@@ -68,7 +65,7 @@ let TaskServerImpl = class TaskServerImpl {
|
|
|
68
65
|
this.runnerRegistry.getRunner(taskConfiguration.type);
|
|
69
66
|
const task = await runner.run(taskConfiguration, ctx);
|
|
70
67
|
if (!this.toDispose.has(task.id)) {
|
|
71
|
-
this.toDispose.set(task.id, new
|
|
68
|
+
this.toDispose.set(task.id, new DisposableCollection());
|
|
72
69
|
}
|
|
73
70
|
if (taskConfiguration.isBackground && !this.backgroundTaskStatusMap.has(task.id)) {
|
|
74
71
|
this.backgroundTaskStatusMap.set(task.id, { 'isActive': false });
|
|
@@ -84,7 +81,7 @@ let TaskServerImpl = class TaskServerImpl {
|
|
|
84
81
|
this.toDispose.get(task.id).push(task.onOutput(event => {
|
|
85
82
|
let collector = this.getCachedProblemCollector(event.ctx || '', event.taskId);
|
|
86
83
|
if (!collector) {
|
|
87
|
-
collector = new
|
|
84
|
+
collector = new ProblemCollector(resolvedMatchers);
|
|
88
85
|
this.cacheProblemCollector(event.ctx || '', event.taskId, collector);
|
|
89
86
|
}
|
|
90
87
|
const problems = collector.processLine(event.line);
|
|
@@ -138,7 +135,7 @@ let TaskServerImpl = class TaskServerImpl {
|
|
|
138
135
|
}
|
|
139
136
|
fireTaskExitedEvent(event, task) {
|
|
140
137
|
this.logger.debug(log => log('task has exited:', event));
|
|
141
|
-
if (task instanceof
|
|
138
|
+
if (task instanceof ProcessTask) {
|
|
142
139
|
this.clients.forEach(client => {
|
|
143
140
|
client.onDidEndTaskProcess(event);
|
|
144
141
|
});
|
|
@@ -152,7 +149,7 @@ let TaskServerImpl = class TaskServerImpl {
|
|
|
152
149
|
this.clients.forEach(client => {
|
|
153
150
|
client.onTaskCreated(event);
|
|
154
151
|
});
|
|
155
|
-
if (task && task instanceof
|
|
152
|
+
if (task && task instanceof ProcessTask) {
|
|
156
153
|
this.clients.forEach(client => {
|
|
157
154
|
client.onDidStartTaskProcess(event);
|
|
158
155
|
});
|
|
@@ -212,21 +209,18 @@ let TaskServerImpl = class TaskServerImpl {
|
|
|
212
209
|
}
|
|
213
210
|
}
|
|
214
211
|
};
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
(
|
|
218
|
-
(0, inversify_1.named)('task:TaskServerImpl'),
|
|
219
|
-
tslib_1.__metadata("design:type", Object)
|
|
212
|
+
__decorate([
|
|
213
|
+
inject(ILogger),
|
|
214
|
+
named('task:TaskServerImpl')
|
|
220
215
|
], TaskServerImpl.prototype, "logger", void 0);
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
tslib_1.__metadata("design:type", task_manager_1.TaskManager)
|
|
216
|
+
__decorate([
|
|
217
|
+
inject(TaskManager)
|
|
224
218
|
], TaskServerImpl.prototype, "taskManager", void 0);
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
tslib_1.__metadata("design:type", task_runner_1.TaskRunnerRegistry)
|
|
219
|
+
__decorate([
|
|
220
|
+
inject(TaskRunnerRegistry)
|
|
228
221
|
], TaskServerImpl.prototype, "runnerRegistry", void 0);
|
|
229
|
-
|
|
230
|
-
|
|
222
|
+
TaskServerImpl = __decorate([
|
|
223
|
+
injectable()
|
|
231
224
|
], TaskServerImpl);
|
|
225
|
+
export { TaskServerImpl };
|
|
232
226
|
//# sourceMappingURL=task-server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-server.js","sourceRoot":"","sources":["../../src/node/task-server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"task-server.js","sourceRoot":"","sources":["../../src/node/task-server.ts"],"names":[],"mappings":"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"}
|