@theia/task 1.70.0-next.21 → 1.70.0-next.28
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-terminal-widget-manager.d.ts +6 -1
- package/lib/browser/task-terminal-widget-manager.d.ts.map +1 -1
- package/lib/browser/task-terminal-widget-manager.js +23 -1
- package/lib/browser/task-terminal-widget-manager.js.map +1 -1
- package/package.json +13 -12
- package/src/browser/task-terminal-widget-manager.ts +20 -2
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
import { ApplicationShell, WidgetOpenerOptions } from '@theia/core/lib/browser';
|
|
1
|
+
import { ApplicationShell, WidgetManager, WidgetOpenerOptions } from '@theia/core/lib/browser';
|
|
2
2
|
import { TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
|
|
3
3
|
import { TerminalWidgetFactoryOptions } from '@theia/terminal/lib/browser/terminal-widget-impl';
|
|
4
4
|
import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
|
|
5
5
|
import { TaskConfiguration, TaskWatcher, TaskServer, TaskInfo } from '../common';
|
|
6
6
|
import { TaskDefinitionRegistry } from './task-definition-registry';
|
|
7
7
|
import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
|
|
8
|
+
import { TerminalManagerFrontendViewContribution } from '@theia/terminal-manager/lib/browser/terminal-manager-frontend-view-contribution';
|
|
9
|
+
import { TerminalManagerPreferences } from '@theia/terminal-manager/lib/browser/terminal-manager-preferences';
|
|
8
10
|
export interface TaskTerminalWidget extends TerminalWidget {
|
|
9
11
|
readonly kind: 'task';
|
|
10
12
|
dedicated?: boolean;
|
|
@@ -32,6 +34,9 @@ export declare class TaskTerminalWidgetManager {
|
|
|
32
34
|
protected readonly taskWatcher: TaskWatcher;
|
|
33
35
|
protected readonly taskServer: TaskServer;
|
|
34
36
|
protected readonly workspaceService: WorkspaceService;
|
|
37
|
+
protected readonly preferences: TerminalManagerPreferences;
|
|
38
|
+
protected readonly widgetManager: WidgetManager;
|
|
39
|
+
protected readonly terminalManagerViewContribution: TerminalManagerFrontendViewContribution;
|
|
35
40
|
protected init(): void;
|
|
36
41
|
newTaskTerminal(factoryOptions: TerminalWidgetFactoryOptions): Promise<TerminalWidget>;
|
|
37
42
|
open(factoryOptions: TerminalWidgetFactoryOptions, openerOptions: TaskTerminalWidgetOpenerOptions): Promise<TerminalWidget>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-terminal-widget-manager.d.ts","sourceRoot":"","sources":["../../src/browser/task-terminal-widget-manager.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"task-terminal-widget-manager.d.ts","sourceRoot":"","sources":["../../src/browser/task-terminal-widget-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,9 @@ const task_definition_registry_1 = require("./task-definition-registry");
|
|
|
26
26
|
const workspace_service_1 = require("@theia/workspace/lib/browser/workspace-service");
|
|
27
27
|
const uri_1 = require("@theia/core/lib/common/uri");
|
|
28
28
|
const core_1 = require("@theia/core");
|
|
29
|
+
const terminal_manager_widget_1 = require("@theia/terminal-manager/lib/browser/terminal-manager-widget");
|
|
30
|
+
const terminal_manager_frontend_view_contribution_1 = require("@theia/terminal-manager/lib/browser/terminal-manager-frontend-view-contribution");
|
|
31
|
+
const terminal_manager_preferences_1 = require("@theia/terminal-manager/lib/browser/terminal-manager-preferences");
|
|
29
32
|
var TaskTerminalWidget;
|
|
30
33
|
(function (TaskTerminalWidget) {
|
|
31
34
|
function is(widget) {
|
|
@@ -109,7 +112,14 @@ let TaskTerminalWidgetManager = class TaskTerminalWidgetManager {
|
|
|
109
112
|
throw new Error('"taskConfig" must be included as part of the "option.taskInfo" if "isDedicated" is true');
|
|
110
113
|
}
|
|
111
114
|
const { isNew, widget } = await this.getWidgetToRunTask(factoryOptions, openerOptions);
|
|
112
|
-
|
|
115
|
+
const isTreeMode = this.preferences['terminal.grouping.mode'] === 'tree';
|
|
116
|
+
if (isNew && isTreeMode) {
|
|
117
|
+
const terminalManagerWidget = await this.widgetManager.getOrCreateWidget(terminal_manager_widget_1.TerminalManagerWidget.ID);
|
|
118
|
+
terminalManagerWidget.addTerminalToTasksPage(widget);
|
|
119
|
+
widget.resetTerminal();
|
|
120
|
+
await this.terminalManagerViewContribution.openView({ reveal: true });
|
|
121
|
+
}
|
|
122
|
+
else if (isNew) {
|
|
113
123
|
this.shell.addWidget(widget, { area: openerOptions.widgetOptions ? openerOptions.widgetOptions.area : 'bottom' });
|
|
114
124
|
widget.resetTerminal();
|
|
115
125
|
}
|
|
@@ -208,6 +218,18 @@ tslib_1.__decorate([
|
|
|
208
218
|
(0, inversify_1.inject)(workspace_service_1.WorkspaceService),
|
|
209
219
|
tslib_1.__metadata("design:type", workspace_service_1.WorkspaceService)
|
|
210
220
|
], TaskTerminalWidgetManager.prototype, "workspaceService", void 0);
|
|
221
|
+
tslib_1.__decorate([
|
|
222
|
+
(0, inversify_1.inject)(terminal_manager_preferences_1.TerminalManagerPreferences),
|
|
223
|
+
tslib_1.__metadata("design:type", Object)
|
|
224
|
+
], TaskTerminalWidgetManager.prototype, "preferences", void 0);
|
|
225
|
+
tslib_1.__decorate([
|
|
226
|
+
(0, inversify_1.inject)(browser_1.WidgetManager),
|
|
227
|
+
tslib_1.__metadata("design:type", browser_1.WidgetManager)
|
|
228
|
+
], TaskTerminalWidgetManager.prototype, "widgetManager", void 0);
|
|
229
|
+
tslib_1.__decorate([
|
|
230
|
+
(0, inversify_1.inject)(terminal_manager_frontend_view_contribution_1.TerminalManagerFrontendViewContribution),
|
|
231
|
+
tslib_1.__metadata("design:type", terminal_manager_frontend_view_contribution_1.TerminalManagerFrontendViewContribution)
|
|
232
|
+
], TaskTerminalWidgetManager.prototype, "terminalManagerViewContribution", void 0);
|
|
211
233
|
tslib_1.__decorate([
|
|
212
234
|
(0, inversify_1.postConstruct)(),
|
|
213
235
|
tslib_1.__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-terminal-widget-manager.js","sourceRoot":"","sources":["../../src/browser/task-terminal-widget-manager.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAiF;AACjF,
|
|
1
|
+
{"version":3,"file":"task-terminal-widget-manager.js","sourceRoot":"","sources":["../../src/browser/task-terminal-widget-manager.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,19 +1,20 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/task",
|
|
3
|
-
"version": "1.70.0-next.
|
|
3
|
+
"version": "1.70.0-next.28+afae867a5",
|
|
4
4
|
"description": "Theia - Task extension. This extension adds support for executing raw or terminal processes in the backend.",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.70.0-next.
|
|
7
|
-
"@theia/editor": "1.70.0-next.
|
|
8
|
-
"@theia/filesystem": "1.70.0-next.
|
|
9
|
-
"@theia/markers": "1.70.0-next.
|
|
10
|
-
"@theia/monaco": "1.70.0-next.
|
|
6
|
+
"@theia/core": "1.70.0-next.28+afae867a5",
|
|
7
|
+
"@theia/editor": "1.70.0-next.28+afae867a5",
|
|
8
|
+
"@theia/filesystem": "1.70.0-next.28+afae867a5",
|
|
9
|
+
"@theia/markers": "1.70.0-next.28+afae867a5",
|
|
10
|
+
"@theia/monaco": "1.70.0-next.28+afae867a5",
|
|
11
11
|
"@theia/monaco-editor-core": "1.96.302",
|
|
12
|
-
"@theia/process": "1.70.0-next.
|
|
13
|
-
"@theia/terminal": "1.70.0-next.
|
|
14
|
-
"@theia/
|
|
15
|
-
"@theia/
|
|
16
|
-
"@theia/
|
|
12
|
+
"@theia/process": "1.70.0-next.28+afae867a5",
|
|
13
|
+
"@theia/terminal": "1.70.0-next.28+afae867a5",
|
|
14
|
+
"@theia/terminal-manager": "1.70.0-next.28+afae867a5",
|
|
15
|
+
"@theia/userstorage": "1.70.0-next.28+afae867a5",
|
|
16
|
+
"@theia/variable-resolver": "1.70.0-next.28+afae867a5",
|
|
17
|
+
"@theia/workspace": "1.70.0-next.28+afae867a5",
|
|
17
18
|
"async-mutex": "^0.3.1",
|
|
18
19
|
"jsonc-parser": "^2.2.0",
|
|
19
20
|
"p-debounce": "^2.1.0",
|
|
@@ -58,5 +59,5 @@
|
|
|
58
59
|
"nyc": {
|
|
59
60
|
"extends": "../../configs/nyc.json"
|
|
60
61
|
},
|
|
61
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "afae867a5ffaa073d30c1c74296e595ea5e77d24"
|
|
62
63
|
}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
18
|
-
import { ApplicationShell, WidgetOpenerOptions } from '@theia/core/lib/browser';
|
|
18
|
+
import { ApplicationShell, WidgetManager, WidgetOpenerOptions } from '@theia/core/lib/browser';
|
|
19
19
|
import { TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
|
|
20
20
|
import { TerminalWidgetFactoryOptions } from '@theia/terminal/lib/browser/terminal-widget-impl';
|
|
21
21
|
import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
|
|
@@ -25,6 +25,9 @@ import { TaskDefinitionRegistry } from './task-definition-registry';
|
|
|
25
25
|
import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
|
|
26
26
|
import URI from '@theia/core/lib/common/uri';
|
|
27
27
|
import { nls } from '@theia/core';
|
|
28
|
+
import { TerminalManagerWidget } from '@theia/terminal-manager/lib/browser/terminal-manager-widget';
|
|
29
|
+
import { TerminalManagerFrontendViewContribution } from '@theia/terminal-manager/lib/browser/terminal-manager-frontend-view-contribution';
|
|
30
|
+
import { TerminalManagerPreferences } from '@theia/terminal-manager/lib/browser/terminal-manager-preferences';
|
|
28
31
|
|
|
29
32
|
export interface TaskTerminalWidget extends TerminalWidget {
|
|
30
33
|
readonly kind: 'task';
|
|
@@ -86,6 +89,15 @@ export class TaskTerminalWidgetManager {
|
|
|
86
89
|
@inject(WorkspaceService)
|
|
87
90
|
protected readonly workspaceService: WorkspaceService;
|
|
88
91
|
|
|
92
|
+
@inject(TerminalManagerPreferences)
|
|
93
|
+
protected readonly preferences: TerminalManagerPreferences;
|
|
94
|
+
|
|
95
|
+
@inject(WidgetManager)
|
|
96
|
+
protected readonly widgetManager: WidgetManager;
|
|
97
|
+
|
|
98
|
+
@inject(TerminalManagerFrontendViewContribution)
|
|
99
|
+
protected readonly terminalManagerViewContribution: TerminalManagerFrontendViewContribution;
|
|
100
|
+
|
|
89
101
|
@postConstruct()
|
|
90
102
|
protected init(): void {
|
|
91
103
|
this.taskWatcher.onTaskExit((event: TaskExitedEvent) => {
|
|
@@ -142,7 +154,13 @@ export class TaskTerminalWidgetManager {
|
|
|
142
154
|
}
|
|
143
155
|
|
|
144
156
|
const { isNew, widget } = await this.getWidgetToRunTask(factoryOptions, openerOptions);
|
|
145
|
-
|
|
157
|
+
const isTreeMode = this.preferences['terminal.grouping.mode'] === 'tree';
|
|
158
|
+
if (isNew && isTreeMode) {
|
|
159
|
+
const terminalManagerWidget = await this.widgetManager.getOrCreateWidget<TerminalManagerWidget>(TerminalManagerWidget.ID);
|
|
160
|
+
terminalManagerWidget.addTerminalToTasksPage(widget);
|
|
161
|
+
widget.resetTerminal();
|
|
162
|
+
await this.terminalManagerViewContribution.openView({ reveal: true });
|
|
163
|
+
} else if (isNew) {
|
|
146
164
|
this.shell.addWidget(widget, { area: openerOptions.widgetOptions ? openerOptions.widgetOptions.area : 'bottom' });
|
|
147
165
|
widget.resetTerminal();
|
|
148
166
|
} else {
|