@codingame/monaco-vscode-api 1.83.0-next.0 → 1.83.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/monaco-editor-treemending.patch +919 -919
- package/package.json +1 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionNls.js +1 -1
- package/vscode/src/vs/platform/workspaces/common/workspaces.js +15 -15
- package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js +49 -51
- package/vscode/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.js +58 -69
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystem.js +23 -23
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.js +16 -16
- package/vscode/src/vs/workbench/api/common/extHostCommands.js +59 -65
- package/vscode/src/vs/workbench/api/common/extHostConsoleForwarder.js +8 -8
- package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js +151 -215
- package/vscode/src/vs/workbench/api/common/extHostSCM.js +54 -58
- package/vscode/src/vs/workbench/api/common/extHostTreeViews.js +53 -55
- package/vscode/src/vs/workbench/api/common/extHostTunnelService.js +28 -28
- package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js +265 -277
- package/vscode/src/vs/workbench/api/common/extensionHostMain.js +17 -19
- package/vscode/src/vs/workbench/api/worker/extHostExtensionService.js +5 -5
- package/vscode/src/vs/workbench/browser/parts/editor/sideBySideEditor.js +26 -32
- package/vscode/src/vs/workbench/browser/parts/editor/textDiffEditor.js +20 -26
- package/vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.js +58 -74
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.js +19 -19
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.js +32 -36
- package/vscode/src/vs/workbench/contrib/debug/browser/debugColors.js +19 -19
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mapping.js +73 -126
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsService.js +66 -74
- package/vscode/src/vs/workbench/contrib/tasks/common/tasks.js +82 -92
- package/vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.js +27 -29
- package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js +122 -124
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js +35 -39
- package/vscode/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.js +25 -25
- package/vscode/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.js +30 -32
- package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js +82 -92
- package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModel.js +31 -31
- package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorService.js +16 -16
- package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyBackupService.js +32 -42
|
@@ -6,16 +6,16 @@ import { TaskDefinitionRegistry } from './taskDefinitionRegistry.js';
|
|
|
6
6
|
const USER_TASKS_GROUP_KEY = 'settings';
|
|
7
7
|
const CUSTOMIZED_TASK_TYPE = '$customized';
|
|
8
8
|
var CommandOptions;
|
|
9
|
-
( (
|
|
9
|
+
( (function(CommandOptions) {
|
|
10
10
|
CommandOptions.defaults = { cwd: '${workspaceFolder}' };
|
|
11
|
-
})(CommandOptions || (CommandOptions = {})))
|
|
11
|
+
})(CommandOptions || (CommandOptions = {})));
|
|
12
12
|
var RevealKind;
|
|
13
|
-
( (
|
|
13
|
+
( (function(RevealKind) {
|
|
14
14
|
RevealKind[RevealKind["Always"] = 1] = "Always";
|
|
15
15
|
RevealKind[RevealKind["Silent"] = 2] = "Silent";
|
|
16
16
|
RevealKind[RevealKind["Never"] = 3] = "Never";
|
|
17
|
-
})(RevealKind || (RevealKind = {})))
|
|
18
|
-
( (
|
|
17
|
+
})(RevealKind || (RevealKind = {})));
|
|
18
|
+
( (function(RevealKind) {
|
|
19
19
|
function fromString(value) {
|
|
20
20
|
switch (value.toLowerCase()) {
|
|
21
21
|
case 'always':
|
|
@@ -29,14 +29,14 @@ var RevealKind;
|
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
31
|
RevealKind.fromString = fromString;
|
|
32
|
-
})(RevealKind || (RevealKind = {})))
|
|
32
|
+
})(RevealKind || (RevealKind = {})));
|
|
33
33
|
var RevealProblemKind;
|
|
34
|
-
( (
|
|
34
|
+
( (function(RevealProblemKind) {
|
|
35
35
|
RevealProblemKind[RevealProblemKind["Never"] = 1] = "Never";
|
|
36
36
|
RevealProblemKind[RevealProblemKind["OnProblem"] = 2] = "OnProblem";
|
|
37
37
|
RevealProblemKind[RevealProblemKind["Always"] = 3] = "Always";
|
|
38
|
-
})(RevealProblemKind || (RevealProblemKind = {})))
|
|
39
|
-
( (
|
|
38
|
+
})(RevealProblemKind || (RevealProblemKind = {})));
|
|
39
|
+
( (function(RevealProblemKind) {
|
|
40
40
|
function fromString(value) {
|
|
41
41
|
switch (value.toLowerCase()) {
|
|
42
42
|
case 'always':
|
|
@@ -50,14 +50,14 @@ var RevealProblemKind;
|
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
RevealProblemKind.fromString = fromString;
|
|
53
|
-
})(RevealProblemKind || (RevealProblemKind = {})))
|
|
53
|
+
})(RevealProblemKind || (RevealProblemKind = {})));
|
|
54
54
|
var PanelKind;
|
|
55
|
-
( (
|
|
55
|
+
( (function(PanelKind) {
|
|
56
56
|
PanelKind[PanelKind["Shared"] = 1] = "Shared";
|
|
57
57
|
PanelKind[PanelKind["Dedicated"] = 2] = "Dedicated";
|
|
58
58
|
PanelKind[PanelKind["New"] = 3] = "New";
|
|
59
|
-
})(PanelKind || (PanelKind = {})))
|
|
60
|
-
( (
|
|
59
|
+
})(PanelKind || (PanelKind = {})));
|
|
60
|
+
( (function(PanelKind) {
|
|
61
61
|
function fromString(value) {
|
|
62
62
|
switch (value.toLowerCase()) {
|
|
63
63
|
case 'shared':
|
|
@@ -71,20 +71,20 @@ var PanelKind;
|
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
PanelKind.fromString = fromString;
|
|
74
|
-
})(PanelKind || (PanelKind = {})))
|
|
74
|
+
})(PanelKind || (PanelKind = {})));
|
|
75
75
|
var PresentationOptions;
|
|
76
|
-
( (
|
|
76
|
+
( (function(PresentationOptions) {
|
|
77
77
|
PresentationOptions.defaults = {
|
|
78
78
|
echo: true, reveal: RevealKind.Always, revealProblems: RevealProblemKind.Never, focus: false, panel: PanelKind.Shared, showReuseMessage: true, clear: false
|
|
79
79
|
};
|
|
80
|
-
})(PresentationOptions || (PresentationOptions = {})))
|
|
80
|
+
})(PresentationOptions || (PresentationOptions = {})));
|
|
81
81
|
var RuntimeType;
|
|
82
|
-
( (
|
|
82
|
+
( (function(RuntimeType) {
|
|
83
83
|
RuntimeType[RuntimeType["Shell"] = 1] = "Shell";
|
|
84
84
|
RuntimeType[RuntimeType["Process"] = 2] = "Process";
|
|
85
85
|
RuntimeType[RuntimeType["CustomExecution"] = 3] = "CustomExecution";
|
|
86
|
-
})(RuntimeType || (RuntimeType = {})))
|
|
87
|
-
( (
|
|
86
|
+
})(RuntimeType || (RuntimeType = {})));
|
|
87
|
+
( (function(RuntimeType) {
|
|
88
88
|
function fromString(value) {
|
|
89
89
|
switch (value.toLowerCase()) {
|
|
90
90
|
case 'shell':
|
|
@@ -107,9 +107,9 @@ var RuntimeType;
|
|
|
107
107
|
}
|
|
108
108
|
}
|
|
109
109
|
RuntimeType.toString = toString;
|
|
110
|
-
})(RuntimeType || (RuntimeType = {})))
|
|
110
|
+
})(RuntimeType || (RuntimeType = {})));
|
|
111
111
|
var TaskSourceKind;
|
|
112
|
-
( (
|
|
112
|
+
( (function(TaskSourceKind) {
|
|
113
113
|
TaskSourceKind.Workspace = 'workspace';
|
|
114
114
|
TaskSourceKind.Extension = 'extension';
|
|
115
115
|
TaskSourceKind.InMemory = 'inMemory';
|
|
@@ -123,16 +123,16 @@ var TaskSourceKind;
|
|
|
123
123
|
}
|
|
124
124
|
}
|
|
125
125
|
TaskSourceKind.toConfigurationTarget = toConfigurationTarget;
|
|
126
|
-
})(TaskSourceKind || (TaskSourceKind = {})))
|
|
126
|
+
})(TaskSourceKind || (TaskSourceKind = {})));
|
|
127
127
|
var RunOnOptions;
|
|
128
|
-
( (
|
|
128
|
+
( (function(RunOnOptions) {
|
|
129
129
|
RunOnOptions[RunOnOptions["default"] = 1] = "default";
|
|
130
130
|
RunOnOptions[RunOnOptions["folderOpen"] = 2] = "folderOpen";
|
|
131
|
-
})(RunOnOptions || (RunOnOptions = {})))
|
|
131
|
+
})(RunOnOptions || (RunOnOptions = {})));
|
|
132
132
|
var RunOptions;
|
|
133
|
-
( (
|
|
133
|
+
( (function(RunOptions) {
|
|
134
134
|
RunOptions.defaults = { reevaluateOnRerun: true, runOn: RunOnOptions.default, instanceLimit: 1 };
|
|
135
|
-
})(RunOptions || (RunOptions = {})))
|
|
135
|
+
})(RunOptions || (RunOptions = {})));
|
|
136
136
|
class CommonTask {
|
|
137
137
|
constructor(id, label, type, runOptions, configurationProperties, source) {
|
|
138
138
|
this._label = '';
|
|
@@ -221,18 +221,16 @@ class CustomTask extends CommonTask {
|
|
|
221
221
|
}
|
|
222
222
|
}
|
|
223
223
|
clone() {
|
|
224
|
-
return (
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
))
|
|
235
|
-
);
|
|
224
|
+
return ( new CustomTask(
|
|
225
|
+
this._id,
|
|
226
|
+
this._source,
|
|
227
|
+
this._label,
|
|
228
|
+
this.type,
|
|
229
|
+
this.command,
|
|
230
|
+
this.hasDefinedMatchers,
|
|
231
|
+
this.runOptions,
|
|
232
|
+
this.configurationProperties
|
|
233
|
+
));
|
|
236
234
|
}
|
|
237
235
|
customizes() {
|
|
238
236
|
if (this._source && this._source.customizes) {
|
|
@@ -276,7 +274,7 @@ class CustomTask extends CommonTask {
|
|
|
276
274
|
}
|
|
277
275
|
getMapKey() {
|
|
278
276
|
const workspaceFolder = this._source.config.workspaceFolder;
|
|
279
|
-
return workspaceFolder ? `${(
|
|
277
|
+
return workspaceFolder ? `${( workspaceFolder.uri.toString())}|${this._id}|${this.instance}` : `${this._id}|${this.instance}`;
|
|
280
278
|
}
|
|
281
279
|
getFolderId() {
|
|
282
280
|
return this._source.kind === TaskSourceKind.User ? USER_TASKS_GROUP_KEY : this._source.config.workspaceFolder?.uri.toString();
|
|
@@ -311,18 +309,16 @@ class CustomTask extends CommonTask {
|
|
|
311
309
|
}
|
|
312
310
|
}
|
|
313
311
|
fromObject(object) {
|
|
314
|
-
return (
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
))
|
|
325
|
-
);
|
|
312
|
+
return ( new CustomTask(
|
|
313
|
+
object._id,
|
|
314
|
+
object._source,
|
|
315
|
+
object._label,
|
|
316
|
+
object.type,
|
|
317
|
+
object.command,
|
|
318
|
+
object.hasDefinedMatchers,
|
|
319
|
+
object.runOptions,
|
|
320
|
+
object.configurationProperties
|
|
321
|
+
));
|
|
326
322
|
}
|
|
327
323
|
}
|
|
328
324
|
class ConfiguringTask extends CommonTask {
|
|
@@ -372,19 +368,17 @@ class ContributedTask extends CommonTask {
|
|
|
372
368
|
this.hide = configurationProperties.hide;
|
|
373
369
|
}
|
|
374
370
|
clone() {
|
|
375
|
-
return (
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
))
|
|
387
|
-
);
|
|
371
|
+
return ( new ContributedTask(
|
|
372
|
+
this._id,
|
|
373
|
+
this._source,
|
|
374
|
+
this._label,
|
|
375
|
+
this.type,
|
|
376
|
+
this.defines,
|
|
377
|
+
this.command,
|
|
378
|
+
this.hasDefinedMatchers,
|
|
379
|
+
this.runOptions,
|
|
380
|
+
this.configurationProperties
|
|
381
|
+
));
|
|
388
382
|
}
|
|
389
383
|
getDefinition() {
|
|
390
384
|
return this.defines;
|
|
@@ -395,14 +389,12 @@ class ContributedTask extends CommonTask {
|
|
|
395
389
|
getMapKey() {
|
|
396
390
|
const workspaceFolder = this._source.workspaceFolder;
|
|
397
391
|
return workspaceFolder
|
|
398
|
-
? `${(
|
|
399
|
-
: `${(
|
|
392
|
+
? `${( this._source.scope.toString())}|${( workspaceFolder.uri.toString())}|${this._id}|${this.instance}`
|
|
393
|
+
: `${( this._source.scope.toString())}|${this._id}|${this.instance}`;
|
|
400
394
|
}
|
|
401
395
|
getFolderId() {
|
|
402
396
|
if (this._source.scope === 3 && this._source.workspaceFolder) {
|
|
403
|
-
return (
|
|
404
|
-
(this._source.workspaceFolder.uri.toString())
|
|
405
|
-
);
|
|
397
|
+
return ( this._source.workspaceFolder.uri.toString());
|
|
406
398
|
}
|
|
407
399
|
return undefined;
|
|
408
400
|
}
|
|
@@ -418,25 +410,23 @@ class ContributedTask extends CommonTask {
|
|
|
418
410
|
return 'extension';
|
|
419
411
|
}
|
|
420
412
|
fromObject(object) {
|
|
421
|
-
return (
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
))
|
|
433
|
-
);
|
|
413
|
+
return ( new ContributedTask(
|
|
414
|
+
object._id,
|
|
415
|
+
object._source,
|
|
416
|
+
object._label,
|
|
417
|
+
object.type,
|
|
418
|
+
object.defines,
|
|
419
|
+
object.command,
|
|
420
|
+
object.hasDefinedMatchers,
|
|
421
|
+
object.runOptions,
|
|
422
|
+
object.configurationProperties
|
|
423
|
+
));
|
|
434
424
|
}
|
|
435
425
|
}
|
|
436
426
|
var KeyedTaskIdentifier;
|
|
437
|
-
( (
|
|
427
|
+
( (function(KeyedTaskIdentifier) {
|
|
438
428
|
function sortedStringify(literal) {
|
|
439
|
-
const keys = (
|
|
429
|
+
const keys = ( Object.keys(literal)).sort();
|
|
440
430
|
let result = '';
|
|
441
431
|
for (const key of keys) {
|
|
442
432
|
let stringified = literal[key];
|
|
@@ -457,9 +447,9 @@ var KeyedTaskIdentifier;
|
|
|
457
447
|
return result;
|
|
458
448
|
}
|
|
459
449
|
KeyedTaskIdentifier.create = create;
|
|
460
|
-
})(KeyedTaskIdentifier || (KeyedTaskIdentifier = {})))
|
|
450
|
+
})(KeyedTaskIdentifier || (KeyedTaskIdentifier = {})));
|
|
461
451
|
var TaskDefinition;
|
|
462
|
-
( (
|
|
452
|
+
( (function(TaskDefinition) {
|
|
463
453
|
function createTaskIdentifier(external, reporter) {
|
|
464
454
|
const definition = TaskDefinitionRegistry.get(external.type);
|
|
465
455
|
if (definition === undefined) {
|
|
@@ -469,15 +459,15 @@ var TaskDefinition;
|
|
|
469
459
|
}
|
|
470
460
|
const literal = Object.create(null);
|
|
471
461
|
literal.type = definition.taskType;
|
|
472
|
-
const required = (
|
|
462
|
+
const required = ( new Set());
|
|
473
463
|
definition.required.forEach(element => required.add(element));
|
|
474
464
|
const properties = definition.properties;
|
|
475
|
-
for (const property of (
|
|
465
|
+
for (const property of ( Object.keys(properties))) {
|
|
476
466
|
const value = external[property];
|
|
477
467
|
if (value !== undefined && value !== null) {
|
|
478
468
|
literal[property] = value;
|
|
479
469
|
}
|
|
480
|
-
else if ((
|
|
470
|
+
else if (( required.has(property))) {
|
|
481
471
|
const schema = properties[property];
|
|
482
472
|
if (schema.default !== undefined) {
|
|
483
473
|
literal[property] = objects.deepClone(schema.default);
|
|
@@ -495,12 +485,12 @@ var TaskDefinition;
|
|
|
495
485
|
literal[property] = '';
|
|
496
486
|
break;
|
|
497
487
|
default:
|
|
498
|
-
reporter.error((
|
|
488
|
+
reporter.error(( nls.localize(
|
|
499
489
|
'TaskDefinition.missingRequiredProperty',
|
|
500
490
|
'Error: the task identifier \'{0}\' is missing the required property \'{1}\'. The task identifier will be ignored.',
|
|
501
491
|
JSON.stringify(external, undefined, 0),
|
|
502
492
|
property
|
|
503
|
-
)))
|
|
493
|
+
)));
|
|
504
494
|
return undefined;
|
|
505
495
|
}
|
|
506
496
|
}
|
|
@@ -509,5 +499,5 @@ var TaskDefinition;
|
|
|
509
499
|
return KeyedTaskIdentifier.create(literal);
|
|
510
500
|
}
|
|
511
501
|
TaskDefinition.createTaskIdentifier = createTaskIdentifier;
|
|
512
|
-
})(TaskDefinition || (TaskDefinition = {})))
|
|
502
|
+
})(TaskDefinition || (TaskDefinition = {})));
|
|
513
503
|
export { CUSTOMIZED_TASK_TYPE, CommandOptions, CommonTask, ConfiguringTask, ContributedTask, CustomTask, KeyedTaskIdentifier, PanelKind, PresentationOptions, RevealKind, RevealProblemKind, RunOnOptions, RunOptions, RuntimeType, TaskDefinition, TaskSourceKind, USER_TASKS_GROUP_KEY };
|
|
@@ -40,7 +40,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
40
40
|
this._storageService = _storageService;
|
|
41
41
|
this.remoteAuthority = null;
|
|
42
42
|
this.extensions = null;
|
|
43
|
-
this._onDidExit = this._register((
|
|
43
|
+
this._onDidExit = this._register(( new Emitter()));
|
|
44
44
|
this.onExit = this._onDidExit.event;
|
|
45
45
|
this._isTerminating = false;
|
|
46
46
|
this._protocolPromise = null;
|
|
@@ -48,12 +48,12 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
48
48
|
this._extensionHostLogsLocation = joinPath(this._environmentService.extHostLogsPath, 'webWorker');
|
|
49
49
|
}
|
|
50
50
|
async _getWebWorkerExtensionHostIframeSrc() {
|
|
51
|
-
const suffixSearchParams = (
|
|
51
|
+
const suffixSearchParams = ( new URLSearchParams());
|
|
52
52
|
if (this._environmentService.debugExtensionHost && this._environmentService.debugRenderer) {
|
|
53
53
|
suffixSearchParams.set('debugged', '1');
|
|
54
54
|
}
|
|
55
55
|
COI.addSearchParam(suffixSearchParams, true, true);
|
|
56
|
-
const suffix = `?${(
|
|
56
|
+
const suffix = `?${( suffixSearchParams.toString())}`;
|
|
57
57
|
const iframeModulePath = 'vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html';
|
|
58
58
|
if (platform.isWeb) {
|
|
59
59
|
const webEndpointUrlTemplate = this._productService.webEndpointUrlTemplate;
|
|
@@ -71,16 +71,14 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
71
71
|
.replace('{{uuid}}', `v--${hash}`)
|
|
72
72
|
.replace('{{commit}}', commit)
|
|
73
73
|
.replace('{{quality}}', quality));
|
|
74
|
-
const res = (
|
|
74
|
+
const res = ( new URL(`${baseUrl}/out/${iframeModulePath}${suffix}`));
|
|
75
75
|
res.searchParams.set('parentOrigin', window.origin);
|
|
76
76
|
res.searchParams.set('salt', stableOriginUUID);
|
|
77
|
-
return (
|
|
78
|
-
(res.toString())
|
|
79
|
-
);
|
|
77
|
+
return ( res.toString());
|
|
80
78
|
}
|
|
81
79
|
}
|
|
82
|
-
const relativeExtensionHostIframeSrc = (
|
|
83
|
-
return `${(
|
|
80
|
+
const relativeExtensionHostIframeSrc = ( FileAccess.asBrowserUri(iframeModulePath));
|
|
81
|
+
return `${( relativeExtensionHostIframeSrc.toString(true))}${suffix}`;
|
|
84
82
|
}
|
|
85
83
|
async start() {
|
|
86
84
|
if (!this._protocolPromise) {
|
|
@@ -91,7 +89,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
91
89
|
}
|
|
92
90
|
async _startInsideIframe() {
|
|
93
91
|
const webWorkerExtensionHostIframeSrc = await this._getWebWorkerExtensionHostIframeSrc();
|
|
94
|
-
const emitter = this._register((
|
|
92
|
+
const emitter = this._register(( new Emitter()));
|
|
95
93
|
const iframe = document.createElement('iframe');
|
|
96
94
|
iframe.setAttribute('class', 'web-worker-ext-host-iframe');
|
|
97
95
|
iframe.setAttribute('sandbox', 'allow-scripts allow-same-origin');
|
|
@@ -100,7 +98,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
100
98
|
iframe.style.display = 'none';
|
|
101
99
|
const vscodeWebWorkerExtHostId = generateUuid();
|
|
102
100
|
iframe.setAttribute('src', `${webWorkerExtensionHostIframeSrc}&vscodeWebWorkerExtHostId=${vscodeWebWorkerExtHostId}`);
|
|
103
|
-
const barrier = (
|
|
101
|
+
const barrier = ( new Barrier());
|
|
104
102
|
let port;
|
|
105
103
|
let barrierError = null;
|
|
106
104
|
let barrierHasError = false;
|
|
@@ -130,7 +128,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
130
128
|
}
|
|
131
129
|
if (event.data.error) {
|
|
132
130
|
const { name, message, stack } = event.data.error;
|
|
133
|
-
const err = (
|
|
131
|
+
const err = ( new Error());
|
|
134
132
|
err.message = message;
|
|
135
133
|
err.name = name;
|
|
136
134
|
err.stack = stack;
|
|
@@ -139,7 +137,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
139
137
|
const { data } = event.data;
|
|
140
138
|
if (barrier.isOpen() || !(data instanceof MessagePort)) {
|
|
141
139
|
console.warn('UNEXPECTED message', event);
|
|
142
|
-
const err = (
|
|
140
|
+
const err = ( new Error('UNEXPECTED message'));
|
|
143
141
|
return rejectBarrier(81 , err);
|
|
144
142
|
}
|
|
145
143
|
resolveBarrier(data);
|
|
@@ -150,8 +148,8 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
150
148
|
if (barrierHasError) {
|
|
151
149
|
throw barrierError;
|
|
152
150
|
}
|
|
153
|
-
const messagePorts = this._environmentService.options?.messagePorts ?? (
|
|
154
|
-
iframe.contentWindow.postMessage({ type: 'vscode.init', data: messagePorts }, '*', [...(
|
|
151
|
+
const messagePorts = this._environmentService.options?.messagePorts ?? ( new Map());
|
|
152
|
+
iframe.contentWindow.postMessage({ type: 'vscode.init', data: messagePorts }, '*', [...( messagePorts.values())]);
|
|
155
153
|
port.onmessage = (event) => {
|
|
156
154
|
const { data } = event;
|
|
157
155
|
if (!(data instanceof ArrayBuffer)) {
|
|
@@ -159,7 +157,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
159
157
|
this._onDidExit.fire([77, 'UNKNOWN data received']);
|
|
160
158
|
return;
|
|
161
159
|
}
|
|
162
|
-
emitter.fire(VSBuffer.wrap((
|
|
160
|
+
emitter.fire(VSBuffer.wrap(( new Uint8Array(data, 0, data.byteLength))));
|
|
163
161
|
};
|
|
164
162
|
const protocol = {
|
|
165
163
|
onMessage: emitter.event,
|
|
@@ -206,7 +204,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
206
204
|
const nlsBaseUrl = this._productService.extensionsGallery?.nlsBaseUrl;
|
|
207
205
|
let nlsUrlWithDetails = undefined;
|
|
208
206
|
if (nlsBaseUrl && this._productService.commit && !platform.Language.isDefaultVariant()) {
|
|
209
|
-
nlsUrlWithDetails = URI.joinPath((
|
|
207
|
+
nlsUrlWithDetails = URI.joinPath(( URI.parse(nlsBaseUrl)), this._productService.commit, this._productService.version, platform.Language.value());
|
|
210
208
|
}
|
|
211
209
|
return {
|
|
212
210
|
commit: this._productService.commit,
|
|
@@ -258,16 +256,16 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
258
256
|
};
|
|
259
257
|
}
|
|
260
258
|
};
|
|
261
|
-
WebWorkerExtensionHost = (
|
|
262
|
-
(
|
|
263
|
-
(
|
|
264
|
-
(
|
|
265
|
-
(
|
|
266
|
-
(
|
|
267
|
-
(
|
|
268
|
-
(
|
|
269
|
-
(
|
|
270
|
-
(
|
|
271
|
-
(
|
|
272
|
-
], WebWorkerExtensionHost))
|
|
259
|
+
WebWorkerExtensionHost = ( __decorate([
|
|
260
|
+
( __param(3, ITelemetryService)),
|
|
261
|
+
( __param(4, IWorkspaceContextService)),
|
|
262
|
+
( __param(5, ILabelService)),
|
|
263
|
+
( __param(6, ILogService)),
|
|
264
|
+
( __param(7, ILoggerService)),
|
|
265
|
+
( __param(8, IBrowserWorkbenchEnvironmentService)),
|
|
266
|
+
( __param(9, IUserDataProfilesService)),
|
|
267
|
+
( __param(10, IProductService)),
|
|
268
|
+
( __param(11, ILayoutService)),
|
|
269
|
+
( __param(12, IStorageService))
|
|
270
|
+
], WebWorkerExtensionHost));
|
|
273
271
|
export { WebWorkerExtensionHost };
|