@codingame/monaco-vscode-extensions-service-override 4.5.1 → 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/package.json +3 -3
- package/vscode/src/vs/base/common/console.js +1 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagementCLI.js +67 -134
- package/vscode/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js +32 -37
- package/vscode/src/vs/workbench/api/browser/mainThreadBulkEdits.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.js +12 -11
- package/vscode/src/vs/workbench/api/browser/mainThreadChat.js +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.js +5 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadCodeInsets.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadCommands.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadComments.js +44 -38
- package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js +60 -66
- package/vscode/src/vs/workbench/api/browser/mainThreadDebugService.js +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadDocuments.js +6 -6
- package/vscode/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.js +10 -9
- package/vscode/src/vs/workbench/api/browser/mainThreadEditor.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadEditorTabs.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadEditors.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js +41 -50
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystem.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js +53 -100
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageFeatures.js +4 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js +21 -29
- package/vscode/src/vs/workbench/api/browser/mainThreadLogService.js +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadMessageService.js +47 -56
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookEditors.js +3 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookKernels.js +5 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js +7 -10
- package/vscode/src/vs/workbench/api/browser/mainThreadProgress.js +11 -12
- package/vscode/src/vs/workbench/api/browser/mainThreadSaveParticipant.js +8 -11
- package/vscode/src/vs/workbench/api/browser/mainThreadSearch.js +3 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadTask.js +179 -162
- package/vscode/src/vs/workbench/api/browser/mainThreadTreeViews.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js +28 -30
- package/vscode/src/vs/workbench/api/browser/mainThreadUriOpeners.js +23 -23
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviewPanels.js +3 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviewViews.js +3 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.js +19 -18
- package/vscode/src/vs/workbench/api/browser/mainThreadWorkspace.js +36 -33
- package/vscode/src/vs/workbench/api/common/shared/dataTransferCache.js +2 -2
- package/vscode/src/vs/workbench/services/extensionManagement/browser/extensionBisect.js +56 -121
- package/vscode/src/vs/workbench/services/extensions/browser/extensionService.js +1 -1
- package/vscode/src/vs/workbench/services/extensions/browser/webWorkerFileSystemProvider.js +5 -5
- package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js +130 -142
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js +33 -32
- package/vscode/src/vs/workbench/services/extensions/common/extensionsUtil.js +9 -8
- package/vscode/src/vs/workbench/services/extensions/common/lazyCreateExtensionHostManager.js +1 -1
|
@@ -12,8 +12,9 @@ import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/comm
|
|
|
12
12
|
import { IConfigurationResolverService } from 'vscode/vscode/vs/workbench/services/configurationResolver/common/configurationResolver.service';
|
|
13
13
|
import { ErrorNoTelemetry } from 'vscode/vscode/vs/base/common/errors';
|
|
14
14
|
|
|
15
|
+
const _moduleId = "vs/workbench/api/browser/mainThreadTask";
|
|
15
16
|
var TaskExecutionDTO;
|
|
16
|
-
( (function(TaskExecutionDTO) {
|
|
17
|
+
( ((function(TaskExecutionDTO) {
|
|
17
18
|
function from(value) {
|
|
18
19
|
return {
|
|
19
20
|
id: value.id,
|
|
@@ -21,9 +22,9 @@ var TaskExecutionDTO;
|
|
|
21
22
|
};
|
|
22
23
|
}
|
|
23
24
|
TaskExecutionDTO.from = from;
|
|
24
|
-
})(TaskExecutionDTO || (TaskExecutionDTO = {})));
|
|
25
|
+
})(TaskExecutionDTO || (TaskExecutionDTO = {}))));
|
|
25
26
|
var TaskProcessStartedDTO;
|
|
26
|
-
( (function(TaskProcessStartedDTO) {
|
|
27
|
+
( ((function(TaskProcessStartedDTO) {
|
|
27
28
|
function from(value, processId) {
|
|
28
29
|
return {
|
|
29
30
|
id: value.id,
|
|
@@ -31,9 +32,9 @@ var TaskProcessStartedDTO;
|
|
|
31
32
|
};
|
|
32
33
|
}
|
|
33
34
|
TaskProcessStartedDTO.from = from;
|
|
34
|
-
})(TaskProcessStartedDTO || (TaskProcessStartedDTO = {})));
|
|
35
|
+
})(TaskProcessStartedDTO || (TaskProcessStartedDTO = {}))));
|
|
35
36
|
var TaskProcessEndedDTO;
|
|
36
|
-
( (function(TaskProcessEndedDTO) {
|
|
37
|
+
( ((function(TaskProcessEndedDTO) {
|
|
37
38
|
function from(value, exitCode) {
|
|
38
39
|
return {
|
|
39
40
|
id: value.id,
|
|
@@ -41,9 +42,9 @@ var TaskProcessEndedDTO;
|
|
|
41
42
|
};
|
|
42
43
|
}
|
|
43
44
|
TaskProcessEndedDTO.from = from;
|
|
44
|
-
})(TaskProcessEndedDTO || (TaskProcessEndedDTO = {})));
|
|
45
|
+
})(TaskProcessEndedDTO || (TaskProcessEndedDTO = {}))));
|
|
45
46
|
var TaskDefinitionDTO;
|
|
46
|
-
( (function(TaskDefinitionDTO) {
|
|
47
|
+
( ((function(TaskDefinitionDTO) {
|
|
47
48
|
function from(value) {
|
|
48
49
|
const result = Object.assign(Object.create(null), value);
|
|
49
50
|
delete result._key;
|
|
@@ -61,9 +62,9 @@ var TaskDefinitionDTO;
|
|
|
61
62
|
return result;
|
|
62
63
|
}
|
|
63
64
|
TaskDefinitionDTO.to = to;
|
|
64
|
-
})(TaskDefinitionDTO || (TaskDefinitionDTO = {})));
|
|
65
|
+
})(TaskDefinitionDTO || (TaskDefinitionDTO = {}))));
|
|
65
66
|
var TaskPresentationOptionsDTO;
|
|
66
|
-
( (function(TaskPresentationOptionsDTO) {
|
|
67
|
+
( ((function(TaskPresentationOptionsDTO) {
|
|
67
68
|
function from(value) {
|
|
68
69
|
if (value === undefined || value === null) {
|
|
69
70
|
return undefined;
|
|
@@ -78,9 +79,9 @@ var TaskPresentationOptionsDTO;
|
|
|
78
79
|
return Object.assign(Object.create(null), PresentationOptions.defaults, value);
|
|
79
80
|
}
|
|
80
81
|
TaskPresentationOptionsDTO.to = to;
|
|
81
|
-
})(TaskPresentationOptionsDTO || (TaskPresentationOptionsDTO = {})));
|
|
82
|
+
})(TaskPresentationOptionsDTO || (TaskPresentationOptionsDTO = {}))));
|
|
82
83
|
var RunOptionsDTO;
|
|
83
|
-
( (function(RunOptionsDTO) {
|
|
84
|
+
( ((function(RunOptionsDTO) {
|
|
84
85
|
function from(value) {
|
|
85
86
|
if (value === undefined || value === null) {
|
|
86
87
|
return undefined;
|
|
@@ -95,9 +96,9 @@ var RunOptionsDTO;
|
|
|
95
96
|
return Object.assign(Object.create(null), RunOptions.defaults, value);
|
|
96
97
|
}
|
|
97
98
|
RunOptionsDTO.to = to;
|
|
98
|
-
})(RunOptionsDTO || (RunOptionsDTO = {})));
|
|
99
|
+
})(RunOptionsDTO || (RunOptionsDTO = {}))));
|
|
99
100
|
var ProcessExecutionOptionsDTO;
|
|
100
|
-
( (function(ProcessExecutionOptionsDTO) {
|
|
101
|
+
( ((function(ProcessExecutionOptionsDTO) {
|
|
101
102
|
function from(value) {
|
|
102
103
|
if (value === undefined || value === null) {
|
|
103
104
|
return undefined;
|
|
@@ -118,9 +119,9 @@ var ProcessExecutionOptionsDTO;
|
|
|
118
119
|
};
|
|
119
120
|
}
|
|
120
121
|
ProcessExecutionOptionsDTO.to = to;
|
|
121
|
-
})(ProcessExecutionOptionsDTO || (ProcessExecutionOptionsDTO = {})));
|
|
122
|
+
})(ProcessExecutionOptionsDTO || (ProcessExecutionOptionsDTO = {}))));
|
|
122
123
|
var ProcessExecutionDTO;
|
|
123
|
-
( (function(ProcessExecutionDTO) {
|
|
124
|
+
( ((function(ProcessExecutionDTO) {
|
|
124
125
|
function is(value) {
|
|
125
126
|
const candidate = value;
|
|
126
127
|
return candidate && !!candidate.process;
|
|
@@ -128,7 +129,7 @@ var ProcessExecutionDTO;
|
|
|
128
129
|
ProcessExecutionDTO.is = is;
|
|
129
130
|
function from(value) {
|
|
130
131
|
const process = isString(value.name) ? value.name : value.name.value;
|
|
131
|
-
const args = value.args ? ( value.args.map(value => isString(value) ? value : value.value)) : [];
|
|
132
|
+
const args = value.args ? ( (value.args.map(value => isString(value) ? value : value.value))) : [];
|
|
132
133
|
const result = {
|
|
133
134
|
process: process,
|
|
134
135
|
args: args
|
|
@@ -150,9 +151,9 @@ var ProcessExecutionDTO;
|
|
|
150
151
|
return result;
|
|
151
152
|
}
|
|
152
153
|
ProcessExecutionDTO.to = to;
|
|
153
|
-
})(ProcessExecutionDTO || (ProcessExecutionDTO = {})));
|
|
154
|
+
})(ProcessExecutionDTO || (ProcessExecutionDTO = {}))));
|
|
154
155
|
var ShellExecutionOptionsDTO;
|
|
155
|
-
( (function(ShellExecutionOptionsDTO) {
|
|
156
|
+
( ((function(ShellExecutionOptionsDTO) {
|
|
156
157
|
function from(value) {
|
|
157
158
|
if (value === undefined || value === null) {
|
|
158
159
|
return undefined;
|
|
@@ -191,9 +192,9 @@ var ShellExecutionOptionsDTO;
|
|
|
191
192
|
return result;
|
|
192
193
|
}
|
|
193
194
|
ShellExecutionOptionsDTO.to = to;
|
|
194
|
-
})(ShellExecutionOptionsDTO || (ShellExecutionOptionsDTO = {})));
|
|
195
|
+
})(ShellExecutionOptionsDTO || (ShellExecutionOptionsDTO = {}))));
|
|
195
196
|
var ShellExecutionDTO;
|
|
196
|
-
( (function(ShellExecutionDTO) {
|
|
197
|
+
( ((function(ShellExecutionDTO) {
|
|
197
198
|
function is(value) {
|
|
198
199
|
const candidate = value;
|
|
199
200
|
return candidate && (!!candidate.commandLine || !!candidate.command);
|
|
@@ -227,9 +228,9 @@ var ShellExecutionDTO;
|
|
|
227
228
|
return result;
|
|
228
229
|
}
|
|
229
230
|
ShellExecutionDTO.to = to;
|
|
230
|
-
})(ShellExecutionDTO || (ShellExecutionDTO = {})));
|
|
231
|
+
})(ShellExecutionDTO || (ShellExecutionDTO = {}))));
|
|
231
232
|
var CustomExecutionDTO;
|
|
232
|
-
( (function(CustomExecutionDTO) {
|
|
233
|
+
( ((function(CustomExecutionDTO) {
|
|
233
234
|
function is(value) {
|
|
234
235
|
const candidate = value;
|
|
235
236
|
return candidate && candidate.customExecution === 'customExecution';
|
|
@@ -248,9 +249,9 @@ var CustomExecutionDTO;
|
|
|
248
249
|
};
|
|
249
250
|
}
|
|
250
251
|
CustomExecutionDTO.to = to;
|
|
251
|
-
})(CustomExecutionDTO || (CustomExecutionDTO = {})));
|
|
252
|
+
})(CustomExecutionDTO || (CustomExecutionDTO = {}))));
|
|
252
253
|
var TaskSourceDTO;
|
|
253
|
-
( (function(TaskSourceDTO) {
|
|
254
|
+
( ((function(TaskSourceDTO) {
|
|
254
255
|
function from(value) {
|
|
255
256
|
const result = {
|
|
256
257
|
label: value.label
|
|
@@ -301,17 +302,17 @@ var TaskSourceDTO;
|
|
|
301
302
|
return result;
|
|
302
303
|
}
|
|
303
304
|
TaskSourceDTO.to = to;
|
|
304
|
-
})(TaskSourceDTO || (TaskSourceDTO = {})));
|
|
305
|
+
})(TaskSourceDTO || (TaskSourceDTO = {}))));
|
|
305
306
|
var TaskHandleDTO;
|
|
306
|
-
( (function(TaskHandleDTO) {
|
|
307
|
+
( ((function(TaskHandleDTO) {
|
|
307
308
|
function is(value) {
|
|
308
309
|
const candidate = value;
|
|
309
310
|
return candidate && isString(candidate.id) && !!candidate.workspaceFolder;
|
|
310
311
|
}
|
|
311
312
|
TaskHandleDTO.is = is;
|
|
312
|
-
})(TaskHandleDTO || (TaskHandleDTO = {})));
|
|
313
|
+
})(TaskHandleDTO || (TaskHandleDTO = {}))));
|
|
313
314
|
var TaskDTO;
|
|
314
|
-
( (function(TaskDTO) {
|
|
315
|
+
( ((function(TaskDTO) {
|
|
315
316
|
function from(task) {
|
|
316
317
|
if (task === undefined || task === null || (!CustomTask.is(task) && !ContributedTask.is(task) && !ConfiguringTask.is(task))) {
|
|
317
318
|
return undefined;
|
|
@@ -376,32 +377,36 @@ var TaskDTO;
|
|
|
376
377
|
}
|
|
377
378
|
command.presentation = TaskPresentationOptionsDTO.to(task.presentationOptions);
|
|
378
379
|
const source = TaskSourceDTO.to(task.source, workspace);
|
|
379
|
-
const label = ( localizeWithPath(
|
|
380
|
-
'vs/workbench/api/browser/mainThreadTask',
|
|
381
|
-
'task.label',
|
|
382
|
-
'{0}: {1}',
|
|
383
|
-
source.label,
|
|
384
|
-
task.name
|
|
385
|
-
));
|
|
380
|
+
const label = ( localizeWithPath(_moduleId, 0, '{0}: {1}', source.label, task.name));
|
|
386
381
|
const definition = TaskDefinitionDTO.to(task.definition, executeOnly);
|
|
387
382
|
const id = (CustomExecutionDTO.is(task.execution) && task._id) ? task._id : `${task.source.extensionId}.${definition._key}`;
|
|
388
|
-
const result = ( new
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
383
|
+
const result = ( (new
|
|
384
|
+
ContributedTask(
|
|
385
|
+
id,
|
|
386
|
+
source,
|
|
387
|
+
label,
|
|
388
|
+
definition.type,
|
|
389
|
+
definition,
|
|
390
|
+
command,
|
|
391
|
+
task.hasDefinedMatchers,
|
|
392
|
+
RunOptionsDTO.to(task.runOptions),
|
|
393
|
+
{
|
|
394
|
+
name: task.name,
|
|
395
|
+
identifier: label,
|
|
396
|
+
group: task.group,
|
|
397
|
+
isBackground: !!task.isBackground,
|
|
398
|
+
problemMatchers: task.problemMatchers.slice(),
|
|
399
|
+
detail: task.detail,
|
|
400
|
+
icon,
|
|
401
|
+
hide
|
|
402
|
+
}
|
|
403
|
+
)));
|
|
399
404
|
return result;
|
|
400
405
|
}
|
|
401
406
|
TaskDTO.to = to;
|
|
402
|
-
})(TaskDTO || (TaskDTO = {})));
|
|
407
|
+
})(TaskDTO || (TaskDTO = {}))));
|
|
403
408
|
var TaskGroupDTO;
|
|
404
|
-
( (function(TaskGroupDTO) {
|
|
409
|
+
( ((function(TaskGroupDTO) {
|
|
405
410
|
function from(value) {
|
|
406
411
|
if (value === undefined) {
|
|
407
412
|
return undefined;
|
|
@@ -412,9 +417,9 @@ var TaskGroupDTO;
|
|
|
412
417
|
};
|
|
413
418
|
}
|
|
414
419
|
TaskGroupDTO.from = from;
|
|
415
|
-
})(TaskGroupDTO || (TaskGroupDTO = {})));
|
|
420
|
+
})(TaskGroupDTO || (TaskGroupDTO = {}))));
|
|
416
421
|
var TaskFilterDTO;
|
|
417
|
-
( (function(TaskFilterDTO) {
|
|
422
|
+
( ((function(TaskFilterDTO) {
|
|
418
423
|
function from(value) {
|
|
419
424
|
return value;
|
|
420
425
|
}
|
|
@@ -423,14 +428,14 @@ var TaskFilterDTO;
|
|
|
423
428
|
return value;
|
|
424
429
|
}
|
|
425
430
|
TaskFilterDTO.to = to;
|
|
426
|
-
})(TaskFilterDTO || (TaskFilterDTO = {})));
|
|
431
|
+
})(TaskFilterDTO || (TaskFilterDTO = {}))));
|
|
427
432
|
let MainThreadTask = class MainThreadTask {
|
|
428
433
|
constructor(extHostContext, _taskService, _workspaceContextServer, _configurationResolverService) {
|
|
429
434
|
this._taskService = _taskService;
|
|
430
435
|
this._workspaceContextServer = _workspaceContextServer;
|
|
431
436
|
this._configurationResolverService = _configurationResolverService;
|
|
432
|
-
this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostTask));
|
|
433
|
-
this._providers = ( new Map());
|
|
437
|
+
this._proxy = ( (extHostContext.getProxy(ExtHostContext.ExtHostTask)));
|
|
438
|
+
this._providers = ( (new Map()));
|
|
434
439
|
this._taskService.onDidStateChange(async (event) => {
|
|
435
440
|
if (event.kind === "changed" ) {
|
|
436
441
|
return;
|
|
@@ -460,21 +465,23 @@ let MainThreadTask = class MainThreadTask {
|
|
|
460
465
|
});
|
|
461
466
|
}
|
|
462
467
|
dispose() {
|
|
463
|
-
for (const value of ( this._providers.values())) {
|
|
468
|
+
for (const value of ( (this._providers.values()))) {
|
|
464
469
|
value.disposable.dispose();
|
|
465
470
|
}
|
|
466
471
|
this._providers.clear();
|
|
467
472
|
}
|
|
468
473
|
$createTaskId(taskDTO) {
|
|
469
|
-
return (
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
474
|
+
return (
|
|
475
|
+
(new Promise((resolve, reject) => {
|
|
476
|
+
const task = TaskDTO.to(taskDTO, this._workspaceContextServer, true);
|
|
477
|
+
if (task) {
|
|
478
|
+
resolve(task._id);
|
|
479
|
+
}
|
|
480
|
+
else {
|
|
481
|
+
reject(( (new Error('Task could not be created from DTO'))));
|
|
482
|
+
}
|
|
483
|
+
}))
|
|
484
|
+
);
|
|
478
485
|
}
|
|
479
486
|
$registerTaskProvider(handle, type) {
|
|
480
487
|
const provider = {
|
|
@@ -542,7 +549,7 @@ let MainThreadTask = class MainThreadTask {
|
|
|
542
549
|
else {
|
|
543
550
|
const workspaceObject = this._workspaceContextServer.getWorkspace();
|
|
544
551
|
const uri = URI.revive(value);
|
|
545
|
-
if (workspaceObject.configuration?.toString() === ( uri.toString())) {
|
|
552
|
+
if (workspaceObject.configuration?.toString() === ( (uri.toString()))) {
|
|
546
553
|
workspace = workspaceObject;
|
|
547
554
|
}
|
|
548
555
|
else {
|
|
@@ -562,10 +569,10 @@ let MainThreadTask = class MainThreadTask {
|
|
|
562
569
|
task: TaskDTO.from(task)
|
|
563
570
|
};
|
|
564
571
|
}
|
|
565
|
-
throw new Error('Task not found');
|
|
572
|
+
throw ( (new Error('Task not found')));
|
|
566
573
|
}
|
|
567
574
|
else {
|
|
568
|
-
throw new Error('No workspace folder');
|
|
575
|
+
throw ( (new Error('No workspace folder')));
|
|
569
576
|
}
|
|
570
577
|
}
|
|
571
578
|
else {
|
|
@@ -577,80 +584,86 @@ let MainThreadTask = class MainThreadTask {
|
|
|
577
584
|
}
|
|
578
585
|
}
|
|
579
586
|
$executeTask(value) {
|
|
580
|
-
return (
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
|
|
585
|
-
|
|
586
|
-
|
|
587
|
-
|
|
588
|
-
|
|
589
|
-
|
|
590
|
-
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
587
|
+
return (
|
|
588
|
+
(new Promise((resolve, reject) => {
|
|
589
|
+
if (TaskHandleDTO.is(value)) {
|
|
590
|
+
const workspace = this.getWorkspace(value.workspaceFolder);
|
|
591
|
+
if (workspace) {
|
|
592
|
+
this._taskService.getTask(workspace, value.id, true).then((task) => {
|
|
593
|
+
if (!task) {
|
|
594
|
+
reject(( (new Error('Task not found'))));
|
|
595
|
+
}
|
|
596
|
+
else {
|
|
597
|
+
const result = {
|
|
598
|
+
id: value.id,
|
|
599
|
+
task: TaskDTO.from(task)
|
|
600
|
+
};
|
|
601
|
+
this._taskService.run(task).then(summary => {
|
|
602
|
+
if ((summary?.exitCode === undefined) || (summary.exitCode !== 0)) {
|
|
603
|
+
this._proxy.$OnDidEndTask(result);
|
|
604
|
+
}
|
|
605
|
+
}, reason => {
|
|
606
|
+
});
|
|
607
|
+
resolve(result);
|
|
608
|
+
}
|
|
609
|
+
}, (_error) => {
|
|
610
|
+
reject(( (new Error('Task not found'))));
|
|
611
|
+
});
|
|
612
|
+
}
|
|
613
|
+
else {
|
|
614
|
+
reject(( (new Error('No workspace folder'))));
|
|
615
|
+
}
|
|
604
616
|
}
|
|
605
617
|
else {
|
|
606
|
-
|
|
618
|
+
const task = TaskDTO.to(value, this._workspaceContextServer, true);
|
|
619
|
+
this._taskService.run(task).then(undefined, reason => {
|
|
620
|
+
});
|
|
621
|
+
const result = {
|
|
622
|
+
id: task._id,
|
|
623
|
+
task: TaskDTO.from(task)
|
|
624
|
+
};
|
|
625
|
+
resolve(result);
|
|
607
626
|
}
|
|
608
|
-
}
|
|
609
|
-
|
|
610
|
-
const task = TaskDTO.to(value, this._workspaceContextServer, true);
|
|
611
|
-
this._taskService.run(task).then(undefined, reason => {
|
|
612
|
-
});
|
|
613
|
-
const result = {
|
|
614
|
-
id: task._id,
|
|
615
|
-
task: TaskDTO.from(task)
|
|
616
|
-
};
|
|
617
|
-
resolve(result);
|
|
618
|
-
}
|
|
619
|
-
}));
|
|
627
|
+
}))
|
|
628
|
+
);
|
|
620
629
|
}
|
|
621
630
|
$customExecutionComplete(id, result) {
|
|
622
|
-
return (
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
|
|
627
|
-
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
631
|
-
|
|
631
|
+
return (
|
|
632
|
+
(new Promise((resolve, reject) => {
|
|
633
|
+
this._taskService.getActiveTasks().then((tasks) => {
|
|
634
|
+
for (const task of tasks) {
|
|
635
|
+
if (id === task._id) {
|
|
636
|
+
this._taskService.extensionCallbackTaskComplete(task, result).then((value) => {
|
|
637
|
+
resolve(undefined);
|
|
638
|
+
}, (error) => {
|
|
639
|
+
reject(error);
|
|
640
|
+
});
|
|
641
|
+
return;
|
|
642
|
+
}
|
|
632
643
|
}
|
|
633
|
-
|
|
634
|
-
|
|
635
|
-
})
|
|
636
|
-
|
|
644
|
+
reject(( (new Error('Task to mark as complete not found'))));
|
|
645
|
+
});
|
|
646
|
+
}))
|
|
647
|
+
);
|
|
637
648
|
}
|
|
638
649
|
$terminateTask(id) {
|
|
639
|
-
return (
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
650
|
+
return (
|
|
651
|
+
(new Promise((resolve, reject) => {
|
|
652
|
+
this._taskService.getActiveTasks().then((tasks) => {
|
|
653
|
+
for (const task of tasks) {
|
|
654
|
+
if (id === task._id) {
|
|
655
|
+
this._taskService.terminate(task).then((value) => {
|
|
656
|
+
resolve(undefined);
|
|
657
|
+
}, (error) => {
|
|
658
|
+
reject(undefined);
|
|
659
|
+
});
|
|
660
|
+
return;
|
|
661
|
+
}
|
|
649
662
|
}
|
|
650
|
-
|
|
651
|
-
|
|
652
|
-
})
|
|
653
|
-
|
|
663
|
+
reject(( (new ErrorNoTelemetry('Task to terminate not found'))));
|
|
664
|
+
});
|
|
665
|
+
}))
|
|
666
|
+
);
|
|
654
667
|
}
|
|
655
668
|
$registerTaskSystem(key, info) {
|
|
656
669
|
let platform$1;
|
|
@@ -673,43 +686,47 @@ let MainThreadTask = class MainThreadTask {
|
|
|
673
686
|
this._taskService.registerTaskSystem(key, {
|
|
674
687
|
platform: platform$1,
|
|
675
688
|
uriProvider: (path) => {
|
|
676
|
-
return (
|
|
689
|
+
return (
|
|
690
|
+
(URI.from({ scheme: info.scheme, authority: info.authority, path }))
|
|
691
|
+
);
|
|
677
692
|
},
|
|
678
693
|
context: this._extHostContext,
|
|
679
694
|
resolveVariables: (workspaceFolder, toResolve, target) => {
|
|
680
695
|
const vars = [];
|
|
681
696
|
toResolve.variables.forEach(item => vars.push(item));
|
|
682
697
|
return Promise.resolve(this._proxy.$resolveVariables(workspaceFolder.uri, { process: toResolve.process, variables: vars })).then(values => {
|
|
683
|
-
const partiallyResolvedVars = Array.from(( Object.values(values.variables)));
|
|
684
|
-
return (
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
694
|
-
|
|
695
|
-
|
|
696
|
-
|
|
697
|
-
|
|
698
|
-
|
|
698
|
+
const partiallyResolvedVars = Array.from(( (Object.values(values.variables))));
|
|
699
|
+
return (
|
|
700
|
+
(new Promise((resolve, reject) => {
|
|
701
|
+
this._configurationResolverService.resolveWithInteraction(workspaceFolder, partiallyResolvedVars, 'tasks', undefined, target).then(resolvedVars => {
|
|
702
|
+
if (!resolvedVars) {
|
|
703
|
+
resolve(undefined);
|
|
704
|
+
}
|
|
705
|
+
const result = {
|
|
706
|
+
process: undefined,
|
|
707
|
+
variables: ( (new Map()))
|
|
708
|
+
};
|
|
709
|
+
for (let i = 0; i < partiallyResolvedVars.length; i++) {
|
|
710
|
+
const variableName = vars[i].substring(2, vars[i].length - 1);
|
|
711
|
+
if (resolvedVars && values.variables[vars[i]] === vars[i]) {
|
|
712
|
+
const resolved = resolvedVars.get(variableName);
|
|
713
|
+
if (typeof resolved === 'string') {
|
|
714
|
+
result.variables.set(variableName, resolved);
|
|
715
|
+
}
|
|
716
|
+
}
|
|
717
|
+
else {
|
|
718
|
+
result.variables.set(variableName, partiallyResolvedVars[i]);
|
|
699
719
|
}
|
|
700
720
|
}
|
|
701
|
-
|
|
702
|
-
result.
|
|
721
|
+
if (isString(values.process)) {
|
|
722
|
+
result.process = values.process;
|
|
703
723
|
}
|
|
704
|
-
|
|
705
|
-
|
|
706
|
-
|
|
707
|
-
}
|
|
708
|
-
|
|
709
|
-
|
|
710
|
-
reject(reason);
|
|
711
|
-
});
|
|
712
|
-
}));
|
|
724
|
+
resolve(result);
|
|
725
|
+
}, reason => {
|
|
726
|
+
reject(reason);
|
|
727
|
+
});
|
|
728
|
+
}))
|
|
729
|
+
);
|
|
713
730
|
});
|
|
714
731
|
},
|
|
715
732
|
findExecutable: (command, cwd, paths) => {
|
|
@@ -723,9 +740,9 @@ let MainThreadTask = class MainThreadTask {
|
|
|
723
740
|
};
|
|
724
741
|
MainThreadTask = __decorate([
|
|
725
742
|
extHostNamedCustomer(MainContext.MainThreadTask),
|
|
726
|
-
( __param(1, ITaskService)),
|
|
727
|
-
( __param(2, IWorkspaceContextService)),
|
|
728
|
-
( __param(3, IConfigurationResolverService))
|
|
743
|
+
( (__param(1, ITaskService))),
|
|
744
|
+
( (__param(2, IWorkspaceContextService))),
|
|
745
|
+
( (__param(3, IConfigurationResolverService)))
|
|
729
746
|
], MainThreadTask);
|
|
730
747
|
|
|
731
748
|
export { MainThreadTask };
|
|
@@ -103,7 +103,7 @@ let MainThreadTreeViews = class MainThreadTreeViews extends Disposable {
|
|
|
103
103
|
$resolveDropFileData(destinationViewId, requestId, dataItemId) {
|
|
104
104
|
const controller = this._dndControllers.get(destinationViewId);
|
|
105
105
|
if (!controller) {
|
|
106
|
-
throw new Error('Unknown tree');
|
|
106
|
+
throw ( new Error('Unknown tree'));
|
|
107
107
|
}
|
|
108
108
|
return controller.resolveDropFileData(requestId, dataItemId);
|
|
109
109
|
}
|