@opensumi/ide-task 2.16.7-next-1649396294.0 → 2.16.8
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.contribution.d.ts +2 -5
- package/lib/browser/task.contribution.d.ts.map +1 -1
- package/lib/browser/task.contribution.js +1 -21
- package/lib/browser/task.contribution.js.map +1 -1
- package/lib/browser/task.service.d.ts +0 -3
- package/lib/browser/task.service.d.ts.map +1 -1
- package/lib/browser/task.service.js +2 -36
- package/lib/browser/task.service.js.map +1 -1
- package/lib/browser/terminal-task-system.d.ts +2 -10
- package/lib/browser/terminal-task-system.d.ts.map +1 -1
- package/lib/browser/terminal-task-system.js +30 -69
- package/lib/browser/terminal-task-system.js.map +1 -1
- package/lib/common/index.d.ts +1 -3
- package/lib/common/index.d.ts.map +1 -1
- package/package.json +11 -11
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
import { CommandContribution, CommandRegistry, Command, JsonSchemaContribution, IJSONSchemaRegistry
|
|
2
|
-
|
|
3
|
-
export declare class TaskContribution extends WithEventBus implements CommandContribution, JsonSchemaContribution {
|
|
1
|
+
import { CommandContribution, CommandRegistry, Command, JsonSchemaContribution, IJSONSchemaRegistry } from '@opensumi/ide-core-browser';
|
|
2
|
+
export declare class TaskContribution implements CommandContribution, JsonSchemaContribution {
|
|
4
3
|
static readonly RUN_TASK_COMMAND: Command;
|
|
5
|
-
protected readonly terminalController: ITerminalController;
|
|
6
4
|
private readonly taskService;
|
|
7
|
-
handleTerminalClientAttach(event: TerminalClientAttachEvent): void;
|
|
8
5
|
registerSchema(registry: IJSONSchemaRegistry): void;
|
|
9
6
|
registerCommands(commandRegister: CommandRegistry): void;
|
|
10
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.contribution.d.ts","sourceRoot":"","sources":["../../src/browser/task.contribution.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EACnB,eAAe,EAEf,OAAO,EACP,sBAAsB,EACtB,mBAAmB,
|
|
1
|
+
{"version":3,"file":"task.contribution.d.ts","sourceRoot":"","sources":["../../src/browser/task.contribution.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EACnB,eAAe,EAEf,OAAO,EACP,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,4BAA4B,CAAC;AAMpC,qBACa,gBAAiB,YAAW,mBAAmB,EAAE,sBAAsB;IAClF,MAAM,CAAC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAIvC;IAGF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAe;IAE3C,cAAc,CAAC,QAAQ,EAAE,mBAAmB;IAI5C,gBAAgB,CAAC,eAAe,EAAE,eAAe;CAOlD"}
|
|
@@ -5,19 +5,9 @@ exports.TaskContribution = void 0;
|
|
|
5
5
|
const tslib_1 = require("tslib");
|
|
6
6
|
const di_1 = require("@opensumi/di");
|
|
7
7
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
8
|
-
const controller_1 = require("@opensumi/ide-terminal-next/lib/common/controller");
|
|
9
8
|
const common_1 = require("../common");
|
|
10
9
|
const task_schema_1 = require("./task.schema");
|
|
11
|
-
let TaskContribution = TaskContribution_1 = class TaskContribution
|
|
12
|
-
handleTerminalClientAttach(event) {
|
|
13
|
-
const client = this.terminalController.clients.get(event.payload.clientId);
|
|
14
|
-
if (!client) {
|
|
15
|
-
return;
|
|
16
|
-
}
|
|
17
|
-
if (client.isTaskExecutor && client.taskId) {
|
|
18
|
-
this.taskService.attach(client.taskId, client);
|
|
19
|
-
}
|
|
20
|
-
}
|
|
10
|
+
let TaskContribution = TaskContribution_1 = class TaskContribution {
|
|
21
11
|
registerSchema(registry) {
|
|
22
12
|
registry.registerSchema(task_schema_1.taskSchemaUri, task_schema_1.schema, ['tasks.json']);
|
|
23
13
|
}
|
|
@@ -34,20 +24,10 @@ TaskContribution.RUN_TASK_COMMAND = {
|
|
|
34
24
|
label: '运行任务',
|
|
35
25
|
category: 'Task',
|
|
36
26
|
};
|
|
37
|
-
tslib_1.__decorate([
|
|
38
|
-
(0, di_1.Autowired)(controller_1.ITerminalController),
|
|
39
|
-
tslib_1.__metadata("design:type", Object)
|
|
40
|
-
], TaskContribution.prototype, "terminalController", void 0);
|
|
41
27
|
tslib_1.__decorate([
|
|
42
28
|
(0, di_1.Autowired)(common_1.ITaskService),
|
|
43
29
|
tslib_1.__metadata("design:type", Object)
|
|
44
30
|
], TaskContribution.prototype, "taskService", void 0);
|
|
45
|
-
tslib_1.__decorate([
|
|
46
|
-
(0, ide_core_browser_1.OnEvent)(ide_core_browser_1.TerminalClientAttachEvent),
|
|
47
|
-
tslib_1.__metadata("design:type", Function),
|
|
48
|
-
tslib_1.__metadata("design:paramtypes", [ide_core_browser_1.TerminalClientAttachEvent]),
|
|
49
|
-
tslib_1.__metadata("design:returntype", void 0)
|
|
50
|
-
], TaskContribution.prototype, "handleTerminalClientAttach", null);
|
|
51
31
|
TaskContribution = TaskContribution_1 = tslib_1.__decorate([
|
|
52
32
|
(0, ide_core_browser_1.Domain)(ide_core_browser_1.CommandContribution, ide_core_browser_1.JsonSchemaContribution)
|
|
53
33
|
], TaskContribution);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.contribution.js","sourceRoot":"","sources":["../../src/browser/task.contribution.ts"],"names":[],"mappings":";;;;;AAAA,qCAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"task.contribution.js","sourceRoot":"","sources":["../../src/browser/task.contribution.ts"],"names":[],"mappings":";;;;;AAAA,qCAAyC;AACzC,iEAOoC;AAEpC,sCAAyC;AAEzC,+CAAsD;AAGtD,IAAa,gBAAgB,wBAA7B,MAAa,gBAAgB;IAU3B,cAAc,CAAC,QAA6B;QAC1C,QAAQ,CAAC,cAAc,CAAC,2BAAa,EAAE,oBAAM,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,gBAAgB,CAAC,eAAgC;QAC/C,eAAe,CAAC,eAAe,CAAC,kBAAgB,CAAC,gBAAgB,EAAE;YACjE,OAAO,EAAE,GAAG,EAAE;gBACZ,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;YACpC,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AApBiB,iCAAgB,GAAY;IAC1C,EAAE,EAAE,gCAAgC;IACpC,KAAK,EAAE,MAAM;IACb,QAAQ,EAAE,MAAM;CAChB,CAAA;AAGF;IADC,IAAA,cAAS,EAAC,qBAAY,CAAC;;qDACmB;AARhC,gBAAgB;IAD5B,IAAA,yBAAM,EAAC,sCAAmB,EAAE,yCAAsB,CAAC;GACvC,gBAAgB,CAqB5B;AArBY,4CAAgB"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Disposable, Uri, PreferenceService, IDisposable, QuickOpenService } from '@opensumi/ide-core-browser';
|
|
2
2
|
import { ITaskDefinitionRegistry, IProblemMatcherRegistry, Event, IProblemPatternRegistry } from '@opensumi/ide-core-common';
|
|
3
3
|
import { OutputService } from '@opensumi/ide-output/lib/browser/output.service';
|
|
4
|
-
import { ITerminalClient } from '@opensumi/ide-terminal-next/lib/common/client';
|
|
5
4
|
import { IWorkspaceService } from '@opensumi/ide-workspace';
|
|
6
5
|
import { ITaskService, WorkspaceFolderTaskResult, ITaskProvider, ITaskSystem, ITaskSummary } from '../common';
|
|
7
6
|
import { TaskSet, Task, TaskIdentifier, TaskEvent } from '../common/task';
|
|
@@ -21,7 +20,6 @@ export declare class TaskService extends Disposable implements ITaskService {
|
|
|
21
20
|
private providerHandler;
|
|
22
21
|
private outputChannel;
|
|
23
22
|
private _workspaceFolders;
|
|
24
|
-
private runningTasks;
|
|
25
23
|
private providers;
|
|
26
24
|
private providerTypes;
|
|
27
25
|
constructor();
|
|
@@ -29,7 +27,6 @@ export declare class TaskService extends Disposable implements ITaskService {
|
|
|
29
27
|
private tryGetWorkspaceFolders;
|
|
30
28
|
runTaskCommand(): Promise<void>;
|
|
31
29
|
run(task: Task): Promise<ITaskSummary>;
|
|
32
|
-
attach(taskId: string, terminal: ITerminalClient): Promise<void>;
|
|
33
30
|
terminateTask(taskId: string): Promise<void>;
|
|
34
31
|
getTask(workspaceFolder: Uri, identifier: string | TaskIdentifier, compareId?: boolean): Promise<Task | undefined>;
|
|
35
32
|
private runTask;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.service.d.ts","sourceRoot":"","sources":["../../src/browser/task.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,GAAG,EACH,iBAAiB,EAEjB,WAAW,EAEX,gBAAgB,EAMjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,uBAAuB,EACvB,uBAAuB,EACvB,KAAK,EACL,uBAAuB,
|
|
1
|
+
{"version":3,"file":"task.service.d.ts","sourceRoot":"","sources":["../../src/browser/task.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,GAAG,EACH,iBAAiB,EAEjB,WAAW,EAEX,gBAAgB,EAMjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,uBAAuB,EACvB,uBAAuB,EACvB,KAAK,EACL,uBAAuB,EAExB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,yBAAyB,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9G,OAAO,EAEL,OAAO,EACP,IAAI,EAGJ,cAAc,EAEd,SAAS,EACV,MAAM,gBAAgB,CAAC;AAsCxB,qBACa,WAAY,SAAQ,UAAW,YAAW,YAAY;IAEjE,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC;IAG3C,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,uBAAuB,CAAC;IAGnE,cAAc,EAAE,uBAAuB,CAAC;IAGxC,cAAc,EAAE,uBAAuB,CAAC;IAExC,OAAO,CAAC,iBAAiB,CAAqC;IACvD,gBAAgB,EAAE,KAAK,CAAC,SAAS,CAAC,CAAgC;IAEzE,OAAO,CAAC,0BAA0B,CAAkC;IAC7D,yBAAyB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAyC;IAExF,OAAO,CAAC,eAAe,CAAK;IAE5B,OAAO,CAAC,aAAa,CAAgB;IAErC,OAAO,CAAC,iBAAiB,CAAQ;IAEjC,OAAO,CAAC,SAAS,CAA6B;IAC9C,OAAO,CAAC,aAAa,CAAsB;;IAe3C,OAAO,KAAK,gBAAgB,GAK3B;IAED,OAAO,CAAC,sBAAsB;IAIjB,cAAc;IAYpB,GAAG,CAAC,IAAI,EAAE,IAAI;IAIR,aAAa,CAAC,MAAM,EAAE,MAAM;IASlC,OAAO,CACZ,eAAe,EAAE,GAAG,EACpB,UAAU,EAAE,MAAM,GAAG,cAAc,EACnC,SAAS,UAAQ,GAChB,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;YA+Bd,OAAO;IAQR,KAAK,CAAC,MAAM,KAAA,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;YAc7B,wBAAwB;YAmBxB,eAAe;IAe7B,OAAO,CAAC,eAAe,CAclB;IAEL,OAAO,CAAC,oBAAoB;IAW5B,OAAO,CAAC,iBAAiB;YAsDX,iBAAiB;IAMxB,oBAAoB,CAAC,cAAc,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,GAAG,SAAS,CAAC;IAmBnH,OAAO,CAAC,2BAA2B;IAwEnC,SAAS,CAAC,UAAU,IAAI,IAAI;IAIrB,oBAAoB,CAAC,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW;CAahF"}
|
|
@@ -45,7 +45,6 @@ let TaskService = class TaskService extends ide_core_browser_1.Disposable {
|
|
|
45
45
|
this._onDidRegisterTaskProvider = new ide_core_common_1.Emitter();
|
|
46
46
|
this.onDidRegisterTaskProvider = this._onDidRegisterTaskProvider.event;
|
|
47
47
|
this.providerHandler = 0;
|
|
48
|
-
this.runningTasks = new Map();
|
|
49
48
|
this.toQuickOpenItem = (task) => {
|
|
50
49
|
var _a;
|
|
51
50
|
return new ide_core_browser_1.QuickOpenItem({
|
|
@@ -92,35 +91,6 @@ let TaskService = class TaskService extends ide_core_browser_1.Disposable {
|
|
|
92
91
|
run(task) {
|
|
93
92
|
return this.runTask(task);
|
|
94
93
|
}
|
|
95
|
-
async attach(taskId, terminal) {
|
|
96
|
-
if (this.runningTasks.has(taskId)) {
|
|
97
|
-
return;
|
|
98
|
-
}
|
|
99
|
-
const [, , , taskType] = taskId.split(',');
|
|
100
|
-
if (!taskType) {
|
|
101
|
-
return;
|
|
102
|
-
}
|
|
103
|
-
if (this.providerTypes.has(taskType)) {
|
|
104
|
-
const task = await this.getTask(this.workspaceFolders[0], taskId);
|
|
105
|
-
if (task) {
|
|
106
|
-
this.taskSystem.attach(task, terminal);
|
|
107
|
-
this.runningTasks.set(taskId, task);
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
else {
|
|
111
|
-
// wait for task provider to be registered
|
|
112
|
-
const disposable = this._onDidRegisterTaskProvider.event(async (e) => {
|
|
113
|
-
if (e === taskType) {
|
|
114
|
-
const task = await this.getTask(this.workspaceFolders[0], taskId);
|
|
115
|
-
if (task) {
|
|
116
|
-
this.taskSystem.attach(task, terminal);
|
|
117
|
-
this.runningTasks.set(taskId, task);
|
|
118
|
-
disposable.dispose();
|
|
119
|
-
}
|
|
120
|
-
}
|
|
121
|
-
});
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
94
|
async terminateTask(taskId) {
|
|
125
95
|
const activeTasks = this.taskSystem.getActiveTasks();
|
|
126
96
|
for (const t of activeTasks) {
|
|
@@ -160,12 +130,8 @@ let TaskService = class TaskService extends ide_core_browser_1.Disposable {
|
|
|
160
130
|
async runTask(task) {
|
|
161
131
|
const result = await this.taskSystem.run(task);
|
|
162
132
|
result.promise.then((res) => {
|
|
163
|
-
if (this.runningTasks.has(task._id)) {
|
|
164
|
-
this.runningTasks.delete(task._id);
|
|
165
|
-
}
|
|
166
133
|
this.outputChannel.appendLine(`task ${task._label} done, exit code ${res.exitCode}`);
|
|
167
134
|
});
|
|
168
|
-
this.runningTasks.set(task._id, task);
|
|
169
135
|
return Promise.resolve(result.promise);
|
|
170
136
|
}
|
|
171
137
|
async tasks(filter) {
|
|
@@ -366,12 +332,12 @@ let TaskService = class TaskService extends ide_core_browser_1.Disposable {
|
|
|
366
332
|
registerTaskProvider(provider, type) {
|
|
367
333
|
const handler = (this.providerHandler += 1);
|
|
368
334
|
this.providers.set(handler, provider);
|
|
369
|
-
this.providerTypes.set(
|
|
335
|
+
this.providerTypes.set(handler, type);
|
|
370
336
|
this._onDidRegisterTaskProvider.fire(type);
|
|
371
337
|
return {
|
|
372
338
|
dispose: () => {
|
|
373
339
|
this.providers.delete(handler);
|
|
374
|
-
this.providerTypes.delete(
|
|
340
|
+
this.providerTypes.delete(handler);
|
|
375
341
|
},
|
|
376
342
|
};
|
|
377
343
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.service.js","sourceRoot":"","sources":["../../src/browser/task.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"task.service.js","sourceRoot":"","sources":["../../src/browser/task.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Event, IProblemMatcherRegistry, Disposable, Deferred, ProblemMatch } from '@opensumi/ide-core-common';
|
|
2
|
-
import { TerminalOptions, ITerminalController, ITerminalGroupViewService,
|
|
2
|
+
import { TerminalOptions, ITerminalController, ITerminalGroupViewService, ITerminalService } from '@opensumi/ide-terminal-next/lib/common';
|
|
3
3
|
import { IVariableResolverService } from '@opensumi/ide-variable';
|
|
4
4
|
import { ITaskSystem, ITaskExecuteResult, ITaskExecutor, TaskTerminateResponse } from '../common';
|
|
5
5
|
import { Task, ContributedTask, TaskEvent } from '../common/task';
|
|
@@ -12,7 +12,6 @@ declare enum TaskStatus {
|
|
|
12
12
|
PROCESS_EXITED = 3
|
|
13
13
|
}
|
|
14
14
|
export declare class TerminalTaskExecutor extends Disposable implements ITaskExecutor {
|
|
15
|
-
private task;
|
|
16
15
|
private terminalOptions;
|
|
17
16
|
private collector;
|
|
18
17
|
executorId: number;
|
|
@@ -38,16 +37,12 @@ export declare class TerminalTaskExecutor extends Disposable implements ITaskExe
|
|
|
38
37
|
private processExited;
|
|
39
38
|
private disposableCollection;
|
|
40
39
|
taskStatus: TaskStatus;
|
|
41
|
-
constructor(
|
|
40
|
+
constructor(terminalOptions: TerminalOptions, collector: ProblemCollector, executorId: number);
|
|
42
41
|
terminate(): Promise<{
|
|
43
42
|
success: boolean;
|
|
44
43
|
}>;
|
|
45
44
|
private onTaskExit;
|
|
46
|
-
private bindTerminalClientEvent;
|
|
47
45
|
private createTerminal;
|
|
48
|
-
attach(terminalClient: ITerminalClient): Promise<{
|
|
49
|
-
exitCode?: number;
|
|
50
|
-
}>;
|
|
51
46
|
execute(task: Task, reuse?: boolean): Promise<{
|
|
52
47
|
exitCode?: number;
|
|
53
48
|
}>;
|
|
@@ -75,11 +70,8 @@ export declare class TerminalTaskSystem extends Disposable implements ITaskSyste
|
|
|
75
70
|
onDidBackgroundTaskEnded: Event<TaskEvent>;
|
|
76
71
|
onDidProblemMatched: Event<TaskEvent>;
|
|
77
72
|
run(task: CustomTask | ContributedTask): Promise<ITaskExecuteResult>;
|
|
78
|
-
attach(task: CustomTask | ContributedTask, terminalClient: ITerminalClient): Promise<ITaskExecuteResult>;
|
|
79
73
|
private buildShellConfig;
|
|
80
74
|
private findAvailableExecutor;
|
|
81
|
-
private createTaskExecutor;
|
|
82
|
-
private attachTask;
|
|
83
75
|
private executeTask;
|
|
84
76
|
private createTerminalName;
|
|
85
77
|
private resolveVariables;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-task-system.d.ts","sourceRoot":"","sources":["../../src/browser/terminal-task-system.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,EAEL,uBAAuB,EACvB,UAAU,EACV,QAAQ,EAOR,YAAY,EAEb,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,yBAAyB,
|
|
1
|
+
{"version":3,"file":"terminal-task-system.d.ts","sourceRoot":"","sources":["../../src/browser/terminal-task-system.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,9 +34,8 @@ function problemAreEquals(a, b) {
|
|
|
34
34
|
rangeAreEqual(a.marker.range, b.marker.range));
|
|
35
35
|
}
|
|
36
36
|
let TerminalTaskExecutor = class TerminalTaskExecutor extends ide_core_common_1.Disposable {
|
|
37
|
-
constructor(
|
|
37
|
+
constructor(terminalOptions, collector, executorId) {
|
|
38
38
|
super();
|
|
39
|
-
this.task = task;
|
|
40
39
|
this.terminalOptions = terminalOptions;
|
|
41
40
|
this.collector = collector;
|
|
42
41
|
this.executorId = executorId;
|
|
@@ -97,9 +96,22 @@ let TerminalTaskExecutor = class TerminalTaskExecutor extends ide_core_common_1.
|
|
|
97
96
|
this.terminalView.removeWidget(id);
|
|
98
97
|
}));
|
|
99
98
|
}
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
99
|
+
async createTerminal(reuse) {
|
|
100
|
+
if (reuse && this.terminalClient) {
|
|
101
|
+
this.terminalClient.updateOptions(this.terminalOptions);
|
|
102
|
+
this.terminalClient.reset();
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
this.terminalClient = await this.terminalController.createClientWithWidget2({
|
|
106
|
+
terminalOptions: this.terminalOptions,
|
|
107
|
+
closeWhenExited: false,
|
|
108
|
+
beforeCreate: (terminalId) => {
|
|
109
|
+
this._onDidTerminalCreated.fire(terminalId);
|
|
110
|
+
},
|
|
111
|
+
});
|
|
112
|
+
}
|
|
113
|
+
this.terminalController.showTerminalPanel();
|
|
114
|
+
this.addDispose(this.terminalClient.onOutput((e) => {
|
|
103
115
|
const output = (0, ide_core_common_1.removeAnsiEscapeCodes)(e.data.toString());
|
|
104
116
|
const isBegin = this.collector.matchBeginMatcher(output);
|
|
105
117
|
if (isBegin) {
|
|
@@ -126,8 +138,8 @@ let TerminalTaskExecutor = class TerminalTaskExecutor extends ide_core_common_1.
|
|
|
126
138
|
if (isEnd) {
|
|
127
139
|
this._onDidBackgroundTaskEnd.fire();
|
|
128
140
|
}
|
|
129
|
-
}))
|
|
130
|
-
this.disposableCollection.push(
|
|
141
|
+
}));
|
|
142
|
+
this.disposableCollection.push(this.terminalClient.onExit(async (e) => {
|
|
131
143
|
var _a;
|
|
132
144
|
if (e.id === ((_a = this.terminalClient) === null || _a === void 0 ? void 0 : _a.id)) {
|
|
133
145
|
this.onTaskExit(e.code);
|
|
@@ -135,7 +147,7 @@ let TerminalTaskExecutor = class TerminalTaskExecutor extends ide_core_common_1.
|
|
|
135
147
|
this.taskStatus = TaskStatus.PROCESS_EXITED;
|
|
136
148
|
this.exitDefer.resolve({ exitCode: e.code });
|
|
137
149
|
}
|
|
138
|
-
}))
|
|
150
|
+
}));
|
|
139
151
|
this.disposableCollection.push(this.terminalService.onExit(async (e) => {
|
|
140
152
|
var _a;
|
|
141
153
|
if (e.sessionId === ((_a = this.terminalClient) === null || _a === void 0 ? void 0 : _a.id)) {
|
|
@@ -147,46 +159,15 @@ let TerminalTaskExecutor = class TerminalTaskExecutor extends ide_core_common_1.
|
|
|
147
159
|
}
|
|
148
160
|
}));
|
|
149
161
|
}
|
|
150
|
-
async createTerminal(reuse) {
|
|
151
|
-
if (reuse && this.terminalClient) {
|
|
152
|
-
this.terminalClient.updateOptions(this.terminalOptions);
|
|
153
|
-
this.terminalClient.reset();
|
|
154
|
-
}
|
|
155
|
-
else {
|
|
156
|
-
this.terminalClient = await this.terminalController.createClientWithWidget2({
|
|
157
|
-
terminalOptions: this.terminalOptions,
|
|
158
|
-
closeWhenExited: false,
|
|
159
|
-
isTaskExecutor: true,
|
|
160
|
-
taskId: this.task._id,
|
|
161
|
-
beforeCreate: (terminalId) => {
|
|
162
|
-
this._onDidTerminalCreated.fire(terminalId);
|
|
163
|
-
},
|
|
164
|
-
});
|
|
165
|
-
}
|
|
166
|
-
this.terminalController.showTerminalPanel();
|
|
167
|
-
this.bindTerminalClientEvent();
|
|
168
|
-
}
|
|
169
|
-
async attach(terminalClient) {
|
|
170
|
-
var _a;
|
|
171
|
-
this.taskStatus = TaskStatus.PROCESS_READY;
|
|
172
|
-
this.terminalClient = terminalClient;
|
|
173
|
-
this.terminalOptions = terminalClient.options;
|
|
174
|
-
this.bindTerminalClientEvent();
|
|
175
|
-
this.taskStatus = TaskStatus.PROCESS_RUNNING;
|
|
176
|
-
this.pid = await ((_a = this.terminalClient) === null || _a === void 0 ? void 0 : _a.pid);
|
|
177
|
-
this.processReady.resolve();
|
|
178
|
-
this._onDidTerminalCreated.fire(terminalClient.id);
|
|
179
|
-
return this.exitDefer.promise;
|
|
180
|
-
}
|
|
181
162
|
async execute(task, reuse) {
|
|
182
163
|
var _a, _b, _c, _d, _e;
|
|
183
164
|
this.taskStatus = TaskStatus.PROCESS_READY;
|
|
184
165
|
await this.createTerminal(reuse);
|
|
185
|
-
(_a = this.terminalClient) === null || _a === void 0 ? void 0 : _a.term.writeln(`\x1b[
|
|
166
|
+
(_a = this.terminalClient) === null || _a === void 0 ? void 0 : _a.term.writeln(`\x1b[1m> Executing task: ${task._label} <\x1b[0m\n`);
|
|
186
167
|
const { shellArgs } = this.terminalOptions;
|
|
187
168
|
// extensionTerminal 由插件自身接管,不需要执行和输出 Command
|
|
188
169
|
if (!this.terminalOptions.isExtensionTerminal && shellArgs) {
|
|
189
|
-
(_b = this.terminalClient) === null || _b === void 0 ? void 0 : _b.term.writeln(`\x1b[
|
|
170
|
+
(_b = this.terminalClient) === null || _b === void 0 ? void 0 : _b.term.writeln(`\x1b[1m> Command: ${typeof shellArgs === 'string' ? shellArgs : shellArgs[1]} <\x1b[0m\n`);
|
|
190
171
|
}
|
|
191
172
|
await ((_c = this.terminalClient) === null || _c === void 0 ? void 0 : _c.attached.promise);
|
|
192
173
|
this.taskStatus = TaskStatus.PROCESS_RUNNING;
|
|
@@ -231,7 +212,7 @@ tslib_1.__decorate([
|
|
|
231
212
|
], TerminalTaskExecutor.prototype, "terminalService", void 0);
|
|
232
213
|
TerminalTaskExecutor = tslib_1.__decorate([
|
|
233
214
|
(0, di_1.Injectable)({ multiple: true }),
|
|
234
|
-
tslib_1.__metadata("design:paramtypes", [Object,
|
|
215
|
+
tslib_1.__metadata("design:paramtypes", [Object, problem_collector_1.ProblemCollector, Number])
|
|
235
216
|
], TerminalTaskExecutor);
|
|
236
217
|
exports.TerminalTaskExecutor = TerminalTaskExecutor;
|
|
237
218
|
let TerminalTaskSystem = class TerminalTaskSystem extends ide_core_common_1.Disposable {
|
|
@@ -253,10 +234,6 @@ let TerminalTaskSystem = class TerminalTaskSystem extends ide_core_common_1.Disp
|
|
|
253
234
|
this.currentTask = task;
|
|
254
235
|
return this.executeTask(task);
|
|
255
236
|
}
|
|
256
|
-
attach(task, terminalClient) {
|
|
257
|
-
this.currentTask = task;
|
|
258
|
-
return this.attachTask(task, terminalClient);
|
|
259
|
-
}
|
|
260
237
|
async buildShellConfig(command) {
|
|
261
238
|
let subCommand = '';
|
|
262
239
|
const commandName = command.name;
|
|
@@ -295,26 +272,6 @@ let TerminalTaskSystem = class TerminalTaskSystem extends ide_core_common_1.Disp
|
|
|
295
272
|
findAvailableExecutor() {
|
|
296
273
|
return this.taskExecutors.find((e) => e.taskStatus === TaskStatus.PROCESS_EXITED);
|
|
297
274
|
}
|
|
298
|
-
async createTaskExecutor(task, options) {
|
|
299
|
-
const matchers = await this.resolveMatchers(task.configurationProperties.problemMatchers);
|
|
300
|
-
const collector = new problem_collector_1.ProblemCollector(matchers);
|
|
301
|
-
const executor = this.injector.get(TerminalTaskExecutor, [task, options, collector, this.executorId]);
|
|
302
|
-
this.executorId += 1;
|
|
303
|
-
this.taskExecutors.push(executor);
|
|
304
|
-
this.addDispose(executor.onDidTerminalWidgetRemove(() => {
|
|
305
|
-
this.taskExecutors = this.taskExecutors.filter((t) => t.executorId !== executor.executorId);
|
|
306
|
-
}));
|
|
307
|
-
return executor;
|
|
308
|
-
}
|
|
309
|
-
async attachTask(task, terminalClient) {
|
|
310
|
-
const taskExecutor = await this.createTaskExecutor(task, terminalClient.options);
|
|
311
|
-
const p = taskExecutor.attach(terminalClient);
|
|
312
|
-
return {
|
|
313
|
-
task,
|
|
314
|
-
kind: 1 /* Started */,
|
|
315
|
-
promise: p,
|
|
316
|
-
};
|
|
317
|
-
}
|
|
318
275
|
async executeTask(task) {
|
|
319
276
|
var _a, _b, _c;
|
|
320
277
|
// CustomExecution
|
|
@@ -334,7 +291,12 @@ let TerminalTaskSystem = class TerminalTaskSystem extends ide_core_common_1.Disp
|
|
|
334
291
|
let executor = this.findAvailableExecutor();
|
|
335
292
|
let reuse = false;
|
|
336
293
|
if (!executor) {
|
|
337
|
-
executor =
|
|
294
|
+
executor = this.injector.get(TerminalTaskExecutor, [terminalOptions, collector, this.executorId]);
|
|
295
|
+
this.executorId += 1;
|
|
296
|
+
this.taskExecutors.push(executor);
|
|
297
|
+
this.addDispose(executor.onDidTerminalWidgetRemove(() => {
|
|
298
|
+
this.taskExecutors = this.taskExecutors.filter((t) => t.executorId !== executor.executorId);
|
|
299
|
+
}));
|
|
338
300
|
}
|
|
339
301
|
else {
|
|
340
302
|
reuse = true;
|
|
@@ -349,8 +311,7 @@ let TerminalTaskSystem = class TerminalTaskSystem extends ide_core_common_1.Disp
|
|
|
349
311
|
}
|
|
350
312
|
else {
|
|
351
313
|
this.addDispose(executor.onDidTerminalCreated((terminalId) => {
|
|
352
|
-
// 当 task 使用 CustomExecution 时,发出 TaskEventKind.Start
|
|
353
|
-
// 插件进程将尝试 attach 这个 Pseudoterminal (ext.host.task.ts#$onDidStartTask)
|
|
314
|
+
// 当 task 使用 CustomExecution 时,发出 TaskEventKind.Start 事件后,插件进程将尝试 attach 这个 Pseudoterminal (ext.host.task.ts#$onDidStartTask)
|
|
354
315
|
// attach 成功便会创建一个 ExtensionTerminal 实例
|
|
355
316
|
// 确保后续调用 $startExtensionTerminal 时已经建立了连接
|
|
356
317
|
this._onDidStateChange.fire(task_1.TaskEvent.create("start" /* Start */, task, terminalId));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-task-system.js","sourceRoot":"","sources":["../../src/browser/terminal-task-system.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"terminal-task-system.js","sourceRoot":"","sources":["../../src/browser/terminal-task-system.ts"],"names":[],"mappings":"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"}
|
package/lib/common/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { IJSONSchemaMap } from '@opensumi/ide-core-browser';
|
|
2
2
|
import { IDisposable, Event, URI, TaskIdentifier, Uri, Deferred } from '@opensumi/ide-core-common';
|
|
3
3
|
import { UriComponents } from '@opensumi/ide-editor';
|
|
4
|
-
import {
|
|
4
|
+
import { TerminalOptions } from '@opensumi/ide-terminal-next/lib/common';
|
|
5
5
|
import type { ProblemCollector } from '../browser/problem-collector';
|
|
6
6
|
import { Task, ConfiguringTask, ContributedTask, TaskSet, KeyedTaskIdentifier, TaskEvent } from './task';
|
|
7
7
|
interface TaskMap {
|
|
@@ -106,7 +106,6 @@ export interface ITaskSystem {
|
|
|
106
106
|
onDidBackgroundTaskBegin: Event<TaskEvent>;
|
|
107
107
|
onDidBackgroundTaskEnded: Event<TaskEvent>;
|
|
108
108
|
onDidProblemMatched: Event<TaskEvent>;
|
|
109
|
-
attach(task: Task | ConfiguringTask, terminalClient: ITerminalClient): Promise<ITaskExecuteResult>;
|
|
110
109
|
run(task: Task | ConfiguringTask): Promise<ITaskExecuteResult>;
|
|
111
110
|
rerun(): ITaskExecuteResult | undefined;
|
|
112
111
|
isActive(): Promise<boolean>;
|
|
@@ -120,7 +119,6 @@ export interface ITaskSystem {
|
|
|
120
119
|
customExecutionComplete(task: Task, result: number): Promise<void>;
|
|
121
120
|
}
|
|
122
121
|
export interface ITaskService {
|
|
123
|
-
attach(taskId: string, terminal: ITerminalClient): Promise<void>;
|
|
124
122
|
run(task: Task | ConfiguringTask): Promise<ITaskSummary>;
|
|
125
123
|
runTaskCommand(): void;
|
|
126
124
|
updateWorkspaceTasks(tasks: TaskMap): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACnG,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-task",
|
|
3
|
-
"version": "2.16.
|
|
3
|
+
"version": "2.16.8",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib"
|
|
6
6
|
],
|
|
@@ -16,18 +16,18 @@
|
|
|
16
16
|
"url": "git@github.com:opensumi/core.git"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@opensumi/ide-core-common": "2.16.
|
|
20
|
-
"@opensumi/ide-core-node": "2.16.
|
|
21
|
-
"@opensumi/ide-terminal-next": "2.16.
|
|
19
|
+
"@opensumi/ide-core-common": "2.16.8",
|
|
20
|
+
"@opensumi/ide-core-node": "2.16.8",
|
|
21
|
+
"@opensumi/ide-terminal-next": "2.16.8"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
|
-
"@opensumi/ide-core-browser": "2.16.
|
|
24
|
+
"@opensumi/ide-core-browser": "2.16.8",
|
|
25
25
|
"@opensumi/ide-dev-tool": "^1.3.1",
|
|
26
|
-
"@opensumi/ide-editor": "2.16.
|
|
27
|
-
"@opensumi/ide-output": "2.16.
|
|
28
|
-
"@opensumi/ide-preferences": "2.16.
|
|
29
|
-
"@opensumi/ide-variable": "2.16.
|
|
30
|
-
"@opensumi/ide-workspace": "2.16.
|
|
26
|
+
"@opensumi/ide-editor": "2.16.8",
|
|
27
|
+
"@opensumi/ide-output": "2.16.8",
|
|
28
|
+
"@opensumi/ide-preferences": "2.16.8",
|
|
29
|
+
"@opensumi/ide-variable": "2.16.8",
|
|
30
|
+
"@opensumi/ide-workspace": "2.16.8"
|
|
31
31
|
},
|
|
32
|
-
"gitHead": "
|
|
32
|
+
"gitHead": "9642e53e1dc3cd2e8fc2af418f33e532a2c7475c"
|
|
33
33
|
}
|