@codingame/monaco-vscode-task-service-override 4.5.0 → 4.5.2
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/index.d.ts +1 -1
- package/package.json +2 -2
- package/vscode/src/vs/workbench/contrib/tasks/browser/abstractTaskService.js +348 -593
- package/vscode/src/vs/workbench/contrib/tasks/browser/runAutomaticTasks.js +20 -31
- package/vscode/src/vs/workbench/contrib/tasks/browser/task.contribution.js +73 -214
- package/vscode/src/vs/workbench/contrib/tasks/browser/taskQuickPick.js +37 -94
- package/vscode/src/vs/workbench/contrib/tasks/browser/taskService.js +4 -7
- package/vscode/src/vs/workbench/contrib/tasks/browser/taskTerminalStatus.js +18 -57
- package/vscode/src/vs/workbench/contrib/tasks/browser/tasksQuickAccess.js +15 -22
- package/vscode/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.js +178 -170
- package/vscode/src/vs/workbench/contrib/tasks/common/jsonSchemaCommon.js +67 -130
- package/vscode/src/vs/workbench/contrib/tasks/common/jsonSchema_v1.js +12 -35
- package/vscode/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.js +138 -257
- package/vscode/src/vs/workbench/contrib/tasks/common/problemMatcher.js +173 -246
- package/vscode/src/vs/workbench/contrib/tasks/common/taskConfiguration.js +93 -95
- package/vscode/src/vs/workbench/contrib/tasks/common/taskTemplates.js +5 -20
- package/task.d.ts +0 -5
|
@@ -21,26 +21,15 @@ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storag
|
|
|
21
21
|
import Severity$1 from 'vscode/vscode/vs/base/common/severity';
|
|
22
22
|
|
|
23
23
|
var TaskQuickPick_1;
|
|
24
|
+
const _moduleId = "vs/workbench/contrib/tasks/browser/taskQuickPick";
|
|
24
25
|
const QUICKOPEN_DETAIL_CONFIG = 'task.quickOpen.detail';
|
|
25
26
|
const QUICKOPEN_SKIP_CONFIG = 'task.quickOpen.skip';
|
|
26
27
|
function isWorkspaceFolder(folder) {
|
|
27
28
|
return 'uri' in folder;
|
|
28
29
|
}
|
|
29
|
-
const SHOW_ALL = ( localizeWithPath(
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
"Show All Tasks..."
|
|
33
|
-
));
|
|
34
|
-
const configureTaskIcon = registerIcon('tasks-list-configure', Codicon.gear, ( localizeWithPath(
|
|
35
|
-
'vs/workbench/contrib/tasks/browser/taskQuickPick',
|
|
36
|
-
'configureTaskIcon',
|
|
37
|
-
'Configuration icon in the tasks selection list.'
|
|
38
|
-
)));
|
|
39
|
-
const removeTaskIcon = registerIcon('tasks-remove', Codicon.close, ( localizeWithPath(
|
|
40
|
-
'vs/workbench/contrib/tasks/browser/taskQuickPick',
|
|
41
|
-
'removeTaskIcon',
|
|
42
|
-
'Icon for remove in the tasks selection list.'
|
|
43
|
-
)));
|
|
30
|
+
const SHOW_ALL = ( localizeWithPath(_moduleId, 0, "Show All Tasks..."));
|
|
31
|
+
const configureTaskIcon = registerIcon('tasks-list-configure', Codicon.gear, ( localizeWithPath(_moduleId, 1, 'Configuration icon in the tasks selection list.')));
|
|
32
|
+
const removeTaskIcon = registerIcon('tasks-remove', Codicon.close, ( localizeWithPath(_moduleId, 2, 'Icon for remove in the tasks selection list.')));
|
|
44
33
|
const runTaskStorageKey = 'runTaskStorageKey';
|
|
45
34
|
let TaskQuickPick = TaskQuickPick_1 = class TaskQuickPick extends Disposable {
|
|
46
35
|
constructor(_taskService, _configurationService, _quickInputService, _notificationService, _themeService, _dialogService, _storageService) {
|
|
@@ -66,7 +55,7 @@ let TaskQuickPick = TaskQuickPick_1 = class TaskQuickPick extends Disposable {
|
|
|
66
55
|
const configures = deepClone(task.configures);
|
|
67
56
|
delete configures['_key'];
|
|
68
57
|
delete configures['type'];
|
|
69
|
-
( Object.keys(configures)).forEach(key => label += `: ${configures[key]}`);
|
|
58
|
+
( (Object.keys(configures))).forEach(key => label += `: ${configures[key]}`);
|
|
70
59
|
return label;
|
|
71
60
|
}
|
|
72
61
|
return '';
|
|
@@ -88,11 +77,7 @@ let TaskQuickPick = TaskQuickPick_1 = class TaskQuickPick extends Disposable {
|
|
|
88
77
|
}
|
|
89
78
|
_createTaskEntry(task, extraButtons = []) {
|
|
90
79
|
const buttons = [
|
|
91
|
-
{ iconClass: ThemeIcon.asClassName(configureTaskIcon), tooltip: ( localizeWithPath(
|
|
92
|
-
'vs/workbench/contrib/tasks/browser/taskQuickPick',
|
|
93
|
-
'configureTask',
|
|
94
|
-
"Configure Task"
|
|
95
|
-
)) },
|
|
80
|
+
{ iconClass: ThemeIcon.asClassName(configureTaskIcon), tooltip: ( localizeWithPath(_moduleId, 3, "Configure Task")) },
|
|
96
81
|
...extraButtons
|
|
97
82
|
];
|
|
98
83
|
const entry = { label: TaskQuickPick_1.getTaskLabelWithIcon(task, this._guessTaskLabel(task)), description: this._taskService.getTaskDescription(task), task, detail: this._showDetail() ? task.configurationProperties.detail : undefined, buttons };
|
|
@@ -108,18 +93,9 @@ let TaskQuickPick = TaskQuickPick_1 = class TaskQuickPick extends Disposable {
|
|
|
108
93
|
});
|
|
109
94
|
}
|
|
110
95
|
_createTypeEntries(entries, types) {
|
|
111
|
-
entries.push({ type: 'separator', label: ( localizeWithPath(
|
|
112
|
-
'vs/workbench/contrib/tasks/browser/taskQuickPick',
|
|
113
|
-
'contributedTasks',
|
|
114
|
-
"contributed"
|
|
115
|
-
)) });
|
|
96
|
+
entries.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 4, "contributed")) });
|
|
116
97
|
types.forEach(type => {
|
|
117
|
-
entries.push({ label: `$(folder) ${type}`, task: type, ariaLabel: ( localizeWithPath(
|
|
118
|
-
'vs/workbench/contrib/tasks/browser/taskQuickPick',
|
|
119
|
-
'taskType',
|
|
120
|
-
"All {0} tasks",
|
|
121
|
-
type
|
|
122
|
-
)) });
|
|
98
|
+
entries.push({ label: `$(folder) ${type}`, task: type, ariaLabel: ( localizeWithPath(_moduleId, 5, "All {0} tasks", type)) });
|
|
123
99
|
});
|
|
124
100
|
entries.push({ label: SHOW_ALL, task: SHOW_ALL, alwaysShow: true });
|
|
125
101
|
}
|
|
@@ -182,33 +158,17 @@ let TaskQuickPick = TaskQuickPick_1 = class TaskQuickPick extends Disposable {
|
|
|
182
158
|
if (recentTasks.length > 0) {
|
|
183
159
|
const removeRecentButton = {
|
|
184
160
|
iconClass: ThemeIcon.asClassName(removeTaskIcon),
|
|
185
|
-
tooltip: ( localizeWithPath(
|
|
186
|
-
'vs/workbench/contrib/tasks/browser/taskQuickPick',
|
|
187
|
-
'removeRecent',
|
|
188
|
-
'Remove Recently Used Task'
|
|
189
|
-
))
|
|
161
|
+
tooltip: ( localizeWithPath(_moduleId, 6, 'Remove Recently Used Task'))
|
|
190
162
|
};
|
|
191
|
-
this._createEntriesForGroup(this._topLevelEntries, recentTasks, ( localizeWithPath(
|
|
192
|
-
'vs/workbench/contrib/tasks/browser/taskQuickPick',
|
|
193
|
-
'recentlyUsed',
|
|
194
|
-
'recently used'
|
|
195
|
-
)), [removeRecentButton]);
|
|
163
|
+
this._createEntriesForGroup(this._topLevelEntries, recentTasks, ( localizeWithPath(_moduleId, 7, 'recently used')), [removeRecentButton]);
|
|
196
164
|
}
|
|
197
165
|
if (configuredTasks.length > 0) {
|
|
198
166
|
if (dedupedConfiguredTasks.length > 0) {
|
|
199
|
-
this._createEntriesForGroup(this._topLevelEntries, dedupedConfiguredTasks, ( localizeWithPath(
|
|
200
|
-
'vs/workbench/contrib/tasks/browser/taskQuickPick',
|
|
201
|
-
'configured',
|
|
202
|
-
'configured'
|
|
203
|
-
)));
|
|
167
|
+
this._createEntriesForGroup(this._topLevelEntries, dedupedConfiguredTasks, ( localizeWithPath(_moduleId, 8, 'configured')));
|
|
204
168
|
}
|
|
205
169
|
}
|
|
206
170
|
if (defaultEntry && (configuredTasks.length === 0)) {
|
|
207
|
-
this._topLevelEntries.push({ type: 'separator', label: ( localizeWithPath(
|
|
208
|
-
'vs/workbench/contrib/tasks/browser/taskQuickPick',
|
|
209
|
-
'configured',
|
|
210
|
-
'configured'
|
|
211
|
-
)) });
|
|
171
|
+
this._topLevelEntries.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 8, 'configured')) });
|
|
212
172
|
this._topLevelEntries.push(defaultEntry);
|
|
213
173
|
}
|
|
214
174
|
if (extensionTaskTypes.length > 0) {
|
|
@@ -220,25 +180,17 @@ let TaskQuickPick = TaskQuickPick_1 = class TaskQuickPick extends Disposable {
|
|
|
220
180
|
const { confirmed } = await this._dialogService.confirm({
|
|
221
181
|
type: Severity$1.Warning,
|
|
222
182
|
message: ( localizeWithPath(
|
|
223
|
-
|
|
224
|
-
|
|
183
|
+
_moduleId,
|
|
184
|
+
9,
|
|
225
185
|
"Task detection for {0} tasks causes files in any workspace you open to be run as code. Enabling {0} task detection is a user setting and will apply to any workspace you open. \n\n Do you want to enable {0} task detection for all workspaces?",
|
|
226
186
|
selectedType
|
|
227
187
|
)),
|
|
228
|
-
cancelButton: ( localizeWithPath(
|
|
229
|
-
'vs/workbench/contrib/tasks/browser/taskQuickPick',
|
|
230
|
-
'TaskQuickPick.changeSettingNo',
|
|
231
|
-
"No"
|
|
232
|
-
))
|
|
188
|
+
cancelButton: ( localizeWithPath(_moduleId, 10, "No"))
|
|
233
189
|
});
|
|
234
190
|
if (confirmed) {
|
|
235
191
|
await this._configurationService.updateValue(`${selectedType}.autoDetect`, 'on');
|
|
236
|
-
await ( new Promise(resolve => setTimeout(() => resolve(), 100)));
|
|
237
|
-
return this.show(( localizeWithPath(
|
|
238
|
-
'vs/workbench/contrib/tasks/browser/taskQuickPick',
|
|
239
|
-
'TaskService.pickRunTask',
|
|
240
|
-
'Select the task to run'
|
|
241
|
-
)), undefined, selectedType);
|
|
192
|
+
await ( (new Promise(resolve => setTimeout(() => resolve(), 100))));
|
|
193
|
+
return this.show(( localizeWithPath(_moduleId, 11, 'Select the task to run')), undefined, selectedType);
|
|
242
194
|
}
|
|
243
195
|
return undefined;
|
|
244
196
|
}
|
|
@@ -325,17 +277,17 @@ let TaskQuickPick = TaskQuickPick_1 = class TaskQuickPick extends Disposable {
|
|
|
325
277
|
async _doPickerFirstLevel(picker, taskQuickPickEntries) {
|
|
326
278
|
picker.items = taskQuickPickEntries;
|
|
327
279
|
showWithPinnedItems(this._storageService, runTaskStorageKey, picker, true);
|
|
328
|
-
const firstLevelPickerResult = await ( new Promise(resolve => {
|
|
280
|
+
const firstLevelPickerResult = await ( (new Promise(resolve => {
|
|
329
281
|
Event.once(picker.onDidAccept)(async () => {
|
|
330
282
|
resolve(picker.selectedItems ? picker.selectedItems[0] : undefined);
|
|
331
283
|
});
|
|
332
|
-
}));
|
|
284
|
+
})));
|
|
333
285
|
return firstLevelPickerResult?.task;
|
|
334
286
|
}
|
|
335
287
|
async doPickerSecondLevel(picker, type, name) {
|
|
336
288
|
picker.busy = true;
|
|
337
289
|
if (type === SHOW_ALL) {
|
|
338
|
-
const items = ( (await this._taskService.tasks()).filter(t => !t.configurationProperties.hide).sort((a, b) => this._sorter.compare(a, b)).map(task => this._createTaskEntry(task)));
|
|
290
|
+
const items = ( ((await this._taskService.tasks()).filter(t => !t.configurationProperties.hide).sort((a, b) => this._sorter.compare(a, b)).map(task => this._createTaskEntry(task))));
|
|
339
291
|
items.push(...TaskQuickPick_1.allSettingEntries(this._configurationService));
|
|
340
292
|
picker.items = items;
|
|
341
293
|
}
|
|
@@ -345,11 +297,11 @@ let TaskQuickPick = TaskQuickPick_1 = class TaskQuickPick extends Disposable {
|
|
|
345
297
|
}
|
|
346
298
|
await picker.show();
|
|
347
299
|
picker.busy = false;
|
|
348
|
-
const secondLevelPickerResult = await ( new Promise(resolve => {
|
|
300
|
+
const secondLevelPickerResult = await ( (new Promise(resolve => {
|
|
349
301
|
Event.once(picker.onDidAccept)(async () => {
|
|
350
302
|
resolve(picker.selectedItems ? picker.selectedItems[0] : undefined);
|
|
351
303
|
});
|
|
352
|
-
}));
|
|
304
|
+
})));
|
|
353
305
|
return secondLevelPickerResult;
|
|
354
306
|
}
|
|
355
307
|
static allSettingEntries(configurationService) {
|
|
@@ -372,8 +324,8 @@ let TaskQuickPick = TaskQuickPick_1 = class TaskQuickPick extends Disposable {
|
|
|
372
324
|
if (configurationService.getValue(`${type}.autoDetect`) === 'off') {
|
|
373
325
|
return {
|
|
374
326
|
label: ( localizeWithPath(
|
|
375
|
-
|
|
376
|
-
|
|
327
|
+
_moduleId,
|
|
328
|
+
12,
|
|
377
329
|
"$(gear) {0} task detection is turned off. Enable {1} task detection...",
|
|
378
330
|
type[0].toUpperCase() + type.slice(1),
|
|
379
331
|
type
|
|
@@ -397,23 +349,14 @@ let TaskQuickPick = TaskQuickPick_1 = class TaskQuickPick extends Disposable {
|
|
|
397
349
|
taskQuickPickEntries.push({
|
|
398
350
|
type: 'separator'
|
|
399
351
|
}, {
|
|
400
|
-
label: ( localizeWithPath(
|
|
401
|
-
'vs/workbench/contrib/tasks/browser/taskQuickPick',
|
|
402
|
-
'TaskQuickPick.goBack',
|
|
403
|
-
'Go back ↩'
|
|
404
|
-
)),
|
|
352
|
+
label: ( localizeWithPath(_moduleId, 13, 'Go back ↩')),
|
|
405
353
|
task: null,
|
|
406
354
|
alwaysShow: true
|
|
407
355
|
});
|
|
408
356
|
}
|
|
409
357
|
else {
|
|
410
358
|
taskQuickPickEntries = [{
|
|
411
|
-
label: ( localizeWithPath(
|
|
412
|
-
'vs/workbench/contrib/tasks/browser/taskQuickPick',
|
|
413
|
-
'TaskQuickPick.noTasksForType',
|
|
414
|
-
'No {0} tasks found. Go back ↩',
|
|
415
|
-
type
|
|
416
|
-
)),
|
|
359
|
+
label: ( localizeWithPath(_moduleId, 14, 'No {0} tasks found. Go back ↩', type)),
|
|
417
360
|
task: null,
|
|
418
361
|
alwaysShow: true
|
|
419
362
|
}];
|
|
@@ -431,8 +374,8 @@ let TaskQuickPick = TaskQuickPick_1 = class TaskQuickPick extends Disposable {
|
|
|
431
374
|
const resolvedTask = await this._taskService.tryResolveTask(task);
|
|
432
375
|
if (!resolvedTask) {
|
|
433
376
|
this._notificationService.error(( localizeWithPath(
|
|
434
|
-
|
|
435
|
-
|
|
377
|
+
_moduleId,
|
|
378
|
+
15,
|
|
436
379
|
"There is no task provider registered for tasks of type \"{0}\".",
|
|
437
380
|
task.type
|
|
438
381
|
)));
|
|
@@ -440,14 +383,14 @@ let TaskQuickPick = TaskQuickPick_1 = class TaskQuickPick extends Disposable {
|
|
|
440
383
|
return resolvedTask;
|
|
441
384
|
}
|
|
442
385
|
};
|
|
443
|
-
TaskQuickPick = TaskQuickPick_1 = ( __decorate([
|
|
444
|
-
( __param(0, ITaskService)),
|
|
445
|
-
( __param(1, IConfigurationService)),
|
|
446
|
-
( __param(2, IQuickInputService)),
|
|
447
|
-
( __param(3, INotificationService)),
|
|
448
|
-
( __param(4, IThemeService)),
|
|
449
|
-
( __param(5, IDialogService)),
|
|
450
|
-
( __param(6, IStorageService))
|
|
451
|
-
], TaskQuickPick));
|
|
386
|
+
TaskQuickPick = TaskQuickPick_1 = ( (__decorate([
|
|
387
|
+
( (__param(0, ITaskService))),
|
|
388
|
+
( (__param(1, IConfigurationService))),
|
|
389
|
+
( (__param(2, IQuickInputService))),
|
|
390
|
+
( (__param(3, INotificationService))),
|
|
391
|
+
( (__param(4, IThemeService))),
|
|
392
|
+
( (__param(5, IDialogService))),
|
|
393
|
+
( (__param(6, IStorageService)))
|
|
394
|
+
], TaskQuickPick)));
|
|
452
395
|
|
|
453
396
|
export { QUICKOPEN_DETAIL_CONFIG, QUICKOPEN_SKIP_CONFIG, TaskQuickPick, configureTaskIcon, isWorkspaceFolder };
|
|
@@ -3,18 +3,15 @@ import { ExecutionEngine } from 'vscode/vscode/vs/workbench/contrib/tasks/common
|
|
|
3
3
|
import { AbstractTaskService } from './abstractTaskService.js';
|
|
4
4
|
import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
5
5
|
|
|
6
|
+
const _moduleId = "vs/workbench/contrib/tasks/browser/taskService";
|
|
6
7
|
class TaskService extends AbstractTaskService {
|
|
7
|
-
static { this.ProcessTaskSystemSupportMessage = ( localizeWithPath(
|
|
8
|
-
'vs/workbench/contrib/tasks/browser/taskService',
|
|
9
|
-
'taskService.processTaskSystem',
|
|
10
|
-
'Process task system is not support in the web.'
|
|
11
|
-
)); }
|
|
8
|
+
static { this.ProcessTaskSystemSupportMessage = ( localizeWithPath(_moduleId, 0, 'Process task system is not support in the web.')); }
|
|
12
9
|
_getTaskSystem() {
|
|
13
10
|
if (this._taskSystem) {
|
|
14
11
|
return this._taskSystem;
|
|
15
12
|
}
|
|
16
13
|
if (this.executionEngine !== ExecutionEngine.Terminal) {
|
|
17
|
-
throw new Error(TaskService.ProcessTaskSystemSupportMessage);
|
|
14
|
+
throw ( (new Error(TaskService.ProcessTaskSystemSupportMessage)));
|
|
18
15
|
}
|
|
19
16
|
this._taskSystem = this._createTerminalTaskSystem();
|
|
20
17
|
this._taskSystemListeners =
|
|
@@ -27,7 +24,7 @@ class TaskService extends AbstractTaskService {
|
|
|
27
24
|
return this._taskSystem;
|
|
28
25
|
}
|
|
29
26
|
_computeLegacyConfiguration(workspaceFolder) {
|
|
30
|
-
throw new Error(TaskService.ProcessTaskSystemSupportMessage);
|
|
27
|
+
throw ( (new Error(TaskService.ProcessTaskSystemSupportMessage)));
|
|
31
28
|
}
|
|
32
29
|
_versionAndEngineCompatible(filter) {
|
|
33
30
|
return this.executionEngine === ExecutionEngine.Terminal;
|
|
@@ -10,57 +10,22 @@ import { spinningLoading } from 'vscode/vscode/vs/platform/theme/common/iconRegi
|
|
|
10
10
|
import { AccessibilitySignal } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
|
|
11
11
|
import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
|
|
12
12
|
|
|
13
|
+
const _moduleId = "vs/workbench/contrib/tasks/browser/taskTerminalStatus";
|
|
13
14
|
const TASK_TERMINAL_STATUS_ID = 'task_terminal_status';
|
|
14
|
-
const ACTIVE_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: spinningLoading, severity: Severity$1.Info, tooltip: ( localizeWithPath(
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
)) };
|
|
19
|
-
const
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
)) };
|
|
24
|
-
const SUCCEEDED_INACTIVE_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.check, severity: Severity$1.Info, tooltip: ( localizeWithPath(
|
|
25
|
-
'vs/workbench/contrib/tasks/browser/taskTerminalStatus',
|
|
26
|
-
'taskTerminalStatus.succeededInactive',
|
|
27
|
-
"Task succeeded and waiting..."
|
|
28
|
-
)) };
|
|
29
|
-
const FAILED_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.error, severity: Severity$1.Error, tooltip: ( localizeWithPath(
|
|
30
|
-
'vs/workbench/contrib/tasks/browser/taskTerminalStatus',
|
|
31
|
-
'taskTerminalStatus.errors',
|
|
32
|
-
"Task has errors"
|
|
33
|
-
)) };
|
|
34
|
-
const FAILED_INACTIVE_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.error, severity: Severity$1.Error, tooltip: ( localizeWithPath(
|
|
35
|
-
'vs/workbench/contrib/tasks/browser/taskTerminalStatus',
|
|
36
|
-
'taskTerminalStatus.errorsInactive',
|
|
37
|
-
"Task has errors and is waiting..."
|
|
38
|
-
)) };
|
|
39
|
-
const WARNING_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.warning, severity: Severity$1.Warning, tooltip: ( localizeWithPath(
|
|
40
|
-
'vs/workbench/contrib/tasks/browser/taskTerminalStatus',
|
|
41
|
-
'taskTerminalStatus.warnings',
|
|
42
|
-
"Task has warnings"
|
|
43
|
-
)) };
|
|
44
|
-
const WARNING_INACTIVE_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.warning, severity: Severity$1.Warning, tooltip: ( localizeWithPath(
|
|
45
|
-
'vs/workbench/contrib/tasks/browser/taskTerminalStatus',
|
|
46
|
-
'taskTerminalStatus.warningsInactive',
|
|
47
|
-
"Task has warnings and is waiting..."
|
|
48
|
-
)) };
|
|
49
|
-
const INFO_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.info, severity: Severity$1.Info, tooltip: ( localizeWithPath(
|
|
50
|
-
'vs/workbench/contrib/tasks/browser/taskTerminalStatus',
|
|
51
|
-
'taskTerminalStatus.infos',
|
|
52
|
-
"Task has infos"
|
|
53
|
-
)) };
|
|
54
|
-
const INFO_INACTIVE_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.info, severity: Severity$1.Info, tooltip: ( localizeWithPath(
|
|
55
|
-
'vs/workbench/contrib/tasks/browser/taskTerminalStatus',
|
|
56
|
-
'taskTerminalStatus.infosInactive',
|
|
57
|
-
"Task has infos and is waiting..."
|
|
58
|
-
)) };
|
|
15
|
+
const ACTIVE_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: spinningLoading, severity: Severity$1.Info, tooltip: ( localizeWithPath(_moduleId, 0, "Task is running")) };
|
|
16
|
+
const SUCCEEDED_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.check, severity: Severity$1.Info, tooltip: ( localizeWithPath(_moduleId, 1, "Task succeeded")) };
|
|
17
|
+
const SUCCEEDED_INACTIVE_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.check, severity: Severity$1.Info, tooltip: ( localizeWithPath(_moduleId, 2, "Task succeeded and waiting...")) };
|
|
18
|
+
const FAILED_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.error, severity: Severity$1.Error, tooltip: ( localizeWithPath(_moduleId, 3, "Task has errors")) };
|
|
19
|
+
const FAILED_INACTIVE_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.error, severity: Severity$1.Error, tooltip: ( localizeWithPath(_moduleId, 4, "Task has errors and is waiting...")) };
|
|
20
|
+
const WARNING_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.warning, severity: Severity$1.Warning, tooltip: ( localizeWithPath(_moduleId, 5, "Task has warnings")) };
|
|
21
|
+
const WARNING_INACTIVE_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.warning, severity: Severity$1.Warning, tooltip: ( localizeWithPath(_moduleId, 6, "Task has warnings and is waiting...")) };
|
|
22
|
+
const INFO_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.info, severity: Severity$1.Info, tooltip: ( localizeWithPath(_moduleId, 7, "Task has infos")) };
|
|
23
|
+
const INFO_INACTIVE_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.info, severity: Severity$1.Info, tooltip: ( localizeWithPath(_moduleId, 8, "Task has infos and is waiting...")) };
|
|
59
24
|
let TaskTerminalStatus = class TaskTerminalStatus extends Disposable {
|
|
60
25
|
constructor(taskService, _accessibilitySignalService) {
|
|
61
26
|
super();
|
|
62
27
|
this._accessibilitySignalService = _accessibilitySignalService;
|
|
63
|
-
this.terminalMap = ( new Map());
|
|
28
|
+
this.terminalMap = ( (new Map()));
|
|
64
29
|
this._register(taskService.onDidStateChange((event) => {
|
|
65
30
|
switch (event.kind) {
|
|
66
31
|
case "processStarted" :
|
|
@@ -76,7 +41,7 @@ let TaskTerminalStatus = class TaskTerminalStatus extends Disposable {
|
|
|
76
41
|
}
|
|
77
42
|
}));
|
|
78
43
|
this._register(toDisposable(() => {
|
|
79
|
-
for (const terminalData of ( this.terminalMap.values())) {
|
|
44
|
+
for (const terminalData of ( (this.terminalMap.values()))) {
|
|
80
45
|
terminalData.disposeListener?.dispose();
|
|
81
46
|
}
|
|
82
47
|
this.terminalMap.clear();
|
|
@@ -93,11 +58,7 @@ let TaskTerminalStatus = class TaskTerminalStatus extends Disposable {
|
|
|
93
58
|
}));
|
|
94
59
|
this._register(problemMatcher.onDidFindErrors(() => {
|
|
95
60
|
if (this._marker) {
|
|
96
|
-
terminal.addBufferMarker({ marker: this._marker, hoverMessage: ( localizeWithPath(
|
|
97
|
-
'vs/workbench/contrib/tasks/browser/taskTerminalStatus',
|
|
98
|
-
'task.watchFirstError',
|
|
99
|
-
"Beginning of detected errors for this run"
|
|
100
|
-
)), disableCommandStorage: true });
|
|
61
|
+
terminal.addBufferMarker({ marker: this._marker, hoverMessage: ( localizeWithPath(_moduleId, 9, "Beginning of detected errors for this run")), disableCommandStorage: true });
|
|
101
62
|
}
|
|
102
63
|
}));
|
|
103
64
|
this._register(problemMatcher.onDidRequestInvalidateLastMarker(() => {
|
|
@@ -168,7 +129,7 @@ let TaskTerminalStatus = class TaskTerminalStatus extends Disposable {
|
|
|
168
129
|
return;
|
|
169
130
|
}
|
|
170
131
|
if (!terminalData.disposeListener) {
|
|
171
|
-
terminalData.disposeListener = this._register(( new MutableDisposable()));
|
|
132
|
+
terminalData.disposeListener = this._register(( (new MutableDisposable())));
|
|
172
133
|
terminalData.disposeListener.value = terminalData.terminal.onDisposed(() => {
|
|
173
134
|
if (!event.terminalId) {
|
|
174
135
|
return;
|
|
@@ -184,9 +145,9 @@ let TaskTerminalStatus = class TaskTerminalStatus extends Disposable {
|
|
|
184
145
|
}
|
|
185
146
|
}
|
|
186
147
|
};
|
|
187
|
-
TaskTerminalStatus = ( __decorate([
|
|
188
|
-
( __param(0, ITaskService)),
|
|
189
|
-
( __param(1, IAccessibilitySignalService))
|
|
190
|
-
], TaskTerminalStatus));
|
|
148
|
+
TaskTerminalStatus = ( (__decorate([
|
|
149
|
+
( (__param(0, ITaskService))),
|
|
150
|
+
( (__param(1, IAccessibilitySignalService)))
|
|
151
|
+
], TaskTerminalStatus)));
|
|
191
152
|
|
|
192
153
|
export { ACTIVE_TASK_STATUS, FAILED_TASK_STATUS, SUCCEEDED_TASK_STATUS, TaskTerminalStatus };
|
|
@@ -15,17 +15,14 @@ import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeServi
|
|
|
15
15
|
import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
|
|
16
16
|
|
|
17
17
|
var TasksQuickAccessProvider_1;
|
|
18
|
+
const _moduleId = "vs/workbench/contrib/tasks/browser/tasksQuickAccess";
|
|
18
19
|
let TasksQuickAccessProvider = class TasksQuickAccessProvider extends PickerQuickAccessProvider {
|
|
19
20
|
static { TasksQuickAccessProvider_1 = this; }
|
|
20
21
|
static { this.PREFIX = 'task '; }
|
|
21
22
|
constructor(extensionService, _taskService, _configurationService, _quickInputService, _notificationService, _dialogService, _themeService, _storageService) {
|
|
22
23
|
super(TasksQuickAccessProvider_1.PREFIX, {
|
|
23
24
|
noResultsPick: {
|
|
24
|
-
label: ( localizeWithPath(
|
|
25
|
-
'vs/workbench/contrib/tasks/browser/tasksQuickAccess',
|
|
26
|
-
'noTaskResults',
|
|
27
|
-
"No matching tasks"
|
|
28
|
-
))
|
|
25
|
+
label: ( localizeWithPath(_moduleId, 0, "No matching tasks"))
|
|
29
26
|
}
|
|
30
27
|
});
|
|
31
28
|
this._taskService = _taskService;
|
|
@@ -40,7 +37,7 @@ let TasksQuickAccessProvider = class TasksQuickAccessProvider extends PickerQuic
|
|
|
40
37
|
if (token.isCancellationRequested) {
|
|
41
38
|
return [];
|
|
42
39
|
}
|
|
43
|
-
const taskQuickPick = ( new TaskQuickPick(
|
|
40
|
+
const taskQuickPick = ( (new TaskQuickPick(
|
|
44
41
|
this._taskService,
|
|
45
42
|
this._configurationService,
|
|
46
43
|
this._quickInputService,
|
|
@@ -48,7 +45,7 @@ let TasksQuickAccessProvider = class TasksQuickAccessProvider extends PickerQuic
|
|
|
48
45
|
this._themeService,
|
|
49
46
|
this._dialogService,
|
|
50
47
|
this._storageService
|
|
51
|
-
));
|
|
48
|
+
)));
|
|
52
49
|
const topLevelPicks = await taskQuickPick.getTopLevelEntries();
|
|
53
50
|
const taskPicks = [];
|
|
54
51
|
for (const entry of topLevelPicks.entries) {
|
|
@@ -82,11 +79,7 @@ let TasksQuickAccessProvider = class TasksQuickAccessProvider extends PickerQuic
|
|
|
82
79
|
};
|
|
83
80
|
quickAccessEntry.accept = async () => {
|
|
84
81
|
if (isString(task)) {
|
|
85
|
-
const showResult = await taskQuickPick.show(( localizeWithPath(
|
|
86
|
-
'vs/workbench/contrib/tasks/browser/tasksQuickAccess',
|
|
87
|
-
'TaskService.pickRunTask',
|
|
88
|
-
'Select the task to run'
|
|
89
|
-
)), undefined, task);
|
|
82
|
+
const showResult = await taskQuickPick.show(( localizeWithPath(_moduleId, 1, 'Select the task to run')), undefined, task);
|
|
90
83
|
if (showResult) {
|
|
91
84
|
this._taskService.run(showResult, { attachProblemMatcher: true });
|
|
92
85
|
}
|
|
@@ -106,15 +99,15 @@ let TasksQuickAccessProvider = class TasksQuickAccessProvider extends PickerQuic
|
|
|
106
99
|
return this._taskService.tryResolveTask(task);
|
|
107
100
|
}
|
|
108
101
|
};
|
|
109
|
-
TasksQuickAccessProvider = TasksQuickAccessProvider_1 = ( __decorate([
|
|
110
|
-
( __param(0, IExtensionService)),
|
|
111
|
-
( __param(1, ITaskService)),
|
|
112
|
-
( __param(2, IConfigurationService)),
|
|
113
|
-
( __param(3, IQuickInputService)),
|
|
114
|
-
( __param(4, INotificationService)),
|
|
115
|
-
( __param(5, IDialogService)),
|
|
116
|
-
( __param(6, IThemeService)),
|
|
117
|
-
( __param(7, IStorageService))
|
|
118
|
-
], TasksQuickAccessProvider));
|
|
102
|
+
TasksQuickAccessProvider = TasksQuickAccessProvider_1 = ( (__decorate([
|
|
103
|
+
( (__param(0, IExtensionService))),
|
|
104
|
+
( (__param(1, ITaskService))),
|
|
105
|
+
( (__param(2, IConfigurationService))),
|
|
106
|
+
( (__param(3, IQuickInputService))),
|
|
107
|
+
( (__param(4, INotificationService))),
|
|
108
|
+
( (__param(5, IDialogService))),
|
|
109
|
+
( (__param(6, IThemeService))),
|
|
110
|
+
( (__param(7, IStorageService)))
|
|
111
|
+
], TasksQuickAccessProvider)));
|
|
119
112
|
|
|
120
113
|
export { TasksQuickAccessProvider };
|