@theia/task 1.73.0-next.9 → 1.73.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/task-configurations.d.ts +2 -0
- package/lib/browser/task-configurations.d.ts.map +1 -1
- package/lib/browser/task-configurations.js +9 -3
- package/lib/browser/task-configurations.js.map +1 -1
- package/lib/browser/task-problem-matcher-registry.d.ts +2 -0
- package/lib/browser/task-problem-matcher-registry.d.ts.map +1 -1
- package/lib/browser/task-problem-matcher-registry.js +7 -1
- package/lib/browser/task-problem-matcher-registry.js.map +1 -1
- package/lib/browser/task-problem-pattern-registry.d.ts +2 -0
- package/lib/browser/task-problem-pattern-registry.d.ts.map +1 -1
- package/lib/browser/task-problem-pattern-registry.js +7 -1
- package/lib/browser/task-problem-pattern-registry.js.map +1 -1
- package/lib/browser/task-service.js +15 -14
- package/lib/browser/task-service.js.map +1 -1
- package/lib/browser/task-terminal-widget-manager.d.ts +1 -7
- package/lib/browser/task-terminal-widget-manager.d.ts.map +1 -1
- package/lib/browser/task-terminal-widget-manager.js +6 -34
- package/lib/browser/task-terminal-widget-manager.js.map +1 -1
- package/lib/node/task-server.js +1 -1
- package/lib/node/task-server.js.map +1 -1
- package/lib/node/task-server.slow-spec.js +49 -1
- package/lib/node/task-server.slow-spec.js.map +1 -1
- package/package.json +13 -14
- package/src/browser/task-configurations.ts +8 -4
- package/src/browser/task-problem-matcher-registry.ts +6 -2
- package/src/browser/task-problem-pattern-registry.ts +7 -2
- package/src/browser/task-service.ts +15 -15
- package/src/browser/task-terminal-widget-manager.ts +7 -30
- package/src/node/task-server.slow-spec.ts +56 -1
- package/src/node/task-server.ts +1 -1
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { WidgetOpenerOptions } from '@theia/core/lib/browser';
|
|
2
2
|
import { TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
|
|
3
3
|
import { TerminalWidgetFactoryOptions } from '@theia/terminal/lib/browser/terminal-widget-impl';
|
|
4
4
|
import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
|
|
5
5
|
import { TaskConfiguration, TaskWatcher, TaskServer, TaskInfo } from '../common';
|
|
6
6
|
import { TaskDefinitionRegistry } from './task-definition-registry';
|
|
7
7
|
import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
|
|
8
|
-
import { TerminalManagerFrontendViewContribution } from '@theia/terminal-manager/lib/browser/terminal-manager-frontend-view-contribution';
|
|
9
|
-
import { TerminalManagerPreferences } from '@theia/terminal-manager/lib/browser/terminal-manager-preferences';
|
|
10
8
|
export interface TaskTerminalWidget extends TerminalWidget {
|
|
11
9
|
readonly kind: 'task';
|
|
12
10
|
dedicated?: boolean;
|
|
@@ -28,15 +26,11 @@ export declare namespace TaskTerminalWidgetOpenerOptions {
|
|
|
28
26
|
function echoExecutedCommand(options: TaskTerminalWidgetOpenerOptions): boolean;
|
|
29
27
|
}
|
|
30
28
|
export declare class TaskTerminalWidgetManager {
|
|
31
|
-
protected readonly shell: ApplicationShell;
|
|
32
29
|
protected readonly taskDefinitionRegistry: TaskDefinitionRegistry;
|
|
33
30
|
protected readonly terminalService: TerminalService;
|
|
34
31
|
protected readonly taskWatcher: TaskWatcher;
|
|
35
32
|
protected readonly taskServer: TaskServer;
|
|
36
33
|
protected readonly workspaceService: WorkspaceService;
|
|
37
|
-
protected readonly preferences: TerminalManagerPreferences;
|
|
38
|
-
protected readonly widgetManager: WidgetManager;
|
|
39
|
-
protected readonly terminalManagerViewContribution: TerminalManagerFrontendViewContribution;
|
|
40
34
|
protected init(): void;
|
|
41
35
|
newTaskTerminal(factoryOptions: TerminalWidgetFactoryOptions): Promise<TerminalWidget>;
|
|
42
36
|
open(factoryOptions: TerminalWidgetFactoryOptions, openerOptions: TaskTerminalWidgetOpenerOptions): Promise<TerminalWidget>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-terminal-widget-manager.d.ts","sourceRoot":"","sources":["../../src/browser/task-terminal-widget-manager.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"task-terminal-widget-manager.d.ts","sourceRoot":"","sources":["../../src/browser/task-terminal-widget-manager.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAClF,OAAO,EAAE,4BAA4B,EAAE,MAAM,kDAAkD,CAAC;AAChG,OAAO,EAAE,eAAe,EAAE,MAAM,mDAAmD,CAAC;AACpF,OAAO,EAAa,iBAAiB,EAAE,WAAW,EAAmB,UAAU,EAA0B,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErI,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAIlF,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACtD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,IAAI,CAAC,EAAE,OAAO,CAAC;CAClB;AACD,yBAAiB,kBAAkB,CAAC;IAChC,SAAgB,EAAE,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,IAAI,kBAAkB,CAEvE;CACJ;AAED,MAAM,WAAW,+BAAgC,SAAQ,mBAAmB;IACxE,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACvB;AACD,yBAAiB,+BAA+B,CAAC;IAC7C,SAAgB,mBAAmB,CAAC,OAAO,EAAE,+BAA+B,GAAG,OAAO,CAGrF;IAED,SAAgB,aAAa,CAAC,OAAO,EAAE,+BAA+B,GAAG,OAAO,CAG/E;IAED,SAAgB,gBAAgB,CAAC,OAAO,EAAE,+BAA+B,GAAG,OAAO,CAGlF;IAED,SAAgB,mBAAmB,CAAC,OAAO,EAAE,+BAA+B,GAAG,OAAO,CAGrF;CACJ;AAED,qBACa,yBAAyB;IAGlC,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAGlE,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAG5C,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAG1C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,IAAI,IAAI,IAAI;IA0ChB,eAAe,CAAC,cAAc,EAAE,4BAA4B,GAAG,OAAO,CAAC,cAAc,CAAC;IAItF,IAAI,CAAC,cAAc,EAAE,4BAA4B,EAAE,aAAa,EAAE,+BAA+B,GAAG,OAAO,CAAC,cAAc,CAAC;cA8BjH,kBAAkB,CAC9B,cAAc,EAAE,4BAA4B,EAAE,aAAa,EAAE,+BAA+B,GAC7F,OAAO,CAAC;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,cAAc,CAAA;KAAE,CAAC;IA4CtD,SAAS,CAAC,sBAAsB,IAAI,kBAAkB,EAAE;IAIxD,SAAS,CAAC,wBAAwB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,GAAG,IAAI;CAS5H"}
|
|
@@ -18,7 +18,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
18
18
|
exports.TaskTerminalWidgetManager = exports.TaskTerminalWidgetOpenerOptions = exports.TaskTerminalWidget = void 0;
|
|
19
19
|
const tslib_1 = require("tslib");
|
|
20
20
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
21
|
-
const browser_1 = require("@theia/core/lib/browser");
|
|
22
21
|
const terminal_service_1 = require("@theia/terminal/lib/browser/base/terminal-service");
|
|
23
22
|
const common_1 = require("../common");
|
|
24
23
|
const task_protocol_1 = require("../common/process/task-protocol");
|
|
@@ -26,9 +25,6 @@ const task_definition_registry_1 = require("./task-definition-registry");
|
|
|
26
25
|
const workspace_service_1 = require("@theia/workspace/lib/browser/workspace-service");
|
|
27
26
|
const uri_1 = require("@theia/core/lib/common/uri");
|
|
28
27
|
const core_1 = require("@theia/core");
|
|
29
|
-
const terminal_manager_widget_1 = require("@theia/terminal-manager/lib/browser/terminal-manager-widget");
|
|
30
|
-
const terminal_manager_frontend_view_contribution_1 = require("@theia/terminal-manager/lib/browser/terminal-manager-frontend-view-contribution");
|
|
31
|
-
const terminal_manager_preferences_1 = require("@theia/terminal-manager/lib/browser/terminal-manager-preferences");
|
|
32
28
|
var TaskTerminalWidget;
|
|
33
29
|
(function (TaskTerminalWidget) {
|
|
34
30
|
function is(widget) {
|
|
@@ -112,15 +108,7 @@ let TaskTerminalWidgetManager = class TaskTerminalWidgetManager {
|
|
|
112
108
|
throw new Error('"taskConfig" must be included as part of the "option.taskInfo" if "isDedicated" is true');
|
|
113
109
|
}
|
|
114
110
|
const { isNew, widget } = await this.getWidgetToRunTask(factoryOptions, openerOptions);
|
|
115
|
-
|
|
116
|
-
if (isNew && isTreeMode) {
|
|
117
|
-
const terminalManagerWidget = await this.widgetManager.getOrCreateWidget(terminal_manager_widget_1.TerminalManagerWidget.ID);
|
|
118
|
-
terminalManagerWidget.addTerminalToTasksPage(widget);
|
|
119
|
-
widget.resetTerminal();
|
|
120
|
-
await this.terminalManagerViewContribution.openView({ reveal: true });
|
|
121
|
-
}
|
|
122
|
-
else if (isNew) {
|
|
123
|
-
this.shell.addWidget(widget, { area: openerOptions.widgetOptions ? openerOptions.widgetOptions.area : 'bottom' });
|
|
111
|
+
if (isNew) {
|
|
124
112
|
widget.resetTerminal();
|
|
125
113
|
}
|
|
126
114
|
else {
|
|
@@ -131,13 +119,13 @@ let TaskTerminalWidgetManager = class TaskTerminalWidgetManager {
|
|
|
131
119
|
widget.clearOutput();
|
|
132
120
|
}
|
|
133
121
|
}
|
|
134
|
-
this.terminalService.open(widget, openerOptions);
|
|
135
|
-
|
|
136
|
-
|
|
122
|
+
await this.terminalService.open(widget, openerOptions);
|
|
123
|
+
const command = taskInfo && task_protocol_1.ProcessTaskInfo.is(taskInfo) ? taskInfo.command : undefined;
|
|
124
|
+
if (TaskTerminalWidgetOpenerOptions.echoExecutedCommand(openerOptions) && command && command.length > 0) {
|
|
137
125
|
if (widget.commandHistoryState) {
|
|
138
|
-
widget.
|
|
126
|
+
widget.write('\x1b]133;prompt_started\x07');
|
|
139
127
|
}
|
|
140
|
-
widget.writeLine('\x1b[1m> ' + core_1.nls.localizeByDefault('Executing task: {0}',
|
|
128
|
+
widget.writeLine('\x1b[1m> ' + core_1.nls.localizeByDefault('Executing task: {0}', command) + ' <\x1b[0m\n');
|
|
141
129
|
}
|
|
142
130
|
return widget;
|
|
143
131
|
}
|
|
@@ -197,10 +185,6 @@ let TaskTerminalWidgetManager = class TaskTerminalWidgetManager {
|
|
|
197
185
|
}
|
|
198
186
|
};
|
|
199
187
|
exports.TaskTerminalWidgetManager = TaskTerminalWidgetManager;
|
|
200
|
-
tslib_1.__decorate([
|
|
201
|
-
(0, inversify_1.inject)(browser_1.ApplicationShell),
|
|
202
|
-
tslib_1.__metadata("design:type", browser_1.ApplicationShell)
|
|
203
|
-
], TaskTerminalWidgetManager.prototype, "shell", void 0);
|
|
204
188
|
tslib_1.__decorate([
|
|
205
189
|
(0, inversify_1.inject)(task_definition_registry_1.TaskDefinitionRegistry),
|
|
206
190
|
tslib_1.__metadata("design:type", task_definition_registry_1.TaskDefinitionRegistry)
|
|
@@ -221,18 +205,6 @@ tslib_1.__decorate([
|
|
|
221
205
|
(0, inversify_1.inject)(workspace_service_1.WorkspaceService),
|
|
222
206
|
tslib_1.__metadata("design:type", workspace_service_1.WorkspaceService)
|
|
223
207
|
], TaskTerminalWidgetManager.prototype, "workspaceService", void 0);
|
|
224
|
-
tslib_1.__decorate([
|
|
225
|
-
(0, inversify_1.inject)(terminal_manager_preferences_1.TerminalManagerPreferences),
|
|
226
|
-
tslib_1.__metadata("design:type", Object)
|
|
227
|
-
], TaskTerminalWidgetManager.prototype, "preferences", void 0);
|
|
228
|
-
tslib_1.__decorate([
|
|
229
|
-
(0, inversify_1.inject)(browser_1.WidgetManager),
|
|
230
|
-
tslib_1.__metadata("design:type", browser_1.WidgetManager)
|
|
231
|
-
], TaskTerminalWidgetManager.prototype, "widgetManager", void 0);
|
|
232
|
-
tslib_1.__decorate([
|
|
233
|
-
(0, inversify_1.inject)(terminal_manager_frontend_view_contribution_1.TerminalManagerFrontendViewContribution),
|
|
234
|
-
tslib_1.__metadata("design:type", terminal_manager_frontend_view_contribution_1.TerminalManagerFrontendViewContribution)
|
|
235
|
-
], TaskTerminalWidgetManager.prototype, "terminalManagerViewContribution", void 0);
|
|
236
208
|
tslib_1.__decorate([
|
|
237
209
|
(0, inversify_1.postConstruct)(),
|
|
238
210
|
tslib_1.__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-terminal-widget-manager.js","sourceRoot":"","sources":["../../src/browser/task-terminal-widget-manager.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,4DAAiF;
|
|
1
|
+
{"version":3,"file":"task-terminal-widget-manager.js","sourceRoot":"","sources":["../../src/browser/task-terminal-widget-manager.ts"],"names":[],"mappings":"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"}
|
package/lib/node/task-server.js
CHANGED
|
@@ -126,7 +126,7 @@ let TaskServerImpl = class TaskServerImpl {
|
|
|
126
126
|
}
|
|
127
127
|
this.toDispose.get(task.id).push(task);
|
|
128
128
|
const taskInfo = await task.getRuntimeInfo();
|
|
129
|
-
this.fireTaskCreatedEvent(taskInfo);
|
|
129
|
+
this.fireTaskCreatedEvent(taskInfo, task);
|
|
130
130
|
return taskInfo;
|
|
131
131
|
}
|
|
132
132
|
async getRegisteredTaskTypes() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-server.js","sourceRoot":"","sources":["../../src/node/task-server.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"task-server.js","sourceRoot":"","sources":["../../src/node/task-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -92,7 +92,7 @@ describe('Task server / back-end', function () {
|
|
|
92
92
|
setup.connectionProvider.listen(`${terminal_protocol_1.terminalsPath}/${terminalId}`, (path, channel) => {
|
|
93
93
|
channel.onMessage(e => stringBuffer.push(e().readString()));
|
|
94
94
|
channel.onError(reject);
|
|
95
|
-
|
|
95
|
+
// onClose is not used to reject: the server now closes the channel after process exit (expected behavior).
|
|
96
96
|
}, false);
|
|
97
97
|
stringBuffer.onData(currentMessage => {
|
|
98
98
|
// Instead of waiting for one message from the terminal, we wait for several ones as the very first message can be something unexpected.
|
|
@@ -314,6 +314,46 @@ describe('Task server / back-end', function () {
|
|
|
314
314
|
const exitStatus = await getExitStatus(taskInfo, taskWatcher);
|
|
315
315
|
(0, chai_1.expect)(exitStatus).eq(0);
|
|
316
316
|
});
|
|
317
|
+
it('onDidStartTaskProcess is fired when a terminal-process task is created', async function () {
|
|
318
|
+
const command = os_1.isWindows ? commandShortRunningWindows : (os_1.isOSX ? commandShortRunningOsx : commandShortRunning);
|
|
319
|
+
let startEvent;
|
|
320
|
+
const toDispose = taskWatcher.onDidStartTaskProcess(event => { startEvent = event; });
|
|
321
|
+
const taskInfo = await taskServer.run(createProcessTaskConfig('shell', command, undefined), wsRoot);
|
|
322
|
+
toDispose.dispose();
|
|
323
|
+
if (startEvent === undefined) {
|
|
324
|
+
throw new Error('onDidStartTaskProcess was not fired');
|
|
325
|
+
}
|
|
326
|
+
(0, chai_1.expect)(startEvent.taskId).equals(taskInfo.taskId);
|
|
327
|
+
(0, chai_1.expect)(startEvent.processId).to.be.a('number');
|
|
328
|
+
await checkSuccessfulProcessExit(taskInfo, taskWatcher);
|
|
329
|
+
});
|
|
330
|
+
it('onDidStartTaskProcess is fired when a raw-process task is created', async function () {
|
|
331
|
+
const command = os_1.isWindows ? commandShortRunningWindows : (os_1.isOSX ? commandShortRunningOsx : commandShortRunning);
|
|
332
|
+
const executable = node_1.FileUri.fsPath(wsRootUri.resolve(command));
|
|
333
|
+
let startEvent;
|
|
334
|
+
const toDispose = taskWatcher.onDidStartTaskProcess(event => { startEvent = event; });
|
|
335
|
+
const taskInfo = await taskServer.run(createProcessTaskConfig('process', executable, []), wsRoot);
|
|
336
|
+
toDispose.dispose();
|
|
337
|
+
if (startEvent === undefined) {
|
|
338
|
+
throw new Error('onDidStartTaskProcess was not fired');
|
|
339
|
+
}
|
|
340
|
+
(0, chai_1.expect)(startEvent.taskId).equals(taskInfo.taskId);
|
|
341
|
+
(0, chai_1.expect)(startEvent.processId).to.be.a('number');
|
|
342
|
+
await checkSuccessfulProcessExit(taskInfo, taskWatcher);
|
|
343
|
+
});
|
|
344
|
+
it('onDidStartTaskProcess is not fired for a non-process (custom) task', async function () {
|
|
345
|
+
let processStarted = false;
|
|
346
|
+
let taskCreated = false;
|
|
347
|
+
const disposeStart = taskWatcher.onDidStartTaskProcess(() => { processStarted = true; });
|
|
348
|
+
const disposeCreated = taskWatcher.onTaskCreated(() => { taskCreated = true; });
|
|
349
|
+
const taskInfo = await taskServer.run(createCustomTaskConfig(), wsRoot);
|
|
350
|
+
disposeStart.dispose();
|
|
351
|
+
disposeCreated.dispose();
|
|
352
|
+
// The events are fired synchronously while `run` is awaited, so by now they have either fired or not.
|
|
353
|
+
(0, chai_1.expect)(taskCreated, 'onTaskCreated was expected to fire for a custom task').to.equal(true);
|
|
354
|
+
(0, chai_1.expect)(processStarted, 'onDidStartTaskProcess should not fire for a non-process task').to.equal(false);
|
|
355
|
+
await taskServer.kill(taskInfo.taskId);
|
|
356
|
+
});
|
|
317
357
|
});
|
|
318
358
|
function createTaskConfig(taskType, command, args) {
|
|
319
359
|
const options = {
|
|
@@ -348,6 +388,14 @@ function createProcessTaskConfig2(processType, command, args) {
|
|
|
348
388
|
options: { cwd: wsRoot },
|
|
349
389
|
};
|
|
350
390
|
}
|
|
391
|
+
function createCustomTaskConfig() {
|
|
392
|
+
return {
|
|
393
|
+
label: 'test custom task',
|
|
394
|
+
type: 'customExecution',
|
|
395
|
+
_source: '/source/folder',
|
|
396
|
+
_scope: '/source/folder'
|
|
397
|
+
};
|
|
398
|
+
}
|
|
351
399
|
function createTaskConfigTaskLongRunning(processType) {
|
|
352
400
|
return {
|
|
353
401
|
label: '[Task] long running test task (~300s)',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-server.slow-spec.js","sourceRoot":"","sources":["../../src/node/task-server.slow-spec.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"task-server.slow-spec.js","sourceRoot":"","sources":["../../src/node/task-server.slow-spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,20 +1,19 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/task",
|
|
3
|
-
"version": "1.73.
|
|
3
|
+
"version": "1.73.1",
|
|
4
4
|
"description": "Theia - Task extension. This extension adds support for executing raw or terminal processes in the backend.",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.73.
|
|
7
|
-
"@theia/editor": "1.73.
|
|
8
|
-
"@theia/filesystem": "1.73.
|
|
9
|
-
"@theia/markers": "1.73.
|
|
10
|
-
"@theia/monaco": "1.73.
|
|
6
|
+
"@theia/core": "1.73.1",
|
|
7
|
+
"@theia/editor": "1.73.1",
|
|
8
|
+
"@theia/filesystem": "1.73.1",
|
|
9
|
+
"@theia/markers": "1.73.1",
|
|
10
|
+
"@theia/monaco": "1.73.1",
|
|
11
11
|
"@theia/monaco-editor-core": "1.108.201",
|
|
12
|
-
"@theia/process": "1.73.
|
|
13
|
-
"@theia/terminal": "1.73.
|
|
14
|
-
"@theia/
|
|
15
|
-
"@theia/
|
|
16
|
-
"@theia/
|
|
17
|
-
"@theia/workspace": "1.73.0-next.9+310484268",
|
|
12
|
+
"@theia/process": "1.73.1",
|
|
13
|
+
"@theia/terminal": "1.73.1",
|
|
14
|
+
"@theia/userstorage": "1.73.1",
|
|
15
|
+
"@theia/variable-resolver": "1.73.1",
|
|
16
|
+
"@theia/workspace": "1.73.1",
|
|
18
17
|
"async-mutex": "^0.3.2",
|
|
19
18
|
"jsonc-parser": "^3.3.1",
|
|
20
19
|
"p-debounce": "^2.1.0",
|
|
@@ -54,10 +53,10 @@
|
|
|
54
53
|
"watch": "theiaext watch"
|
|
55
54
|
},
|
|
56
55
|
"devDependencies": {
|
|
57
|
-
"@theia/ext-scripts": "1.
|
|
56
|
+
"@theia/ext-scripts": "1.73.1"
|
|
58
57
|
},
|
|
59
58
|
"nyc": {
|
|
60
59
|
"extends": "../../configs/nyc.json"
|
|
61
60
|
},
|
|
62
|
-
"gitHead": "
|
|
61
|
+
"gitHead": "08e93b2cbdc03c5c8ecf58d3e8ecb9716fd11339"
|
|
63
62
|
}
|
|
@@ -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 { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
17
|
+
import { inject, injectable, postConstruct, named } from '@theia/core/shared/inversify';
|
|
18
18
|
import {
|
|
19
19
|
TaskConfiguration,
|
|
20
20
|
TaskCustomization,
|
|
@@ -32,6 +32,7 @@ import { TaskSourceResolver } from './task-source-resolver';
|
|
|
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';
|
|
35
|
+
import { ILogger } from '@theia/core';
|
|
35
36
|
|
|
36
37
|
export interface TaskConfigurationClient {
|
|
37
38
|
/**
|
|
@@ -83,6 +84,9 @@ export class TaskConfigurations implements Disposable {
|
|
|
83
84
|
@inject(TaskSourceResolver)
|
|
84
85
|
protected readonly taskSourceResolver: TaskSourceResolver;
|
|
85
86
|
|
|
87
|
+
@inject(ILogger) @named('task:TaskConfigurations')
|
|
88
|
+
protected readonly logger: ILogger;
|
|
89
|
+
|
|
86
90
|
constructor() {
|
|
87
91
|
this.toDispose.push(Disposable.create(() => {
|
|
88
92
|
this.tasksMap.clear();
|
|
@@ -102,7 +106,7 @@ export class TaskConfigurations implements Disposable {
|
|
|
102
106
|
this.client.taskConfigurationChanged(this.getTaskLabels());
|
|
103
107
|
}
|
|
104
108
|
} catch (err) {
|
|
105
|
-
|
|
109
|
+
this.logger.error(err);
|
|
106
110
|
}
|
|
107
111
|
})
|
|
108
112
|
);
|
|
@@ -319,14 +323,14 @@ export class TaskConfigurations implements Disposable {
|
|
|
319
323
|
try {
|
|
320
324
|
await this.taskConfigurationManager.openConfiguration(scope);
|
|
321
325
|
} catch (e) {
|
|
322
|
-
|
|
326
|
+
this.logger.error(`Error occurred while opening 'tasks.json' in ${this.taskSourceResolver.resolve(task)}.`, e);
|
|
323
327
|
}
|
|
324
328
|
}
|
|
325
329
|
|
|
326
330
|
private getTaskCustomizationTemplate(task: TaskConfiguration): TaskCustomization | undefined {
|
|
327
331
|
const definition = this.getTaskDefinition(task);
|
|
328
332
|
if (!definition) {
|
|
329
|
-
|
|
333
|
+
this.logger.error('Detected / Contributed tasks should have a task definition.');
|
|
330
334
|
return;
|
|
331
335
|
}
|
|
332
336
|
const customization: TaskCustomization = { type: task.type, runOptions: task.runOptions };
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
20
20
|
*--------------------------------------------------------------------------------------------*/
|
|
21
21
|
|
|
22
|
-
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
22
|
+
import { inject, injectable, postConstruct, named } from '@theia/core/shared/inversify';
|
|
23
23
|
import { Event, Emitter, nls } from '@theia/core/lib/common';
|
|
24
24
|
import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
25
25
|
import {
|
|
@@ -30,6 +30,7 @@ import {
|
|
|
30
30
|
import { ProblemPatternRegistry } from './task-problem-pattern-registry';
|
|
31
31
|
import { Severity } from '@theia/core/lib/common/severity';
|
|
32
32
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
33
|
+
import { ILogger } from '@theia/core';
|
|
33
34
|
|
|
34
35
|
@injectable()
|
|
35
36
|
export class ProblemMatcherRegistry {
|
|
@@ -40,6 +41,9 @@ export class ProblemMatcherRegistry {
|
|
|
40
41
|
@inject(ProblemPatternRegistry)
|
|
41
42
|
protected readonly problemPatternRegistry: ProblemPatternRegistry;
|
|
42
43
|
|
|
44
|
+
@inject(ILogger) @named('task:ProblemMatcherRegistry')
|
|
45
|
+
protected readonly logger: ILogger;
|
|
46
|
+
|
|
43
47
|
protected readonly onDidChangeProblemMatcherEmitter = new Emitter<void>();
|
|
44
48
|
get onDidChangeProblemMatcher(): Event<void> {
|
|
45
49
|
return this.onDidChangeProblemMatcherEmitter.event;
|
|
@@ -65,7 +69,7 @@ export class ProblemMatcherRegistry {
|
|
|
65
69
|
*/
|
|
66
70
|
register(matcher: ProblemMatcherContribution): Disposable {
|
|
67
71
|
if (!matcher.name) {
|
|
68
|
-
|
|
72
|
+
this.logger.error('Only named Problem Matchers can be registered.');
|
|
69
73
|
return Disposable.NULL;
|
|
70
74
|
}
|
|
71
75
|
const toDispose = new DisposableCollection(Disposable.create(() => {
|
|
@@ -21,11 +21,16 @@
|
|
|
21
21
|
|
|
22
22
|
import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
23
23
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
24
|
-
import { injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
24
|
+
import { injectable, inject, postConstruct, named } from '@theia/core/shared/inversify';
|
|
25
25
|
import { NamedProblemPattern, ProblemLocationKind, ProblemPattern, ProblemPatternContribution } from '../common';
|
|
26
|
+
import { ILogger } from '@theia/core';
|
|
26
27
|
|
|
27
28
|
@injectable()
|
|
28
29
|
export class ProblemPatternRegistry {
|
|
30
|
+
|
|
31
|
+
@inject(ILogger) @named('task:ProblemPatternRegistry')
|
|
32
|
+
protected readonly logger: ILogger;
|
|
33
|
+
|
|
29
34
|
private readonly patterns = new Map<string, NamedProblemPattern | NamedProblemPattern[]>();
|
|
30
35
|
private readyPromise = new Deferred<void>();
|
|
31
36
|
|
|
@@ -51,7 +56,7 @@ export class ProblemPatternRegistry {
|
|
|
51
56
|
return toDispose;
|
|
52
57
|
}
|
|
53
58
|
if (!value.name) {
|
|
54
|
-
|
|
59
|
+
this.logger.error('Only named Problem Patterns can be registered.');
|
|
55
60
|
return Disposable.NULL;
|
|
56
61
|
}
|
|
57
62
|
const problemPattern = ProblemPattern.fromProblemPatternContribution(value);
|