@opensumi/ide-task 2.19.13 → 2.20.1

package/lib/browser/task-executor.d.ts

@@ -0,0 +1,67 @@
+import { Event, Disposable, Deferred, ProblemMatch } from '@opensumi/ide-core-common';
+import { ITerminalController, ITerminalGroupViewService, ITerminalClient, ITerminalService, IShellLaunchConfig } from '@opensumi/ide-terminal-next/lib/common';
+import { ITaskExecutor } from '../common';
+import { Task } from '../common/task';
+import { ProblemCollector } from './problem-collector';
+export declare enum TaskStatus {
+    PROCESS_INIT = 0,
+    PROCESS_READY = 1,
+    PROCESS_RUNNING = 2,
+    PROCESS_EXITED = 3
+}
+export declare class TerminalTaskExecutor extends Disposable implements ITaskExecutor {
+    private task;
+    private shellLaunchConfig;
+    private collector;
+    executorId: number;
+    protected readonly terminalView: ITerminalGroupViewService;
+    protected readonly terminalController: ITerminalController;
+    protected readonly terminalService: ITerminalService;
+    private _terminalClient;
+    get terminalClient(): ITerminalClient | undefined;
+    set terminalClient(v: ITerminalClient | undefined);
+    private pid;
+    private exitDefer;
+    private _onDidTerminalCreated;
+    onDidTerminalCreated: Event<string>;
+    private _onDidTaskProcessExit;
+    onDidTaskProcessExit: Event<number | undefined>;
+    private _onDidBackgroundTaskBegin;
+    onDidBackgroundTaskBegin: Event<void>;
+    private _onDidBackgroundTaskEnd;
+    onDidBackgroundTaskEnd: Event<void>;
+    private _onDidProblemMatched;
+    onDidProblemMatched: Event<ProblemMatch[]>;
+    private _onDidTerminalWidgetRemove;
+    onDidTerminalWidgetRemove: Event<void>;
+    processReady: Deferred<void>;
+    private processExited;
+    private eventToDispose;
+    resetEventDispose(): void;
+    taskStatus: TaskStatus;
+    constructor(task: Task, shellLaunchConfig: IShellLaunchConfig, collector: ProblemCollector, executorId: number);
+    terminate(): Promise<{
+        success: boolean;
+    }>;
+    private handleTaskExit;
+    /**
+     * 监听 Terminal 的相关事件，一个 Executor 仅需监听一次即可，否则多次监听会导致输出重复内容。
+     * 仅需要在 createTerminal 中设置一次监听即可
+     * 注意里面的 event 用完要及时 dispose
+     */
+    private bindTerminalClientEvent;
+    private createTerminal;
+    attach(terminalClient: ITerminalClient): Promise<{
+        exitCode?: number;
+    }>;
+    execute(task: Task, reuse?: boolean): Promise<{
+        exitCode?: number;
+    }>;
+    get processId(): number | undefined;
+    get terminalId(): string | undefined;
+    get widgetId(): string | undefined;
+    updateLaunchConfig(launchConfig: IShellLaunchConfig): void;
+    updateProblemCollector(collector: ProblemCollector): void;
+    reset(): void;
+}
+//# sourceMappingURL=task-executor.d.ts.map

package/lib/browser/task-executor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"task-executor.d.ts","sourceRoot":"","sources":["../../src/browser/task-executor.ts"],"names":[],"mappings":"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"}

package/lib/browser/task-executor.js

@@ -0,0 +1,246 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TerminalTaskExecutor = exports.TaskStatus = void 0;
+const tslib_1 = require("tslib");
+const di_1 = require("@opensumi/di");
+const ide_core_common_1 = require("@opensumi/ide-core-common");
+const common_1 = require("@opensumi/ide-terminal-next/lib/common");
+const problem_collector_1 = require("./problem-collector");
+const { removeAnsiEscapeCodes } = ide_core_common_1.strings;
+var TaskStatus;
+(function (TaskStatus) {
+    TaskStatus[TaskStatus["PROCESS_INIT"] = 0] = "PROCESS_INIT";
+    TaskStatus[TaskStatus["PROCESS_READY"] = 1] = "PROCESS_READY";
+    TaskStatus[TaskStatus["PROCESS_RUNNING"] = 2] = "PROCESS_RUNNING";
+    TaskStatus[TaskStatus["PROCESS_EXITED"] = 3] = "PROCESS_EXITED";
+})(TaskStatus = exports.TaskStatus || (exports.TaskStatus = {}));
+function rangeAreEqual(a, b) {
+    return (a.start.line === b.start.line &&
+        a.start.character === b.start.character &&
+        a.end.line === b.end.line &&
+        a.end.character === b.end.character);
+}
+function problemAreEquals(a, b) {
+    var _a, _b;
+    return (((_a = a.resource) === null || _a === void 0 ? void 0 : _a.toString()) === ((_b = b.resource) === null || _b === void 0 ? void 0 : _b.toString()) &&
+        a.description.owner === b.description.owner &&
+        a.description.severity === b.description.severity &&
+        a.description.source === b.description.source &&
+        (a === null || a === void 0 ? void 0 : a.marker.code) === (b === null || b === void 0 ? void 0 : b.marker.code) &&
+        (a === null || a === void 0 ? void 0 : a.marker.message) === (b === null || b === void 0 ? void 0 : b.marker.message) &&
+        (a === null || a === void 0 ? void 0 : a.marker.source) === (b === null || b === void 0 ? void 0 : b.marker.source) &&
+        rangeAreEqual(a.marker.range, b.marker.range));
+}
+let TerminalTaskExecutor = class TerminalTaskExecutor extends ide_core_common_1.Disposable {
+    constructor(task, shellLaunchConfig, collector, executorId) {
+        super();
+        this.task = task;
+        this.shellLaunchConfig = shellLaunchConfig;
+        this.collector = collector;
+        this.executorId = executorId;
+        this.exitDefer = new ide_core_common_1.Deferred();
+        this._onDidTerminalCreated = new ide_core_common_1.Emitter();
+        this.onDidTerminalCreated = this._onDidTerminalCreated.event;
+        this._onDidTaskProcessExit = new ide_core_common_1.Emitter();
+        this.onDidTaskProcessExit = this._onDidTaskProcessExit.event;
+        this._onDidBackgroundTaskBegin = new ide_core_common_1.Emitter();
+        this.onDidBackgroundTaskBegin = this._onDidBackgroundTaskBegin.event;
+        this._onDidBackgroundTaskEnd = new ide_core_common_1.Emitter();
+        this.onDidBackgroundTaskEnd = this._onDidBackgroundTaskEnd.event;
+        this._onDidProblemMatched = new ide_core_common_1.Emitter();
+        this.onDidProblemMatched = this._onDidProblemMatched.event;
+        this._onDidTerminalWidgetRemove = new ide_core_common_1.Emitter();
+        this.onDidTerminalWidgetRemove = this._onDidTerminalWidgetRemove.event;
+        this.processReady = new ide_core_common_1.Deferred();
+        this.processExited = false;
+        this.eventToDispose = new ide_core_common_1.DisposableCollection();
+        this.taskStatus = TaskStatus.PROCESS_INIT;
+        this.addDispose(this.terminalView.onWidgetDisposed((e) => {
+            if (this.terminalClient && e.id === this.terminalClient.id) {
+                this._onDidTerminalWidgetRemove.fire();
+            }
+        }));
+    }
+    get terminalClient() {
+        return this._terminalClient;
+    }
+    set terminalClient(v) {
+        // 重新赋值之前，先清除之前的事件绑定，否则给 this.terminalClient 赋值之后就无法清除以前的事件监听了。
+        this.resetEventDispose();
+        this._terminalClient = v;
+    }
+    resetEventDispose() {
+        this.eventToDispose.dispose();
+    }
+    terminate() {
+        return new Promise((resolve) => {
+            if (this.terminalClient) {
+                this.terminalClient.dispose();
+                if (this.processExited) {
+                    // 如果在调 terminate 之前进程已经退出，直接删掉 terminalWidget 即可
+                    this.terminalView.removeWidget(this.terminalClient.id);
+                    resolve({ success: true });
+                }
+                else {
+                    this.terminalService.onExit((e) => {
+                        var _a;
+                        if (e.sessionId === ((_a = this.terminalClient) === null || _a === void 0 ? void 0 : _a.id)) {
+                            this.terminalView.removeWidget(this.terminalClient.id);
+                            resolve({ success: true });
+                        }
+                    });
+                }
+            }
+            else {
+                resolve({ success: true });
+            }
+        });
+    }
+    handleTaskExit(code) {
+        if (!this.terminalClient) {
+            return;
+        }
+        const { id, term } = this.terminalClient;
+        term.options.disableStdin = true;
+        term.writeln(`\r\n${(0, ide_core_common_1.formatLocalize)('terminal.integrated.exitedWithCode', code)}`);
+        term.writeln(`\r\n\x1b[1m${(0, ide_core_common_1.formatLocalize)('reuseTerminal')}\x1b[0m\r\n`);
+        this._onDidTaskProcessExit.fire(code);
+        // 按任意键退出
+        this.eventToDispose.push(ide_core_common_1.Event.once(term.onKey)(() => {
+            id && this.terminalView.removeWidget(id);
+        }));
+    }
+    /**
+     * 监听 Terminal 的相关事件，一个 Executor 仅需监听一次即可，否则多次监听会导致输出重复内容。
+     * 仅需要在 createTerminal 中设置一次监听即可
+     * 注意里面的 event 用完要及时 dispose
+     */
+    bindTerminalClientEvent() {
+        if (!this.terminalClient) {
+            return;
+        }
+        this.resetEventDispose();
+        this.eventToDispose.push(this.terminalClient.onOutput((e) => {
+            const output = removeAnsiEscapeCodes(e.data.toString());
+            const isBegin = this.collector.matchBeginMatcher(output);
+            if (isBegin) {
+                this._onDidBackgroundTaskBegin.fire();
+            }
+            // process multi-line output
+            const lines = output.split(/\r?\n/g).filter((e) => e);
+            const markerResults = [];
+            for (const l of lines) {
+                const markers = this.collector.processLine(l);
+                if (markers && markers.length > 0) {
+                    for (const marker of markers) {
+                        const existing = markerResults.findIndex((e) => problemAreEquals(e, marker));
+                        if (existing === -1) {
+                            markerResults.push(marker);
+                        }
+                    }
+                }
+            }
+            if (markerResults.length > 0) {
+                this._onDidProblemMatched.fire(markerResults);
+            }
+            const isEnd = this.collector.matchEndMatcher(output);
+            if (isEnd) {
+                this._onDidBackgroundTaskEnd.fire();
+            }
+        }));
+        this.eventToDispose.push(ide_core_common_1.Event.once(this.terminalClient.onExit)(async (e) => {
+            var _a;
+            if (e.id === ((_a = this.terminalClient) === null || _a === void 0 ? void 0 : _a.id) && this.taskStatus !== TaskStatus.PROCESS_EXITED) {
+                this.taskStatus = TaskStatus.PROCESS_EXITED;
+                this.handleTaskExit(e.code);
+                this.processExited = true;
+                this.exitDefer.resolve({ exitCode: e.code });
+            }
+        }));
+    }
+    async createTerminal(reuse) {
+        if (reuse && this.terminalClient) {
+            this.terminalClient.updateLaunchConfig(this.shellLaunchConfig);
+            this.terminalClient.reset();
+        }
+        else {
+            this.terminalClient = await this.terminalController.createTerminalWithWidget({
+                config: this.shellLaunchConfig,
+                closeWhenExited: false,
+                isTaskExecutor: true,
+                taskId: this.task._id,
+                beforeCreate: (terminalId) => {
+                    this._onDidTerminalCreated.fire(terminalId);
+                },
+            });
+        }
+        this.bindTerminalClientEvent();
+        this.terminalController.showTerminalPanel();
+    }
+    async attach(terminalClient) {
+        var _a;
+        this.taskStatus = TaskStatus.PROCESS_READY;
+        this.terminalClient = terminalClient;
+        this.shellLaunchConfig = terminalClient.launchConfig;
+        this.taskStatus = TaskStatus.PROCESS_RUNNING;
+        this.pid = await ((_a = this.terminalClient) === null || _a === void 0 ? void 0 : _a.pid);
+        this.processReady.resolve();
+        this._onDidTerminalCreated.fire(terminalClient.id);
+        return this.exitDefer.promise;
+    }
+    async execute(task, reuse) {
+        var _a, _b, _c, _d, _e;
+        this.taskStatus = TaskStatus.PROCESS_READY;
+        await this.createTerminal(reuse);
+        (_a = this.terminalClient) === null || _a === void 0 ? void 0 : _a.term.writeln(`\x1b[3m> Executing task: ${task._label} <\x1b[0m\n`);
+        const { args } = this.shellLaunchConfig;
+        // extensionTerminal 由插件自身接管，不需要执行和输出 Command
+        if (!this.shellLaunchConfig.isExtensionOwnedTerminal && args) {
+            (_b = this.terminalClient) === null || _b === void 0 ? void 0 : _b.term.writeln(`\x1b[3m> Command: ${typeof args === 'string' ? args : args[1]} <\x1b[0m\n`);
+        }
+        await ((_c = this.terminalClient) === null || _c === void 0 ? void 0 : _c.attached.promise);
+        this.taskStatus = TaskStatus.PROCESS_RUNNING;
+        this.pid = await ((_d = this.terminalClient) === null || _d === void 0 ? void 0 : _d.pid);
+        this.processReady.resolve();
+        (_e = this.terminalClient) === null || _e === void 0 ? void 0 : _e.term.write('\x1b[G');
+        return this.exitDefer.promise;
+    }
+    get processId() {
+        return this.pid;
+    }
+    get terminalId() {
+        return this.terminalClient && this.terminalClient.id;
+    }
+    get widgetId() {
+        return this.terminalClient && this.terminalClient.widget.id;
+    }
+    updateLaunchConfig(launchConfig) {
+        this.shellLaunchConfig = launchConfig;
+    }
+    updateProblemCollector(collector) {
+        this.collector = collector;
+    }
+    reset() {
+        this.resetEventDispose();
+        this.taskStatus = TaskStatus.PROCESS_INIT;
+        this.exitDefer = new ide_core_common_1.Deferred();
+    }
+};
+tslib_1.__decorate([
+    (0, di_1.Autowired)(common_1.ITerminalGroupViewService),
+    tslib_1.__metadata("design:type", Object)
+], TerminalTaskExecutor.prototype, "terminalView", void 0);
+tslib_1.__decorate([
+    (0, di_1.Autowired)(common_1.ITerminalController),
+    tslib_1.__metadata("design:type", Object)
+], TerminalTaskExecutor.prototype, "terminalController", void 0);
+tslib_1.__decorate([
+    (0, di_1.Autowired)(common_1.ITerminalService),
+    tslib_1.__metadata("design:type", Object)
+], TerminalTaskExecutor.prototype, "terminalService", void 0);
+TerminalTaskExecutor = tslib_1.__decorate([
+    (0, di_1.Injectable)({ multiple: true }),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, problem_collector_1.ProblemCollector, Number])
+], TerminalTaskExecutor);
+exports.TerminalTaskExecutor = TerminalTaskExecutor;
+//# sourceMappingURL=task-executor.js.map

package/lib/browser/task-executor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"task-executor.js","sourceRoot":"","sources":["../../src/browser/task-executor.ts"],"names":[],"mappings":"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"}

package/lib/browser/task.contribution.d.ts

@@ -2,6 +2,7 @@ import { CommandContribution, CommandRegistry, Command, JsonSchemaContribution,
 import { ITerminalController } from '@opensumi/ide-terminal-next/lib/common/controller';
 export declare class TaskContribution extends WithEventBus implements CommandContribution, JsonSchemaContribution {
     static readonly RUN_TASK_COMMAND: Command;
+    static readonly RERUN_TASK: Command;
     protected readonly terminalController: ITerminalController;
     private readonly taskService;
     handleTerminalClientAttach(event: TerminalClientAttachEvent): void;

package/lib/browser/task.contribution.d.ts.map

@@ -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,EACnB,YAAY,EACZ,yBAAyB,EAE1B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AAMxF,qBACa,gBAAiB,SAAQ,YAAa,YAAW,mBAAmB,EAAE,sBAAsB;IACvG,MAAM,CAAC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAIvC;IAGF,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;IAG3D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAe;IAG3C,0BAA0B,CAAC,KAAK,EAAE,yBAAyB;IAW3D,cAAc,CAAC,QAAQ,EAAE,mBAAmB;IAI5C,gBAAgB,CAAC,eAAe,EAAE,eAAe;CAOlD"}
+{"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,EACnB,YAAY,EACZ,yBAAyB,EAE1B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AAQxF,qBACa,gBAAiB,SAAQ,YAAa,YAAW,mBAAmB,EAAE,sBAAsB;IAGvG,MAAM,CAAC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAIvC;IACF,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAIjC;IAGF,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;IAG3D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAe;IAG3C,0BAA0B,CAAC,KAAK,EAAE,yBAAyB;IAW3D,cAAc,CAAC,QAAQ,EAAE,mBAAmB;IAI5C,gBAAgB,CAAC,eAAe,EAAE,eAAe;CAYlD"}

package/lib/browser/task.contribution.js

@@ -8,6 +8,7 @@ const ide_core_browser_1 = require("@opensumi/ide-core-browser");
 const controller_1 = require("@opensumi/ide-terminal-next/lib/common/controller");
 const common_1 = require("../common");
 const task_schema_1 = require("./task.schema");
+const Category = 'Tasks';
 let TaskContribution = TaskContribution_1 = class TaskContribution extends ide_core_browser_1.WithEventBus {
     handleTerminalClientAttach(event) {
         const client = this.terminalController.clients.get(event.payload.clientId);
@@ -27,12 +28,24 @@ let TaskContribution = TaskContribution_1 = class TaskContribution extends ide_c
                 this.taskService.runTaskCommand();
             },
         });
+        commandRegister.registerCommand(TaskContribution_1.RERUN_TASK, {
+            execute: () => {
+                this.taskService.rerunLastTask();
+            },
+        });
     }
 };
+// 因为部分插件会执行 Task 相关的命令，所以如果你要添加 Task 相关的命令：
+// 请注意要和 VSCode 的同功能命名对齐，可以通过插件进程的 delegate 逻辑做命令调用的转发
 TaskContribution.RUN_TASK_COMMAND = {
     id: 'workbench.action.tasks.runTask',
-    label: '%command.runTask%',
-    category: 'Task',
+    label: '%workbench.action.tasks.runTask%',
+    category: Category,
+};
+TaskContribution.RERUN_TASK = {
+    id: 'workbench.action.tasks.reRunTask',
+    label: '%workbench.action.tasks.reRunTask%',
+    category: Category,
 };
 tslib_1.__decorate([
     (0, di_1.Autowired)(controller_1.ITerminalController),

package/lib/browser/task.contribution.js.map

@@ -1 +1 @@
-{"version":3,"file":"task.contribution.js","sourceRoot":"","sources":["../../src/browser/task.contribution.ts"],"names":[],"mappings":";;;;;AAAA,qCAAyC;AACzC,iEAUoC;AACpC,kFAAwF;AAExF,sCAAyC;AAEzC,+CAAsD;AAGtD,IAAa,gBAAgB,wBAA7B,MAAa,gBAAiB,SAAQ,+BAAY;IAchD,0BAA0B,CAAC,KAAgC;QACzD,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC3E,IAAI,CAAC,MAAM,EAAE;YACX,OAAO;SACR;QAED,IAAI,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,MAAM,EAAE;YAC1C,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SAChD;IACH,CAAC;IAED,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;AAnCiB,iCAAgB,GAAY;IAC1C,EAAE,EAAE,gCAAgC;IACpC,KAAK,EAAE,mBAAmB;IAC1B,QAAQ,EAAE,MAAM;CAChB,CAAA;AAGF;IADC,IAAA,cAAS,EAAC,gCAAmB,CAAC;;4DAC4B;AAG3D;IADC,IAAA,cAAS,EAAC,qBAAY,CAAC;;qDACmB;AAG3C;IADC,IAAA,0BAAO,EAAC,4CAAyB,CAAC;;6CACD,4CAAyB;;kEAS1D;AAvBU,gBAAgB;IAD5B,IAAA,yBAAM,EAAC,sCAAmB,EAAE,yCAAsB,CAAC;GACvC,gBAAgB,CAoC5B;AApCY,4CAAgB"}
+{"version":3,"file":"task.contribution.js","sourceRoot":"","sources":["../../src/browser/task.contribution.ts"],"names":[],"mappings":";;;;;AAAA,qCAAyC;AACzC,iEAUoC;AACpC,kFAAwF;AAExF,sCAAyC;AAEzC,+CAAsD;AAEtD,MAAM,QAAQ,GAAG,OAAO,CAAC;AAGzB,IAAa,gBAAgB,wBAA7B,MAAa,gBAAiB,SAAQ,+BAAY;IAqBhD,0BAA0B,CAAC,KAAgC;QACzD,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC3E,IAAI,CAAC,MAAM,EAAE;YACX,OAAO;SACR;QAED,IAAI,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,MAAM,EAAE;YAC1C,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SAChD;IACH,CAAC;IAED,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;QACH,eAAe,CAAC,eAAe,CAAC,kBAAgB,CAAC,UAAU,EAAE;YAC3D,OAAO,EAAE,GAAG,EAAE;gBACZ,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC;YACnC,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA/CC,4CAA4C;AAC5C,sDAAsD;AACtC,iCAAgB,GAAY;IAC1C,EAAE,EAAE,gCAAgC;IACpC,KAAK,EAAE,kCAAkC;IACzC,QAAQ,EAAE,QAAQ;CAClB,CAAA;AACc,2BAAU,GAAY;IACpC,EAAE,EAAE,kCAAkC;IACtC,KAAK,EAAE,oCAAoC;IAC3C,QAAQ,EAAE,QAAQ;CAClB,CAAA;AAGF;IADC,IAAA,cAAS,EAAC,gCAAmB,CAAC;;4DAC4B;AAG3D;IADC,IAAA,cAAS,EAAC,qBAAY,CAAC;;qDACmB;AAG3C;IADC,IAAA,0BAAO,EAAC,4CAAyB,CAAC;;6CACD,4CAAyB;;kEAS1D;AA9BU,gBAAgB;IAD5B,IAAA,yBAAM,EAAC,sCAAmB,EAAE,yCAAsB,CAAC;GACvC,gBAAgB,CAgD5B;AAhDY,4CAAgB"}

package/lib/browser/task.service.d.ts

@@ -43,6 +43,7 @@ export declare class TaskService extends Disposable implements ITaskService {
     updateWorkspaceTasks(groupedTaskSet: TaskSet[]): Promise<Map<string, WorkspaceFolderTaskResult> | undefined>;
     private computeWorkspaceFolderTasks;
     protected showOutput(): void;
+    rerunLastTask(): Promise<import("../common").ITaskExecuteResult | undefined>;
     registerTaskProvider(provider: ITaskProvider, type: string): IDisposable;
 }
 //# sourceMappingURL=task.service.d.ts.map

package/lib/browser/task.service.d.ts.map

@@ -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,EAIxB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,+CAA+C,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;AAqCxB,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,YAAY,CAAkD;IAEtE,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,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe;IA+BhD,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;IAeR,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"}
+{"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,EAGxB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,+CAA+C,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;AAqCxB,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,YAAY,CAAkD;IAEtE,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,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe;IA+BhD,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;IAeR,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;YAyDX,iBAAiB;IAMxB,oBAAoB,CAAC,cAAc,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,GAAG,SAAS,CAAC;IAmBnH,OAAO,CAAC,2BAA2B;IAuEnC,SAAS,CAAC,UAAU,IAAI,IAAI;IAIrB,aAAa;IAIb,oBAAoB,CAAC,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW;CAahF"}

package/lib/browser/task.service.js

@@ -162,7 +162,7 @@ let TaskService = class TaskService extends ide_core_browser_1.Disposable {
             if (this.runningTasks.has(task._id)) {
                 this.runningTasks.delete(task._id);
             }
-            this.outputChannel.appendLine(`task ${task._label} done, exit code ${res.exitCode}`);
+            this.outputChannel.appendLine(`Task ${task._label} done, exit code ${res.exitCode}`);
         });
         this.runningTasks.set(task._id, task);
         return Promise.resolve(result.promise);
@@ -214,7 +214,7 @@ let TaskService = class TaskService extends ide_core_browser_1.Disposable {
     }
     toQuickOpenGroupItem(showBorder, run, type) {
         return new ide_core_browser_1.QuickOpenItem({
-            groupLabel: showBorder ? '贡献' : undefined,
+            groupLabel: showBorder ? (0, ide_core_browser_1.formatLocalize)('task.contribute') : undefined,
             run,
             showBorder,
             label: type,
@@ -236,7 +236,7 @@ let TaskService = class TaskService extends ide_core_browser_1.Disposable {
                                 return acceptor([
                                     new ide_core_browser_1.QuickOpenItem({
                                         value: 'none',
-                                        label: `未找到 ${taskSet.type} 的任务，按回车键返回`,
+                                        label: (0, ide_core_browser_1.formatLocalize)('task.cannotFindTask', taskSet.type),
                                         run: (mode) => {
                                             if (mode === ide_core_browser_1.Mode.OPEN) {
                                                 return true;
@@ -325,7 +325,6 @@ let TaskService = class TaskService extends ide_core_browser_1.Disposable {
                         byIdentifier: Object.create(null),
                     };
                     for (const task of parseResult.configured) {
-                        // @ts-ignore
                         customizedTasks.byIdentifier[task.configures._key] = task;
                     }
                 }
@@ -362,6 +361,9 @@ let TaskService = class TaskService extends ide_core_browser_1.Disposable {
     showOutput() {
         this.outputChannel.appendLine('There are task errors. See the output for details.');
     }
+    rerunLastTask() {
+        return this.taskSystem.rerun();
+    }
     registerTaskProvider(provider, type) {
         const handler = (this.providerHandler += 1);
         this.providers.set(handler, provider);

package/lib/browser/task.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"task.service.js","sourceRoot":"","sources":["../../src/browser/task.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"task.service.js","sourceRoot":"","sources":["../../src/browser/task.service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAaoC;AACpC,+DAOmC;AAEnC,oFAAgF;AAEhF,2DAA4D;AAE5D,sCAA8G;AAC9G,yCASwB;AAExB,qCAA6D;AAC7D,+CAA0E;AAE1E,MAAM,eAAe;IAGnB,YAAoB,cAA6B;QAA7B,mBAAc,GAAd,cAAc,CAAe;QAC/C,IAAI,CAAC,iBAAiB,GAAG,IAAI,yBAAgB,EAAE,CAAC;IAClD,CAAC;IAEM,IAAI,CAAC,OAAe;QACzB,IAAI,CAAC,iBAAiB,CAAC,KAAK,eAAuB,CAAC;QACpD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAC7C,CAAC;IAEM,IAAI,CAAC,OAAe;QACzB,IAAI,CAAC,iBAAiB,CAAC,KAAK,kBAA0B,CAAC;QACvD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAC7C,CAAC;IAEM,KAAK,CAAC,OAAe;QAC1B,IAAI,CAAC,iBAAiB,CAAC,KAAK,gBAAwB,CAAC;QACrD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAC7C,CAAC;IAEM,KAAK,CAAC,OAAe;QAC1B,IAAI,CAAC,iBAAiB,CAAC,KAAK,gBAAwB,CAAC;QACrD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAC7C,CAAC;IAED,IAAW,MAAM;QACf,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;CACF;AAGD,IAAa,WAAW,GAAxB,MAAa,WAAY,SAAQ,6BAAU;IA0CzC;QACE,KAAK,EAAE,CAAC;QAlBF,sBAAiB,GAAuB,IAAI,yBAAO,EAAE,CAAC;QACvD,qBAAgB,GAAqB,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;QAEjE,+BAA0B,GAAoB,IAAI,yBAAO,EAAE,CAAC;QAC7D,8BAAyB,GAAkB,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC;QAEhF,oBAAe,GAAG,CAAC,CAAC;QAMpB,iBAAY,GAAwC,IAAI,GAAG,EAAE,CAAC;QAuL9D,oBAAe,GAAG,CAAC,IAA4B,EAAiB,EAAE;;YACxE,OAAA,IAAI,gCAAa,CAAC;gBAChB,KAAK,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE;gBACxB,MAAM,EACJ,IAAI,YAAY,sBAAe;oBAC7B,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAA,IAAI,CAAC,OAAO,CAAC,IAAI,0CAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;oBACvF,CAAC,CAAC,SAAS;gBACf,GAAG,EAAE,CAAC,IAAU,EAAE,EAAE;oBAClB,IAAI,IAAI,KAAK,uBAAI,CAAC,IAAI,EAAE;wBACtB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;wBACnB,OAAO,IAAI,CAAC;qBACb;oBACD,OAAO,KAAK,CAAC;gBACf,CAAC;aACF,CAAC,CAAA;SAAA,CAAC;QA9LH,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAA,2BAAQ,EAAC,yBAAyB,CAAC,CAAC,CAAC;QACxF,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,UAAU,CAAC;YACd,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACvE,IAAI,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC/E,IAAI,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC/E,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAC3E,CAAC,CAAC;IACL,CAAC;IAED,IAAY,gBAAgB;QAC1B,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;YAC3B,IAAI,CAAC,sBAAsB,EAAE,CAAC;SAC/B;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAEO,sBAAsB;QAC5B,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,sBAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAClG,CAAC;IAEM,KAAK,CAAC,cAAc;QACzB,MAAM,cAAc,GAAc,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAC/D,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QACpE,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;QACrF,IAAI,CAAC,gBAAgB,CAAC,IAAI,CACxB;YACE,MAAM,EAAE,CAAC,OAAe,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,GAAG,UAAU,EAAE,GAAG,OAAO,CAAC,CAAC;SAC7E,EACD,EAAE,WAAW,EAAE,IAAA,iCAAc,EAAC,yBAAyB,CAAC,EAAE,CAC3D,CAAC;IACJ,CAAC;IAEM,GAAG,CAAC,IAAU;QACnB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,MAAc,EAAE,QAAyB;QAC3D,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YACjC,OAAO;SACR;QAED,MAAM,CAAC,EAAE,AAAD,EAAG,AAAD,EAAG,QAAQ,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3C,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QAED,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YACpC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;YAClE,IAAI,IAAI,EAAE;gBACR,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;gBACvC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;aACrC;SACF;aAAM;YACL,0CAA0C;YAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;gBACnE,IAAI,CAAC,KAAK,QAAQ,EAAE;oBAClB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;oBAClE,IAAI,IAAI,EAAE;wBACR,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;wBACvC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;wBACpC,UAAU,CAAC,OAAO,EAAE,CAAC;qBACtB;iBACF;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,MAAc;QACvC,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;QACrD,KAAK,MAAM,CAAC,IAAI,WAAW,EAAE;YAC3B,IAAI,CAAC,CAAC,GAAG,KAAK,MAAM,EAAE;gBACpB,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;aACpC;SACF;IACH,CAAC;IAEM,OAAO,CACZ,eAAoB,EACpB,UAAmC,EACnC,SAAS,GAAG,KAAK;QAEjB,MAAM,GAAG,GAA6C,CAAC,IAAA,2BAAQ,EAAC,UAAU,CAAC;YACzE,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAAC;YACvE,CAAC,CAAC,UAAU,CAAC;QAEf,IAAI,GAAG,KAAK,SAAS,EAAE;YACrB,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACnC;QAED,OAAO,IAAI,CAAC,wBAAwB,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YACrE,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;aACnC;YACD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;YACtD,IAAI,CAAC,KAAK,EAAE;gBACV,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;aACnC;YACD,KAAK,MAAM,IAAI,IAAI,KAAM,EAAE;gBACzB,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE;oBAChC,OAAO,IAAI,CAAC;iBACb;gBACD,IAAI,IAAI,CAAC,GAAG,KAAK,UAAU,EAAE;oBAC3B,OAAO,IAAI,CAAC;iBACb;gBACD,IAAI,IAAI,CAAC,MAAM,KAAK,UAAU,EAAE;oBAC9B,OAAO,IAAI,CAAC;iBACb;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,IAA4B;QAChD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YAC1B,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBACnC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACpC;YACD,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,IAAI,CAAC,MAAM,oBAAoB,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvF,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAEtC,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,MAAM;;QACvB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAC7D,MAAM,MAAM,GAAW,EAAE,CAAC;QAC1B,KAAK,MAAM,OAAO,IAAI,cAAc,CAAC,MAAM,EAAE,EAAE;YAC7C,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE;gBAC1B,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,IAAI,CAAA,MAAA,IAAI,CAAC,aAAa,EAAE,0CAAE,IAAI,MAAK,MAAM,CAAC,IAAI,EAAE;oBACvE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACnB;gBACD,SAAS;aACV;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,wBAAwB,CAAC,SAAc,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAC3E,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QACxD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;QACxE,MAAM,MAAM,GAA+C,EAAE,CAAC;QAC9D,KAAK,MAAM,WAAW,IAAI,kBAAkB,EAAE;YAC5C,IAAI,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;gBACrD,MAAM,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;aACnC;SACF;QAED,MAAM,KAAK,GAAG,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QACrD,IAAI,KAAK,IAAI,KAAK,CAAC,GAAG,EAAE;YACtB,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACjC;QACD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;QAC1B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC;QACvC,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,MAAM,eAAe,GAAgC,EAAE,CAAC;QACxD,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,EAAE;YACzD,eAAe,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;SAC5C;QACD,eAAe,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;QAChC,eAAe,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;QAClC,MAAM,MAAM,GAAc,EAAE,CAAC;QAC7B,KAAK,MAAM,CAAC,EAAE,QAAQ,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE;YACzC,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;YAC3D,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACpB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAkBO,oBAAoB,CAAC,UAAmB,EAAE,GAAG,EAAE,IAAa;QAClE,OAAO,IAAI,gCAAa,CAAC;YACvB,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,IAAA,iCAAc,EAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,SAAS;YACtE,GAAG;YACH,UAAU;YACV,KAAK,EAAE,IAAI;YACX,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE;YAC9B,SAAS,EAAE,IAAA,0BAAO,EAAC,QAAQ,CAAC;SAC7B,CAAC,CAAC;IACL,CAAC;IAEO,iBAAiB,CACvB,kBAA6B,EAC7B,cAAkE;;QAElE,MAAM,MAAM,GAAoB,EAAE,CAAC;QACnC,MAAM,SAAS,GAAoB,EAAE,CAAC;QACtC,IAAI,UAAU,GAAG,IAAI,CAAC;QACtB,KAAK,MAAM,OAAO,IAAI,kBAAkB,EAAE;YACxC,MAAM,GAAG,GAAG,CAAC,IAAU,EAAE,EAAE;gBACzB,IAAI,IAAI,KAAK,uBAAI,CAAC,IAAI,EAAE;oBACtB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;wBACzB,MAAM,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;4BAC5B,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gCAC9B,OAAO,QAAQ,CAAC;oCACd,IAAI,gCAAa,CAAC;wCAChB,KAAK,EAAE,MAAM;wCACb,KAAK,EAAE,IAAA,iCAAc,EAAC,qBAAqB,EAAE,OAAO,CAAC,IAAI,CAAC;wCAC1D,GAAG,EAAE,CAAC,IAAU,EAAE,EAAE;4CAClB,IAAI,IAAI,KAAK,uBAAI,CAAC,IAAI,EAAE;gDACtB,OAAO,IAAI,CAAC;6CACb;4CACD,OAAO,KAAK,CAAC;wCACf,CAAC;qCACF,CAAC;iCACH,CAAC,CAAC;6BACJ;4BACD,OAAO,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;wBAC3D,CAAC;qBACF,CAAC,CAAC;oBACH,OAAO,KAAK,CAAC;iBACd;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC;YACF,MAAM,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YAC3E,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACvB,UAAU,GAAG,KAAK,CAAC;SACpB;QACD,IAAI,cAAc,EAAE;YAClB,KAAK,MAAM,OAAO,IAAI,cAAc,CAAC,MAAM,EAAE,EAAE;gBAC7C,IAAI,MAAA,OAAO,CAAC,cAAc,0CAAE,YAAY,EAAE;oBACxC,MAAM,CAAC,IAAI,CAAC,MAAA,OAAO,CAAC,cAAc,0CAAE,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;;wBAC9D,MAAM,IAAI,GAAG,MAAA,OAAO,CAAC,cAAc,0CAAE,YAAY,CAAC,CAAC,CAAC,CAAC;wBACrD,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAK,CAAC,CAAC,CAAC;oBAC9C,CAAC,CAAC,CAAC;iBACJ;gBAED,IAAI,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC/C,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE;wBACpC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;qBAC5C;iBACF;aACF;SACF;QAED,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC7B,cAAyB;QAEzB,OAAO,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IACnD,CAAC;IAEM,oBAAoB,CAAC,cAAyB;QACnD,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;YACtC,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,EAAqC,CAAC,CAAC;SACtE;aAAM,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7C;;;eAGG;YACH,OAAO,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,gBAAgB,EAAE,EAAE;gBAC1G,MAAM,OAAO,GAAG,IAAI,GAAG,EAAqC,CAAC;gBAC7D,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,gBAAgB,CAAC,CAAC;gBACnE,OAAO,OAAO,CAAC;YACjB,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAClC,cAAc;SACf;IACH,CAAC;IAEO,2BAA2B,CAAC,SAAc,EAAE,cAAyB;QAC3E,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YACnC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAoC,OAAO,CAAC,CAAC;YACrF,MAAM,eAAe,GAAG,IAAI,GAAG,EAAgB,CAAC;YAChD,KAAK,MAAM,OAAO,IAAI,cAAc,EAAE;gBACpC,KAAK,MAAM,WAAW,IAAI,OAAO,CAAC,KAAK,EAAE;oBACvC,IAAI,CAAC,sBAAe,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE;wBACpC,SAAS;qBACV;oBACD,eAAe,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;iBAC5D;aACF;YACD,IAAI,WAAW,IAAI,WAAW,CAAC,KAAK,EAAE;gBACpC,IAAI,eAAiF,CAAC;gBACtF,MAAM,OAAO,GAAiB,EAAE,CAAC;gBACjC,IAAI,SAAS,GAAG,KAAK,CAAC;gBACtB,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBAChE,MAAM,WAAW,GAAG,IAAA,mBAAK,EACvB,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,EAClD,0BAAQ,EACR,WAAW,EACX,eAAe,EACf,IAAI,CAAC,sBAAsB,EAC3B,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,cAAc,CACpB,CAAC;gBACF,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,EAAE,EAAE;oBACxC,SAAS,GAAG,IAAI,CAAC;oBACjB,IAAI,CAAC,UAAU,EAAE,CAAC;iBACnB;gBACD,IAAI,WAAW,CAAC,UAAU,IAAI,WAAW,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC/D,eAAe,GAAG;wBAChB,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;qBAClC,CAAC;oBACF,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,UAAU,EAAE;wBACzC,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;qBAC3D;iBACF;gBACD,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;gBACpC;;mBAEG;gBACH,IAAI,eAAe,IAAI,eAAe,CAAC,YAAY,EAAE;oBACnD,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;wBACxD,IAAI,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;4BAC5B,MAAM,UAAU,GAAG,IAAA,8BAAgB,EACjC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAoB,EAC3C,eAAgB,CAAC,YAAY,CAAC,GAAG,CAAC,CACnC,CAAC;4BACF,aAAa;4BACb,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC;yBAChD;oBACH,CAAC,CAAC,CAAC;iBACJ;gBACD,OAAO,CAAC;oBACN,eAAe,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE;oBACnE,GAAG,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE;oBACvB,cAAc,EAAE,eAAe;oBAC/B,SAAS;iBACV,CAAC,CAAC;aACJ;iBAAM;gBACL,OAAO,CAAC;oBACN,eAAe,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE;oBACnE,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;oBAClB,cAAc,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE;oBACpC,SAAS,EAAE,KAAK;iBACjB,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAES,UAAU;QAClB,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,oDAAoD,CAAC,CAAC;IACtF,CAAC;IAEM,aAAa;QAClB,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IACjC,CAAC;IAEM,oBAAoB,CAAC,QAAuB,EAAE,IAAY;QAC/D,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtC,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE3C,OAAO;YACL,OAAO,EAAE,GAAG,EAAE;gBACZ,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC/B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAClC,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AAnaC;IADC,IAAA,cAAS,EAAC,8BAAa,CAAC;sCACS,8BAAa;kDAAC;AAGhD;IADC,IAAA,cAAS,EAAC,iCAAiB,CAAC;;qDAC0B;AAGvD;IADC,IAAA,cAAS,EAAC,mCAAgB,CAAC;;qDAC0B;AAGtD;IADC,IAAA,cAAS,EAAC,oCAAiB,CAAC;;gDACqB;AAGlD;IADC,IAAA,cAAS,EAAC,oBAAW,CAAC;;+CACoB;AAG3C;IADC,IAAA,cAAS,EAAC,yCAAuB,CAAC;;2DACgC;AAGnE;IADC,IAAA,cAAS,EAAC,yCAAuB,CAAC;;mDACK;AAGxC;IADC,IAAA,cAAS,EAAC,yCAAuB,CAAC;;mDACK;AAvB7B,WAAW;IADvB,IAAA,eAAU,GAAE;;GACA,WAAW,CAqavB;AAraY,kCAAW"}

package/lib/browser/terminal-task-system.d.ts

@@ -1,68 +1,15 @@
-import { Event, IProblemMatcherRegistry, Disposable, Deferred, ProblemMatch } from '@opensumi/ide-core-common';
-import { TerminalOptions, ITerminalController, ITerminalGroupViewService, ITerminalClient, ITerminalService } from '@opensumi/ide-terminal-next/lib/common';
+import { Event, IProblemMatcherRegistry, Disposable } from '@opensumi/ide-core-common';
+import { ITerminalClient } from '@opensumi/ide-terminal-next/lib/common';
 import { IVariableResolverService } from '@opensumi/ide-variable';
-import { ITaskSystem, ITaskExecuteResult, ITaskExecutor, TaskTerminateResponse } from '../common';
+import { ITaskSystem, ITaskExecuteResult, TaskTerminateResponse } from '../common';
 import { Task, ContributedTask, TaskEvent } from '../common/task';
 import { CustomTask } from '../common/task';
-import { ProblemCollector } from './problem-collector';
-declare enum TaskStatus {
-    PROCESS_INIT = 0,
-    PROCESS_READY = 1,
-    PROCESS_RUNNING = 2,
-    PROCESS_EXITED = 3
-}
-export declare class TerminalTaskExecutor extends Disposable implements ITaskExecutor {
-    private task;
-    private terminalOptions;
-    private collector;
-    executorId: number;
-    protected readonly terminalView: ITerminalGroupViewService;
-    protected readonly terminalController: ITerminalController;
-    protected readonly terminalService: ITerminalService;
-    private terminalClient;
-    private pid;
-    private exitDefer;
-    private _onDidTerminalCreated;
-    private _onDidTaskProcessExit;
-    private _onDidBackgroundTaskBegin;
-    onDidBackgroundTaskBegin: Event<void>;
-    private _onDidBackgroundTaskEnd;
-    onDidBackgroundTaskEnd: Event<void>;
-    private _onDidProblemMatched;
-    onDidProblemMatched: Event<ProblemMatch[]>;
-    private _onDidTerminalWidgetRemove;
-    onDidTerminalCreated: Event<string>;
-    onDidTerminalWidgetRemove: Event<void>;
-    onDidTaskProcessExit: Event<number | undefined>;
-    processReady: Deferred<void>;
-    private processExited;
-    private disposableCollection;
-    taskStatus: TaskStatus;
-    constructor(task: Task, terminalOptions: TerminalOptions, collector: ProblemCollector, executorId: number);
-    terminate(): Promise<{
-        success: boolean;
-    }>;
-    private onTaskExit;
-    private bindTerminalClientEvent;
-    private createTerminal;
-    attach(terminalClient: ITerminalClient): Promise<{
-        exitCode?: number;
-    }>;
-    execute(task: Task, reuse?: boolean): Promise<{
-        exitCode?: number;
-    }>;
-    get processId(): number | undefined;
-    get terminalId(): string | undefined;
-    get widgetId(): string | undefined;
-    updateTerminalOptions(terminalOptions: TerminalOptions): void;
-    updateProblemCollector(collector: ProblemCollector): void;
-    reset(): void;
-}
 export declare class TerminalTaskSystem extends Disposable implements ITaskSystem {
     private readonly injector;
     problemMatcher: IProblemMatcherRegistry;
     variableResolver: IVariableResolverService;
     private executorId;
+    private lastTask;
     protected currentTask: Task;
     private activeTaskExecutors;
     private _onDidStateChange;
@@ -87,14 +34,13 @@ export declare class TerminalTaskSystem extends Disposable implements ITaskSyste
     private resolveMatchers;
     getActiveTasks(): Task[];
     terminate(task: Task): Promise<TaskTerminateResponse>;
-    rerun(): import('../common').ITaskExecuteResult | undefined;
+    rerun(): Promise<ITaskExecuteResult | undefined>;
     isActive(): Promise<boolean>;
     isActiveSync(): boolean;
-    getBusyTasks(): import('../common/task').Task[];
+    getBusyTasks(): Task[];
     canAutoTerminate(): boolean;
-    terminateAll(): Promise<import('../common').TaskTerminateResponse[]>;
-    revealTask(task: import('../common/task').Task): boolean;
-    customExecutionComplete(task: import('../common/task').Task, result: number): Promise<void>;
+    terminateAll(): Promise<TaskTerminateResponse[]>;
+    revealTask(task: Task): boolean;
+    customExecutionComplete(task: Task, result: number): Promise<void>;
 }
-export {};
 //# sourceMappingURL=terminal-task-system.d.ts.map

package/lib/browser/terminal-task-system.d.ts.map

@@ -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,EAMR,YAAY,EAIb,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,yBAAyB,EACzB,eAAe,EACf,gBAAgB,EACjB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAElE,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,aAAa,EAGb,qBAAqB,EACtB,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,IAAI,EACJ,eAAe,EAGf,SAAS,EAGV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAMvD,aAAK,UAAU;IACb,YAAY,IAAA;IACZ,aAAa,IAAA;IACb,eAAe,IAAA;IACf,cAAc,IAAA;CACf;AAwBD,qBACa,oBAAqB,SAAQ,UAAW,YAAW,aAAa;IA8CzE,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,SAAS;IACV,UAAU,EAAE,MAAM;IA/C3B,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,yBAAyB,CAAC;IAG3D,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;IAG3D,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,gBAAgB,CAAC;IAErD,OAAO,CAAC,cAAc,CAA8B;IAEpD,OAAO,CAAC,GAAG,CAAqB;IAEhC,OAAO,CAAC,SAAS,CAAmD;IAEpE,OAAO,CAAC,qBAAqB,CAAkC;IAE/D,OAAO,CAAC,qBAAqB,CAA8C;IAE3E,OAAO,CAAC,yBAAyB,CAAgC;IAC1D,wBAAwB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAwC;IAEpF,OAAO,CAAC,uBAAuB,CAAgC;IACxD,sBAAsB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAsC;IAEhF,OAAO,CAAC,oBAAoB,CAA0C;IAC/D,mBAAmB,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAmC;IAEpF,OAAO,CAAC,0BAA0B,CAAgC;IAE3D,oBAAoB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAoC;IAEvE,yBAAyB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAyC;IAE/E,oBAAoB,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,CAAoC;IAEnF,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAwB;IAE3D,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO,CAAC,oBAAoB,CAAoD;IAEzE,UAAU,EAAE,UAAU,CAA2B;gBAG9C,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,gBAAgB,EAC5B,UAAU,EAAE,MAAM;IAa3B,SAAS,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IAsB1C,OAAO,CAAC,UAAU;IAalB,OAAO,CAAC,uBAAuB;YA2DjB,cAAc;IAoBtB,MAAM,CAAC,cAAc,EAAE,eAAe,GAAG,OAAO,CAAC;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAcvE,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAuB1E,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAElC;IAED,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAEM,qBAAqB,CAAC,eAAe,EAAE,eAAe;IAItD,sBAAsB,CAAC,SAAS,EAAE,gBAAgB;IAIlD,KAAK;CAKb;AAED,qBACa,kBAAmB,SAAQ,UAAW,YAAW,WAAW;IAEvE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IAGpC,cAAc,EAAE,uBAAuB,CAAC;IAGxC,gBAAgB,EAAE,wBAAwB,CAAC;IAE3C,OAAO,CAAC,UAAU,CAAK;IAEvB,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC;IAE5B,OAAO,CAAC,mBAAmB,CAAqD;IAEhF,OAAO,CAAC,iBAAiB,CAAqC;IAE9D,OAAO,CAAC,yBAAyB,CAAqC;IAEtE,OAAO,CAAC,yBAAyB,CAAqC;IAEtE,OAAO,CAAC,oBAAoB,CAAqC;IAEjE,OAAO,CAAC,aAAa,CAA8B;IAEnD,gBAAgB,EAAE,KAAK,CAAC,SAAS,CAAC,CAAgC;IAClE,wBAAwB,EAAE,KAAK,CAAC,SAAS,CAAC,CAAwC;IAClF,wBAAwB,EAAE,KAAK,CAAC,SAAS,CAAC,CAAwC;IAClF,mBAAmB,EAAE,KAAK,CAAC,SAAS,CAAC,CAAmC;IAExE,GAAG,CAAC,IAAI,EAAE,UAAU,GAAG,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAKpE,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,eAAe,EAAE,cAAc,EAAE,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC;YAK1F,gBAAgB;IAqC9B,OAAO,CAAC,qBAAqB;YAIf,kBAAkB;YAelB,UAAU;YAaV,WAAW;IAoFzB,OAAO,CAAC,kBAAkB;YAOZ,gBAAgB;YAQhB,eAAe;YAgBf,eAAe;IAiC7B,cAAc,IAAI,IAAI,EAAE;IAIlB,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAW3D,KAAK,IAAI,OAAO,WAAW,EAAE,kBAAkB,GAAG,SAAS;IAG3D,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAG5B,YAAY,IAAI,OAAO;IAIvB,YAAY,IAAI,OAAO,gBAAgB,EAAE,IAAI,EAAE;IAG/C,gBAAgB,IAAI,OAAO;IAI3B,YAAY,IAAI,OAAO,CAAC,OAAO,WAAW,EAAE,qBAAqB,EAAE,CAAC;IAGpE,UAAU,CAAC,IAAI,EAAE,OAAO,gBAAgB,EAAE,IAAI,GAAG,OAAO;IAGxD,uBAAuB,CAAC,IAAI,EAAE,OAAO,gBAAgB,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAG5F"}
+{"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,EAMX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,eAAe,EAAsB,MAAM,wCAAwC,CAAC;AAC7F,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAElE,OAAO,EACL,WAAW,EACX,kBAAkB,EAGlB,qBAAqB,EACtB,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,IAAI,EACJ,eAAe,EAGf,SAAS,EAGV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAQ5C,qBACa,kBAAmB,SAAQ,UAAW,YAAW,WAAW;IAEvE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IAGpC,cAAc,EAAE,uBAAuB,CAAC;IAGxC,gBAAgB,EAAE,wBAAwB,CAAC;IAE3C,OAAO,CAAC,UAAU,CAAK;IAEvB,OAAO,CAAC,QAAQ,CAA2C;IAC3D,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC;IAE5B,OAAO,CAAC,mBAAmB,CAAqD;IAEhF,OAAO,CAAC,iBAAiB,CAAqC;IAE9D,OAAO,CAAC,yBAAyB,CAAqC;IAEtE,OAAO,CAAC,yBAAyB,CAAqC;IAEtE,OAAO,CAAC,oBAAoB,CAAqC;IAEjE,OAAO,CAAC,aAAa,CAA8B;IAEnD,gBAAgB,EAAE,KAAK,CAAC,SAAS,CAAC,CAAgC;IAClE,wBAAwB,EAAE,KAAK,CAAC,SAAS,CAAC,CAAwC;IAClF,wBAAwB,EAAE,KAAK,CAAC,SAAS,CAAC,CAAwC;IAClF,mBAAmB,EAAE,KAAK,CAAC,SAAS,CAAC,CAAmC;IAExE,GAAG,CAAC,IAAI,EAAE,UAAU,GAAG,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAKpE,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,eAAe,EAAE,cAAc,EAAE,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC;YAK1F,gBAAgB;IAqC9B,OAAO,CAAC,qBAAqB;YAIf,kBAAkB;YAelB,UAAU;YAcV,WAAW;IAuFzB,OAAO,CAAC,kBAAkB;YAOZ,gBAAgB;YAQhB,eAAe;YAgBf,eAAe;IAgC7B,cAAc,IAAI,IAAI,EAAE;IAGlB,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAUrD,KAAK,IAAI,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAGtD,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAG5B,YAAY,IAAI,OAAO;IAGvB,YAAY,IAAI,IAAI,EAAE;IAGtB,gBAAgB,IAAI,OAAO;IAG3B,YAAY,IAAI,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAGhD,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAG/B,uBAAuB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAGnE"}

package/lib/browser/terminal-task-system.js

@@ -1,240 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TerminalTaskSystem = exports.TerminalTaskExecutor = void 0;
+exports.TerminalTaskSystem = void 0;
 const tslib_1 = require("tslib");
 const di_1 = require("@opensumi/di");
 const ide_core_common_1 = require("@opensumi/ide-core-common");
-const common_1 = require("@opensumi/ide-terminal-next/lib/common");
 const ide_variable_1 = require("@opensumi/ide-variable");
 const task_1 = require("../common/task");
 const problem_collector_1 = require("./problem-collector");
+const task_executor_1 = require("./task-executor");
 const { deepClone } = ide_core_common_1.objects;
-const { removeAnsiEscapeCodes } = ide_core_common_1.strings;
 const { Path } = ide_core_common_1.path;
-var TaskStatus;
-(function (TaskStatus) {
-    TaskStatus[TaskStatus["PROCESS_INIT"] = 0] = "PROCESS_INIT";
-    TaskStatus[TaskStatus["PROCESS_READY"] = 1] = "PROCESS_READY";
-    TaskStatus[TaskStatus["PROCESS_RUNNING"] = 2] = "PROCESS_RUNNING";
-    TaskStatus[TaskStatus["PROCESS_EXITED"] = 3] = "PROCESS_EXITED";
-})(TaskStatus || (TaskStatus = {}));
-function rangeAreEqual(a, b) {
-    return (a.start.line === b.start.line &&
-        a.start.character === b.start.character &&
-        a.end.line === b.end.line &&
-        a.end.character === b.end.character);
-}
-function problemAreEquals(a, b) {
-    var _a, _b;
-    return (((_a = a.resource) === null || _a === void 0 ? void 0 : _a.toString()) === ((_b = b.resource) === null || _b === void 0 ? void 0 : _b.toString()) &&
-        a.description.owner === b.description.owner &&
-        a.description.severity === b.description.severity &&
-        a.description.source === b.description.source &&
-        (a === null || a === void 0 ? void 0 : a.marker.code) === (b === null || b === void 0 ? void 0 : b.marker.code) &&
-        (a === null || a === void 0 ? void 0 : a.marker.message) === (b === null || b === void 0 ? void 0 : b.marker.message) &&
-        (a === null || a === void 0 ? void 0 : a.marker.source) === (b === null || b === void 0 ? void 0 : b.marker.source) &&
-        rangeAreEqual(a.marker.range, b.marker.range));
-}
-let TerminalTaskExecutor = class TerminalTaskExecutor extends ide_core_common_1.Disposable {
-    constructor(task, terminalOptions, collector, executorId) {
-        super();
-        this.task = task;
-        this.terminalOptions = terminalOptions;
-        this.collector = collector;
-        this.executorId = executorId;
-        this.exitDefer = new ide_core_common_1.Deferred();
-        this._onDidTerminalCreated = new ide_core_common_1.Emitter();
-        this._onDidTaskProcessExit = new ide_core_common_1.Emitter();
-        this._onDidBackgroundTaskBegin = new ide_core_common_1.Emitter();
-        this.onDidBackgroundTaskBegin = this._onDidBackgroundTaskBegin.event;
-        this._onDidBackgroundTaskEnd = new ide_core_common_1.Emitter();
-        this.onDidBackgroundTaskEnd = this._onDidBackgroundTaskEnd.event;
-        this._onDidProblemMatched = new ide_core_common_1.Emitter();
-        this.onDidProblemMatched = this._onDidProblemMatched.event;
-        this._onDidTerminalWidgetRemove = new ide_core_common_1.Emitter();
-        this.onDidTerminalCreated = this._onDidTerminalCreated.event;
-        this.onDidTerminalWidgetRemove = this._onDidTerminalWidgetRemove.event;
-        this.onDidTaskProcessExit = this._onDidTaskProcessExit.event;
-        this.processReady = new ide_core_common_1.Deferred();
-        this.processExited = false;
-        this.disposableCollection = new ide_core_common_1.DisposableCollection();
-        this.taskStatus = TaskStatus.PROCESS_INIT;
-        this.addDispose(this.terminalView.onWidgetDisposed((e) => {
-            if (this.terminalClient && e.id === this.terminalClient.id) {
-                this._onDidTerminalWidgetRemove.fire();
-            }
-        }));
-    }
-    terminate() {
-        return new Promise((resolve) => {
-            if (this.terminalClient) {
-                this.terminalClient.dispose();
-                if (this.processExited) {
-                    // 如果在调 terminate 之前进程已经退出，直接删掉 terminalWidget 即可
-                    this.terminalView.removeWidget(this.terminalClient.id);
-                    resolve({ success: true });
-                }
-                else {
-                    this.terminalService.onExit((e) => {
-                        var _a;
-                        if (e.sessionId === ((_a = this.terminalClient) === null || _a === void 0 ? void 0 : _a.id)) {
-                            this.terminalView.removeWidget(this.terminalClient.id);
-                            resolve({ success: true });
-                        }
-                    });
-                }
-            }
-            else {
-                resolve({ success: true });
-            }
-        });
-    }
-    onTaskExit(code) {
-        const { term, id } = this.terminalClient;
-        term.setOption('disableStdin', true);
-        term.writeln((0, ide_core_common_1.formatLocalize)('terminal.integrated.exitedWithCode', code));
-        term.writeln(`\r\n\x1b[1m${(0, ide_core_common_1.formatLocalize)('reuseTerminal')}\x1b[0m`);
-        this._onDidTaskProcessExit.fire(code);
-        this.disposableCollection.push(term.onKey(() => {
-            this.terminalView.removeWidget(id);
-        }));
-    }
-    bindTerminalClientEvent() {
-        var _a, _b;
-        this.addDispose(((_a = this.terminalClient) === null || _a === void 0 ? void 0 : _a.onOutput((e) => {
-            const output = removeAnsiEscapeCodes(e.data.toString());
-            const isBegin = this.collector.matchBeginMatcher(output);
-            if (isBegin) {
-                this._onDidBackgroundTaskBegin.fire();
-            }
-            // process multi-line output
-            const lines = output.split(/\r?\n/g).filter((e) => e);
-            const markerResults = [];
-            for (const l of lines) {
-                const markers = this.collector.processLine(l);
-                if (markers && markers.length > 0) {
-                    for (const marker of markers) {
-                        const existing = markerResults.findIndex((e) => problemAreEquals(e, marker));
-                        if (existing === -1) {
-                            markerResults.push(marker);
-                        }
-                    }
-                }
-            }
-            if (markerResults.length > 0) {
-                this._onDidProblemMatched.fire(markerResults);
-            }
-            const isEnd = this.collector.matchEndMatcher(output);
-            if (isEnd) {
-                this._onDidBackgroundTaskEnd.fire();
-            }
-        })) || ide_core_common_1.Disposable.NULL);
-        this.disposableCollection.push(((_b = this.terminalClient) === null || _b === void 0 ? void 0 : _b.onExit(async (e) => {
-            var _a;
-            if (e.id === ((_a = this.terminalClient) === null || _a === void 0 ? void 0 : _a.id) && this.taskStatus !== TaskStatus.PROCESS_EXITED) {
-                this.onTaskExit(e.code);
-                this.processExited = true;
-                this.taskStatus = TaskStatus.PROCESS_EXITED;
-                this.exitDefer.resolve({ exitCode: e.code });
-            }
-        })) || ide_core_common_1.Disposable.NULL);
-        this.disposableCollection.push(this.terminalService.onExit(async (e) => {
-            var _a;
-            if (e.sessionId === ((_a = this.terminalClient) === null || _a === void 0 ? void 0 : _a.id) && this.taskStatus !== TaskStatus.PROCESS_EXITED) {
-                await this.processReady.promise;
-                this.onTaskExit(e.code);
-                this.processExited = true;
-                this.taskStatus = TaskStatus.PROCESS_EXITED;
-                this.exitDefer.resolve({ exitCode: e.code });
-            }
-        }));
-    }
-    async createTerminal(reuse) {
-        if (reuse && this.terminalClient) {
-            this.terminalClient.updateOptions(this.terminalOptions);
-            this.terminalClient.reset();
-        }
-        else {
-            this.terminalClient = await this.terminalController.createClientWithWidget2({
-                terminalOptions: this.terminalOptions,
-                closeWhenExited: false,
-                isTaskExecutor: true,
-                taskId: this.task._id,
-                beforeCreate: (terminalId) => {
-                    this._onDidTerminalCreated.fire(terminalId);
-                },
-            });
-        }
-        this.terminalController.showTerminalPanel();
-        this.bindTerminalClientEvent();
-    }
-    async attach(terminalClient) {
-        var _a;
-        this.taskStatus = TaskStatus.PROCESS_READY;
-        this.terminalClient = terminalClient;
-        this.terminalOptions = terminalClient.options;
-        this.bindTerminalClientEvent();
-        this.taskStatus = TaskStatus.PROCESS_RUNNING;
-        this.pid = await ((_a = this.terminalClient) === null || _a === void 0 ? void 0 : _a.pid);
-        this.processReady.resolve();
-        this._onDidTerminalCreated.fire(terminalClient.id);
-        return this.exitDefer.promise;
-    }
-    async execute(task, reuse) {
-        var _a, _b, _c, _d, _e;
-        this.taskStatus = TaskStatus.PROCESS_READY;
-        await this.createTerminal(reuse);
-        (_a = this.terminalClient) === null || _a === void 0 ? void 0 : _a.term.writeln(`\x1b[3m> Executing task: ${task._label} <\x1b[0m\n`);
-        const { shellArgs } = this.terminalOptions;
-        // extensionTerminal 由插件自身接管，不需要执行和输出 Command
-        if (!this.terminalOptions.isExtensionTerminal && shellArgs) {
-            (_b = this.terminalClient) === null || _b === void 0 ? void 0 : _b.term.writeln(`\x1b[3m> Command: ${typeof shellArgs === 'string' ? shellArgs : shellArgs[1]} <\x1b[0m\n`);
-        }
-        await ((_c = this.terminalClient) === null || _c === void 0 ? void 0 : _c.attached.promise);
-        this.taskStatus = TaskStatus.PROCESS_RUNNING;
-        this.pid = await ((_d = this.terminalClient) === null || _d === void 0 ? void 0 : _d.pid);
-        this.processReady.resolve();
-        (_e = this.terminalClient) === null || _e === void 0 ? void 0 : _e.term.write('\n\x1b[G');
-        return this.exitDefer.promise;
-    }
-    get processId() {
-        return this.pid;
-    }
-    get terminalId() {
-        return this.terminalClient && this.terminalClient.id;
-    }
-    get widgetId() {
-        return this.terminalClient && this.terminalClient.widget.id;
-    }
-    updateTerminalOptions(terminalOptions) {
-        this.terminalOptions = terminalOptions;
-    }
-    updateProblemCollector(collector) {
-        this.collector = collector;
-    }
-    reset() {
-        this.disposableCollection.dispose();
-        this.taskStatus = TaskStatus.PROCESS_INIT;
-        this.exitDefer = new ide_core_common_1.Deferred();
-    }
-};
-tslib_1.__decorate([
-    (0, di_1.Autowired)(common_1.ITerminalGroupViewService),
-    tslib_1.__metadata("design:type", Object)
-], TerminalTaskExecutor.prototype, "terminalView", void 0);
-tslib_1.__decorate([
-    (0, di_1.Autowired)(common_1.ITerminalController),
-    tslib_1.__metadata("design:type", Object)
-], TerminalTaskExecutor.prototype, "terminalController", void 0);
-tslib_1.__decorate([
-    (0, di_1.Autowired)(common_1.ITerminalService),
-    tslib_1.__metadata("design:type", Object)
-], TerminalTaskExecutor.prototype, "terminalService", void 0);
-TerminalTaskExecutor = tslib_1.__decorate([
-    (0, di_1.Injectable)({ multiple: true }),
-    tslib_1.__metadata("design:paramtypes", [Object, Object, problem_collector_1.ProblemCollector, Number])
-], TerminalTaskExecutor);
-exports.TerminalTaskExecutor = TerminalTaskExecutor;
 let TerminalTaskSystem = class TerminalTaskSystem extends ide_core_common_1.Disposable {
     constructor() {
         super(...arguments);
@@ -291,15 +66,15 @@ let TerminalTaskSystem = class TerminalTaskSystem extends ide_core_common_1.Disp
                 result.push(await this.resolveVariable(arg));
             }
         }
-        return { shellArgs: ['-c', `${result.join(' ')}`] };
+        return { args: ['-c', `${result.join(' ')}`] };
     }
     findAvailableExecutor() {
-        return this.taskExecutors.find((e) => e.taskStatus === TaskStatus.PROCESS_EXITED);
+        return this.taskExecutors.find((e) => e.taskStatus === task_executor_1.TaskStatus.PROCESS_EXITED);
     }
-    async createTaskExecutor(task, options) {
+    async createTaskExecutor(task, launchConfig) {
         const matchers = await this.resolveMatchers(task.configurationProperties.problemMatchers);
         const collector = new problem_collector_1.ProblemCollector(matchers);
-        const executor = this.injector.get(TerminalTaskExecutor, [task, options, collector, this.executorId]);
+        const executor = this.injector.get(task_executor_1.TerminalTaskExecutor, [task, launchConfig, collector, this.executorId]);
         this.executorId += 1;
         this.taskExecutors.push(executor);
         this.addDispose(executor.onDidTerminalWidgetRemove(() => {
@@ -308,8 +83,9 @@ let TerminalTaskSystem = class TerminalTaskSystem extends ide_core_common_1.Disp
         return executor;
     }
     async attachTask(task, terminalClient) {
-        const taskExecutor = await this.createTaskExecutor(task, terminalClient.options);
+        const taskExecutor = await this.createTaskExecutor(task, terminalClient.launchConfig);
         const p = taskExecutor.attach(terminalClient);
+        this.lastTask = task;
         return {
             task,
             kind: 1 /* Started */,
@@ -322,25 +98,27 @@ let TerminalTaskSystem = class TerminalTaskSystem extends ide_core_common_1.Disp
         const isCustomExecution = task.command && task.command.runtime === task_1.RuntimeType.CustomExecution;
         const matchers = await this.resolveMatchers(task.configurationProperties.problemMatchers);
         const collector = new problem_collector_1.ProblemCollector(matchers);
-        const { shellArgs } = await this.buildShellConfig(task.command);
-        const terminalOptions = {
+        const { args } = await this.buildShellConfig(task.command);
+        const launchConfig = {
             name: this.createTerminalName(task),
-            shellArgs,
-            isExtensionTerminal: isCustomExecution,
+            args,
+            isExtensionOwnedTerminal: isCustomExecution,
             env: ((_a = task.command.options) === null || _a === void 0 ? void 0 : _a.env) || {},
             cwd: ((_b = task.command.options) === null || _b === void 0 ? void 0 : _b.cwd)
                 ? await this.resolveVariable((_c = task.command.options) === null || _c === void 0 ? void 0 : _c.cwd)
                 : await this.resolveVariable('${workspaceFolder}'),
+            // 不需要历史记录
+            disablePreserveHistory: true,
         };
         let executor = this.findAvailableExecutor();
         let reuse = false;
         if (!executor) {
-            executor = await this.createTaskExecutor(task, terminalOptions);
+            executor = await this.createTaskExecutor(task, launchConfig);
         }
         else {
             reuse = true;
             executor.updateProblemCollector(collector);
-            executor.updateTerminalOptions(terminalOptions);
+            executor.updateLaunchConfig(launchConfig);
             executor.reset();
         }
         if (reuse) {
@@ -372,6 +150,7 @@ let TerminalTaskSystem = class TerminalTaskSystem extends ide_core_common_1.Disp
         this._onDidStateChange.fire(task_1.TaskEvent.create("active" /* Active */, task));
         await executor.processReady.promise;
         this._onDidStateChange.fire(task_1.TaskEvent.create("processStarted" /* ProcessStarted */, task, executor.processId));
+        this.lastTask = task;
         return {
             task,
             kind: 1 /* Started */,
@@ -451,8 +230,8 @@ let TerminalTaskSystem = class TerminalTaskSystem extends ide_core_common_1.Disp
         this.activeTaskExecutors.delete(key);
         return { task, success };
     }
-    rerun() {
-        throw new Error('Method not implemented.');
+    async rerun() {
+        return this.lastTask && (await this.executeTask(this.lastTask));
     }
     isActive() {
         throw new Error('Method not implemented.');

package/lib/browser/terminal-task-system.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-task-system.js","sourceRoot":"","sources":["../../src/browser/terminal-task-system.ts"],"names":[],"mappings":";;;;AAAA,qCAA+E;AAC/E,+DAemC;AACnC,mEAMgD;AAChD,yDAAkE;AAUlE,yCAQwB;AAGxB,2DAAuD;AAEvD,MAAM,EAAE,SAAS,EAAE,GAAG,yBAAO,CAAC;AAC9B,MAAM,EAAE,qBAAqB,EAAE,GAAG,yBAAO,CAAC;AAC1C,MAAM,EAAE,IAAI,EAAE,GAAG,sBAAI,CAAC;AAEtB,IAAK,UAKJ;AALD,WAAK,UAAU;IACb,2DAAY,CAAA;IACZ,6DAAa,CAAA;IACb,iEAAe,CAAA;IACf,+DAAc,CAAA;AAChB,CAAC,EALI,UAAU,KAAV,UAAU,QAKd;AAED,SAAS,aAAa,CAAC,CAAC,EAAE,CAAC;IACzB,OAAO,CACL,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI;QAC7B,CAAC,CAAC,KAAK,CAAC,SAAS,KAAK,CAAC,CAAC,KAAK,CAAC,SAAS;QACvC,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,GAAG,CAAC,IAAI;QACzB,CAAC,CAAC,GAAG,CAAC,SAAS,KAAK,CAAC,CAAC,GAAG,CAAC,SAAS,CACpC,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,CAAkC,EAAE,CAAkC;;IAC9F,OAAO,CACL,CAAA,MAAA,CAAC,CAAC,QAAQ,0CAAE,QAAQ,EAAE,OAAK,MAAA,CAAC,CAAC,QAAQ,0CAAE,QAAQ,EAAE,CAAA;QACjD,CAAC,CAAC,WAAW,CAAC,KAAK,KAAK,CAAC,CAAC,WAAW,CAAC,KAAK;QAC3C,CAAC,CAAC,WAAW,CAAC,QAAQ,KAAK,CAAC,CAAC,WAAW,CAAC,QAAQ;QACjD,CAAC,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC,WAAW,CAAC,MAAM;QAC7C,CAAC,CAAsB,aAAtB,CAAC,uBAAD,CAAC,CAAuB,MAAM,CAAC,IAAI,OAAM,CAAsB,aAAtB,CAAC,uBAAD,CAAC,CAAuB,MAAM,CAAC,IAAI,CAAA;QAC7E,CAAC,CAAsB,aAAtB,CAAC,uBAAD,CAAC,CAAuB,MAAM,CAAC,OAAO,OAAM,CAAsB,aAAtB,CAAC,uBAAD,CAAC,CAAuB,MAAM,CAAC,OAAO,CAAA;QACnF,CAAC,CAAsB,aAAtB,CAAC,uBAAD,CAAC,CAAuB,MAAM,CAAC,MAAM,OAAM,CAAsB,aAAtB,CAAC,uBAAD,CAAC,CAAuB,MAAM,CAAC,MAAM,CAAA;QACjF,aAAa,CAAE,CAAsB,CAAC,MAAM,CAAC,KAAK,EAAG,CAAsB,CAAC,MAAM,CAAC,KAAK,CAAC,CAC1F,CAAC;AACJ,CAAC;AAGD,IAAa,oBAAoB,GAAjC,MAAa,oBAAqB,SAAQ,4BAAU;IA6ClD,YACU,IAAU,EACV,eAAgC,EAChC,SAA2B,EAC5B,UAAkB;QAEzB,KAAK,EAAE,CAAC;QALA,SAAI,GAAJ,IAAI,CAAM;QACV,oBAAe,GAAf,eAAe,CAAiB;QAChC,cAAS,GAAT,SAAS,CAAkB;QAC5B,eAAU,GAAV,UAAU,CAAQ;QAnCnB,cAAS,GAAoC,IAAI,0BAAQ,EAAE,CAAC;QAE5D,0BAAqB,GAAoB,IAAI,yBAAO,EAAE,CAAC;QAEvD,0BAAqB,GAAgC,IAAI,yBAAO,EAAE,CAAC;QAEnE,8BAAyB,GAAkB,IAAI,yBAAO,EAAE,CAAC;QAC1D,6BAAwB,GAAgB,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC;QAE5E,4BAAuB,GAAkB,IAAI,yBAAO,EAAE,CAAC;QACxD,2BAAsB,GAAgB,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC;QAExE,yBAAoB,GAA4B,IAAI,yBAAO,EAAE,CAAC;QAC/D,wBAAmB,GAA0B,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC;QAE5E,+BAA0B,GAAkB,IAAI,yBAAO,EAAE,CAAC;QAE3D,yBAAoB,GAAkB,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC;QAEvE,8BAAyB,GAAgB,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC;QAE/E,yBAAoB,GAA8B,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC;QAEnF,iBAAY,GAAmB,IAAI,0BAAQ,EAAQ,CAAC;QAEnD,kBAAa,GAAG,KAAK,CAAC;QAEtB,yBAAoB,GAAyB,IAAI,sCAAoB,EAAE,CAAC;QAEzE,eAAU,GAAe,UAAU,CAAC,YAAY,CAAC;QAUtD,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,EAAE;YACvC,IAAI,IAAI,CAAC,cAAc,IAAI,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE;gBAC1D,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,CAAC;aACxC;QACH,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,SAAS;QACP,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,IAAI,IAAI,CAAC,cAAc,EAAE;gBACvB,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;gBAC9B,IAAI,IAAI,CAAC,aAAa,EAAE;oBACtB,iDAAiD;oBACjD,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;oBACvD,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;iBAC5B;qBAAM;oBACL,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;;wBAChC,IAAI,CAAC,CAAC,SAAS,MAAK,MAAA,IAAI,CAAC,cAAc,0CAAE,EAAE,CAAA,EAAE;4BAC3C,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;4BACvD,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;yBAC5B;oBACH,CAAC,CAAC,CAAC;iBACJ;aACF;iBAAM;gBACL,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;aAC5B;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,UAAU,CAAC,IAAa;QAC9B,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,cAAe,CAAC;QAC1C,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,OAAO,CAAC,IAAA,gCAAc,EAAC,oCAAoC,EAAE,IAAI,CAAC,CAAC,CAAC;QACzE,IAAI,CAAC,OAAO,CAAC,cAAc,IAAA,gCAAc,EAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACrE,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAC5B,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QACrC,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAEO,uBAAuB;;QAC7B,IAAI,CAAC,UAAU,CACb,CAAA,MAAA,IAAI,CAAC,cAAc,0CAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE;YAClC,MAAM,MAAM,GAAG,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACxD,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACzD,IAAI,OAAO,EAAE;gBACX,IAAI,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAAC;aACvC;YAED,4BAA4B;YAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YACtD,MAAM,aAAa,GAAmB,EAAE,CAAC;YACzC,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;gBACrB,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBAC9C,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;oBACjC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;wBAC5B,MAAM,QAAQ,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;wBAC7E,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE;4BACnB,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;yBAC5B;qBACF;iBACF;aACF;YAED,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC5B,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;aAC/C;YAED,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;YACrD,IAAI,KAAK,EAAE;gBACT,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC;aACrC;QACH,CAAC,CAAC,KAAI,4BAAU,CAAC,IAAI,CACtB,CAAC;QAEF,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAC5B,CAAA,MAAA,IAAI,CAAC,cAAc,0CAAE,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;;YACtC,IAAI,CAAC,CAAC,EAAE,MAAK,MAAA,IAAI,CAAC,cAAc,0CAAE,EAAE,CAAA,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,CAAC,cAAc,EAAE;gBACrF,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBACxB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;gBAC1B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,cAAc,CAAC;gBAC5C,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;aAC9C;QACH,CAAC,CAAC,KAAI,4BAAU,CAAC,IAAI,CACtB,CAAC;QAEF,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAC5B,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;;YACtC,IAAI,CAAC,CAAC,SAAS,MAAK,MAAA,IAAI,CAAC,cAAc,0CAAE,EAAE,CAAA,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,CAAC,cAAc,EAAE;gBAC5F,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;gBAChC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBACxB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;gBAC1B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,cAAc,CAAC;gBAC5C,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;aAC9C;QACH,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,KAAe;QAC1C,IAAI,KAAK,IAAI,IAAI,CAAC,cAAc,EAAE;YAChC,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACxD,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;SAC7B;aAAM;YACL,IAAI,CAAC,cAAc,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,uBAAuB,CAAC;gBAC1E,eAAe,EAAE,IAAI,CAAC,eAAe;gBACrC,eAAe,EAAE,KAAK;gBACtB,cAAc,EAAE,IAAI;gBACpB,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG;gBACrB,YAAY,EAAE,CAAC,UAAU,EAAE,EAAE;oBAC3B,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAC9C,CAAC;aACF,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,CAAC;QAC5C,IAAI,CAAC,uBAAuB,EAAE,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,cAA+B;;QAC1C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC;QAC3C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC,OAAO,CAAC;QAC9C,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,eAAe,CAAC;QAC7C,IAAI,CAAC,GAAG,GAAG,MAAM,CAAA,MAAA,IAAI,CAAC,cAAc,0CAAE,GAAG,CAAA,CAAC;QAC1C,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QAE5B,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QAEnD,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAU,EAAE,KAAe;;QACvC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC;QAE3C,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAEjC,MAAA,IAAI,CAAC,cAAc,0CAAE,IAAI,CAAC,OAAO,CAAC,4BAA4B,IAAI,CAAC,MAAM,aAAa,CAAC,CAAC;QACxF,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC;QAE3C,6CAA6C;QAC7C,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,mBAAmB,IAAI,SAAS,EAAE;YAC1D,MAAA,IAAI,CAAC,cAAc,0CAAE,IAAI,CAAC,OAAO,CAC/B,qBAAqB,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAC3F,CAAC;SACH;QAED,MAAM,CAAA,MAAA,IAAI,CAAC,cAAc,0CAAE,QAAQ,CAAC,OAAO,CAAA,CAAC;QAC5C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,eAAe,CAAC;QAC7C,IAAI,CAAC,GAAG,GAAG,MAAM,CAAA,MAAA,IAAI,CAAC,cAAc,0CAAE,GAAG,CAAA,CAAC;QAC1C,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QAC5B,MAAA,IAAI,CAAC,cAAc,0CAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC5C,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;IAChC,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;IACvD,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;IAC9D,CAAC;IAEM,qBAAqB,CAAC,eAAgC;QAC3D,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;IAEM,sBAAsB,CAAC,SAA2B;QACvD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC;QACpC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC;QAC1C,IAAI,CAAC,SAAS,GAAG,IAAI,0BAAQ,EAAE,CAAC;IAClC,CAAC;CACF,CAAA;AA5OC;IADC,IAAA,cAAS,EAAC,kCAAyB,CAAC;;0DACsB;AAG3D;IADC,IAAA,cAAS,EAAC,4BAAmB,CAAC;;gEAC4B;AAG3D;IADC,IAAA,cAAS,EAAC,yBAAgB,CAAC;;6DACyB;AAR1C,oBAAoB;IADhC,IAAA,eAAU,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;6DAiDR,oCAAgB;GAhD1B,oBAAoB,CA8OhC;AA9OY,oDAAoB;AAiPjC,IAAa,kBAAkB,GAA/B,MAAa,kBAAmB,SAAQ,4BAAU;IAAlD;;QAUU,eAAU,GAAG,CAAC,CAAC;QAIf,wBAAmB,GAA2C,IAAI,GAAG,EAAE,CAAC;QAExE,sBAAiB,GAAuB,IAAI,yBAAO,EAAE,CAAC;QAEtD,8BAAyB,GAAuB,IAAI,yBAAO,EAAE,CAAC;QAE9D,8BAAyB,GAAuB,IAAI,yBAAO,EAAE,CAAC;QAE9D,yBAAoB,GAAuB,IAAI,yBAAO,EAAE,CAAC;QAEzD,kBAAa,GAA2B,EAAE,CAAC;QAEnD,qBAAgB,GAAqB,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;QAClE,6BAAwB,GAAqB,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC;QAClF,6BAAwB,GAAqB,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC;QAClF,wBAAmB,GAAqB,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC;IA8Q1E,CAAC;IA5QC,GAAG,CAAC,IAAkC;QACpC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,IAAkC,EAAE,cAA+B;QACxE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC/C,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,OAA6B;QAC1D,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;QACjC,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;QACjC,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,IAAI,WAAW,EAAE;YACf,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;gBACnC,UAAU,GAAG,WAAW,CAAC;aAC1B;iBAAM;gBACL,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC;aAChC;SACF;QAED,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEzB,IAAI,WAAW,EAAE;YACf,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE;gBAC7B,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;oBAC3B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iBACnB;qBAAM;oBACL,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;iBACzB;aACF;SACF;QAED,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE;YACzB,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE;gBACpC,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;aACrE;iBAAM;gBACL,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;aAC9C;SACF;QACD,OAAO,EAAE,SAAS,EAAE,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;IACtD,CAAC;IAEO,qBAAqB;QAC3B,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU,CAAC,cAAc,CAAC,CAAC;IACpF,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,IAAkC,EAAE,OAAwB;QAC3F,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,uBAAuB,CAAC,eAAe,CAAC,CAAC;QAC1F,MAAM,SAAS,GAAG,IAAI,oCAAgB,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QACtG,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClC,IAAI,CAAC,UAAU,CACb,QAAQ,CAAC,yBAAyB,CAAC,GAAG,EAAE;YACtC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC9F,CAAC,CAAC,CACH,CAAC;QAEF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,UAAU,CACtB,IAAkC,EAClC,cAA+B;QAE/B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;QACjF,MAAM,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAC9C,OAAO;YACL,IAAI;YACJ,IAAI,iBAAyB;YAC7B,OAAO,EAAE,CAAC;SACX,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,IAAkC;;QAC1D,kBAAkB;QAClB,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,kBAAW,CAAC,eAAe,CAAC;QAE/F,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,uBAAuB,CAAC,eAAe,CAAC,CAAC;QAC1F,MAAM,SAAS,GAAG,IAAI,oCAAgB,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEhE,MAAM,eAAe,GAAoB;YACvC,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC;YACnC,SAAS;YACT,mBAAmB,EAAE,iBAAiB;YACtC,GAAG,EAAE,CAAA,MAAA,IAAI,CAAC,OAAO,CAAC,OAAO,0CAAE,GAAG,KAAI,EAAE;YACpC,GAAG,EAAE,CAAA,MAAA,IAAI,CAAC,OAAO,CAAC,OAAO,0CAAE,GAAG;gBAC5B,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,MAAA,IAAI,CAAC,OAAO,CAAC,OAAO,0CAAE,GAAG,CAAC;gBACvD,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC;SACrD,CAAC;QAEF,IAAI,QAAQ,GAAqC,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC9E,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,IAAI,CAAC,QAAQ,EAAE;YACb,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;SACjE;aAAM;YACL,KAAK,GAAG,IAAI,CAAC;YACb,QAAQ,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;YAC3C,QAAQ,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAC;YAChD,QAAQ,CAAC,KAAK,EAAE,CAAC;SAClB;QAED,IAAI,KAAK,EAAE;YACT,gDAAgD;YAChD,kEAAkE;YAClE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,gBAAS,CAAC,MAAM,sBAAsB,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;SAC/F;aAAM;YACL,IAAI,CAAC,UAAU,CACb,QAAQ,CAAC,oBAAoB,CAAC,CAAC,UAAU,EAAE,EAAE;gBAC3C,yDAAyD;gBACzD,sEAAsE;gBACtE,uCAAuC;gBACvC,0CAA0C;gBAC1C,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,gBAAS,CAAC,MAAM,sBAAsB,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;YACvF,CAAC,CAAC,CACH,CAAC;SACH;QAED,IAAI,CAAC,KAAK,EAAE;YACV,IAAI,CAAC,UAAU,CACb,QAAQ,CAAC,oBAAoB,CAAC,CAAC,IAAI,EAAE,EAAE;gBACrC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,gBAAS,CAAC,MAAM,oCAA6B,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;gBACtF,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,gBAAS,CAAC,MAAM,kBAAoB,IAAI,CAAC,CAAC,CAAC;YACzE,CAAC,CAAC,CACH,CAAC;YACF,IAAI,CAAC,UAAU,CACb,QAAQ,CAAC,wBAAwB,CAAC,GAAG,EAAE,CACrC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,gBAAS,CAAC,MAAM,kDAAoC,IAAI,CAAC,CAAC,CAC/F,CACF,CAAC;YACF,IAAI,CAAC,UAAU,CACb,QAAQ,CAAC,sBAAsB,CAAC,GAAG,EAAE,CACnC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,gBAAS,CAAC,MAAM,kDAAoC,IAAI,CAAC,CAAC,CAC/F,CACF,CAAC;YACF,IAAI,CAAC,UAAU,CACb,QAAQ,CAAC,mBAAmB,CAAC,CAAC,QAAQ,EAAE,EAAE,CACxC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,gBAAS,CAAC,MAAM,wCAA+B,IAAI,EAAE,QAAQ,CAAC,CAAC,CAC/F,CACF,CAAC;SACH;QAED,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAE7C,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAChC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC3F,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,gBAAS,CAAC,MAAM,wBAAuB,IAAI,CAAC,CAAC,CAAC;QAC1E,MAAM,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC;QAEpC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,gBAAS,CAAC,MAAM,wCAA+B,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;QACtG,OAAO;YACL,IAAI;YACJ,IAAI,iBAAyB;YAC7B,OAAO,EAAE,MAAM;SAChB,CAAC;IACJ,CAAC;IAEO,kBAAkB,CAAC,IAAkC;QAC3D,OAAO,IAAA,gCAAc,EACnB,iCAAiC,EACjC,IAAI,CAAC,iBAAiB,EAAE,IAAI,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAC9D,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,KAAe;QAC5C,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;SAC/C;QACD,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACrC,CAAC;IAIO,KAAK,CAAC,eAAe,CAAC,KAAgC;QAC5D,IAAI,IAAA,0BAAQ,EAAC,KAAK,CAAC,EAAE;YACnB,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAS,KAAK,CAAC,CAAC;SAC3D;aAAM,IAAI,KAAK,KAAK,SAAS,EAAE;YAC9B,OAAO;gBACL,KAAK,EAAE,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAS,KAAK,CAAC,KAAK,CAAC;gBAC/D,OAAO,EAAE,KAAK,CAAC,OAAO;aACvB,CAAC;SACH;aAAM;YACL,2BAA2B;YAC3B,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;SAC3D;IACH,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,MAAkD;QAC9E,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YAClE,OAAO,EAAE,CAAC;SACX;QACD,MAAM,MAAM,GAAqB,EAAE,CAAC;QACpC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,IAAI,OAAmC,CAAC;YACxC,IAAI,IAAA,0BAAQ,EAAC,KAAK,CAAC,EAAE;gBACnB,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;oBAC5B,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;iBACvD;qBAAM;oBACL,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;iBAC1C;aACF;iBAAM;gBACL,OAAO,GAAG,KAAK,CAAC;aACjB;YACD,IAAI,CAAC,OAAO,EAAE;gBACZ,SAAS;aACV;YACD,MAAM,aAAa,GAAG,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC;YACvD,IAAI,CAAC,aAAa,EAAE;gBAClB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACtB;iBAAM;gBACL,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;gBAChC,IAAI,aAAa,EAAE;oBACjB,IAAI,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;iBAC/D;gBACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnB;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,cAAc;QACZ,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC1E,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAU;QACxB,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAC7B,MAAM,cAAc,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACzD,IAAI,CAAC,cAAc,EAAE;YACnB,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAC5D;QACD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,cAAc,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;QAC9D,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACrC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK;QACH,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,QAAQ;QACN,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,YAAY;QACV,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,YAAY;QACV,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,gBAAgB;QACd,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,YAAY;QACV,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,UAAU,CAAC,IAAmC;QAC5C,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,uBAAuB,CAAC,IAAmC,EAAE,MAAc;QACzE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;CACF,CAAA;AAzSC;IADC,IAAA,cAAS,EAAC,mBAAc,CAAC;sCACC,aAAQ;oDAAC;AAGpC;IADC,IAAA,cAAS,EAAC,yCAAuB,CAAC;;0DACK;AAGxC;IADC,IAAA,cAAS,EAAC,uCAAwB,CAAC;;4DACO;AARhC,kBAAkB;IAD9B,IAAA,eAAU,GAAE;GACA,kBAAkB,CA2S9B;AA3SY,gDAAkB"}
+{"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

@@ -1,12 +1,12 @@
 import { IJSONSchemaMap } from '@opensumi/ide-core-browser';
 import { IDisposable, Event, URI, TaskIdentifier, Uri, Deferred } from '@opensumi/ide-core-common';
 import { UriComponents } from '@opensumi/ide-editor';
-import { ITerminalClient, TerminalOptions } from '@opensumi/ide-terminal-next/lib/common';
+import { IShellLaunchConfig, ITerminalClient } from '@opensumi/ide-terminal-next/lib/common';
 import type { ProblemCollector } from '../browser/problem-collector';
 import { Task, ConfiguringTask, ContributedTask, TaskSet, KeyedTaskIdentifier, TaskEvent } from './task';
 interface TaskMap {
 }
-interface TaskFileter {
+interface TaskFilter {
     version?: string;
     type?: string;
 }
@@ -92,7 +92,7 @@ export interface ITaskExecutor {
     terminate(): Promise<{
         success: boolean;
     }>;
-    updateTerminalOptions(options: TerminalOptions): void;
+    updateLaunchConfig(launchConfig: IShellLaunchConfig): void;
     updateProblemCollector(collector: ProblemCollector): void;
     onDidTerminalWidgetRemove: Event<void>;
     onDidTaskProcessExit: Event<number | undefined>;
@@ -108,7 +108,7 @@ export interface ITaskSystem {
     onDidProblemMatched: Event<TaskEvent>;
     attach(task: Task | ConfiguringTask, terminalClient: ITerminalClient): Promise<ITaskExecuteResult>;
     run(task: Task | ConfiguringTask): Promise<ITaskExecuteResult>;
-    rerun(): ITaskExecuteResult | undefined;
+    rerun(): Promise<ITaskExecuteResult | undefined>;
     isActive(): Promise<boolean>;
     isActiveSync(): boolean;
     getActiveTasks(): Task[];
@@ -123,9 +123,10 @@ export interface ITaskService {
     attach(taskId: string, terminal: ITerminalClient): Promise<void>;
     run(task: Task | ConfiguringTask): Promise<ITaskSummary>;
     runTaskCommand(): void;
+    rerunLastTask(): void;
     updateWorkspaceTasks(tasks: TaskMap): void;
     registerTaskProvider(provider: ITaskProvider, type: string): IDisposable;
-    tasks(filter?: TaskFileter): Promise<Task[]>;
+    tasks(filter?: TaskFilter): Promise<Task[]>;
     getTask(workspaceFolder: Uri, identifier: string | TaskIdentifier, compareId?: boolean): Promise<Task | undefined>;
     terminateTask(key: string): Promise<void>;
     onDidStateChange: Event<TaskEvent>;

package/lib/common/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-task",
-  "version": "2.19.13",
+  "version": "2.20.1",
   "files": [
     "lib"
   ],
@@ -16,18 +16,18 @@
     "url": "git@github.com:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-core-common": "2.19.13",
-    "@opensumi/ide-core-node": "2.19.13",
-    "@opensumi/ide-terminal-next": "2.19.13"
+    "@opensumi/ide-core-common": "2.20.1",
+    "@opensumi/ide-core-node": "2.20.1",
+    "@opensumi/ide-terminal-next": "2.20.1"
   },
   "devDependencies": {
-    "@opensumi/ide-core-browser": "2.19.13",
+    "@opensumi/ide-core-browser": "2.20.1",
     "@opensumi/ide-dev-tool": "^1.3.1",
-    "@opensumi/ide-editor": "2.19.13",
-    "@opensumi/ide-output": "2.19.13",
-    "@opensumi/ide-preferences": "2.19.13",
-    "@opensumi/ide-variable": "2.19.13",
-    "@opensumi/ide-workspace": "2.19.13"
+    "@opensumi/ide-editor": "2.20.1",
+    "@opensumi/ide-output": "2.20.1",
+    "@opensumi/ide-preferences": "2.20.1",
+    "@opensumi/ide-variable": "2.20.1",
+    "@opensumi/ide-workspace": "2.20.1"
   },
-  "gitHead": "717b26ceabeab6ea1430fb74208c199876c2832d"
+  "gitHead": "04b2bbf2f279ccf1eba1a1f5c18238fe871db490"
 }