@codingame/monaco-vscode-extensions-service-override 9.0.2 → 10.0.0
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/_virtual/semver.js +5 -0
- package/assets/webWorkerExtensionHostIframe.esm.html +8 -4
- package/extensions.js +14 -5
- package/override/vs/workbench/browser/parts/editor/textEditor.weak.js +1 -1
- package/package.json +3 -3
- package/vscode/src/vs/base/common/console.js +0 -2
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagementCLI.js +35 -35
- package/vscode/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.js +0 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js +54 -31
- package/vscode/src/vs/workbench/api/browser/mainThreadBulkEdits.js +1 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.js +4 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadChatCodeMapper.js +57 -0
- package/vscode/src/vs/workbench/api/browser/mainThreadComments.js +9 -10
- package/vscode/src/vs/workbench/api/browser/mainThreadConfiguration.js +9 -11
- package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js +16 -33
- package/vscode/src/vs/workbench/api/browser/mainThreadDebugService.js +4 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadDocuments.js +2 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.js +6 -12
- package/vscode/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadEditor.js +16 -14
- package/vscode/src/vs/workbench/api/browser/mainThreadEditorTabs.js +38 -38
- package/vscode/src/vs/workbench/api/browser/mainThreadEmbeddings.js +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js +17 -19
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystem.js +5 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js +39 -80
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageFeatures.js +23 -24
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModelTools.js +8 -6
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadManagedSockets.js +2 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadMessageService.js +4 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.js +2 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookDto.js +1 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookKernels.js +14 -11
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadProgress.js +3 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadSCM.js +77 -42
- package/vscode/src/vs/workbench/api/browser/mainThreadSaveParticipant.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadSearch.js +23 -6
- package/vscode/src/vs/workbench/api/browser/mainThreadStatusBar.js +3 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadStorage.js +1 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadTask.js +17 -17
- package/vscode/src/vs/workbench/api/browser/mainThreadTelemetry.js +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadTerminalService.js +3 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.js +4 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadTesting.js +5 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js +14 -10
- package/vscode/src/vs/workbench/api/browser/mainThreadUriOpeners.js +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviewPanels.js +3 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadWorkspace.js +11 -11
- package/vscode/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.js +22 -10
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/contributedOpeners.js +1 -2
- package/vscode/src/vs/workbench/services/extensionManagement/browser/extensionBisect.js +30 -33
- package/vscode/src/vs/workbench/services/extensions/browser/extensionService.js +19 -24
- package/vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.js +11 -15
- package/vscode/src/vs/workbench/services/extensions/browser/webWorkerFileSystemProvider.js +2 -2
- package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js +32 -32
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js +7 -8
- package/vscode/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.js +12 -12
- package/vscode/src/vs/workbench/services/extensions/common/extensionStorageMigration.js +2 -3
- package/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.js +1 -1
- package/vscode/src/vs/workbench/services/extensions/common/extensionsUtil.js +5 -5
- package/vscode/src/vs/workbench/services/extensions/common/lazyCreateExtensionHostManager.js +2 -2
- package/vscode/src/vs/workbench/services/extensions/common/remoteExtensionHost.js +7 -9
|
@@ -5,8 +5,8 @@ import { isEqual } from 'vscode/vscode/vs/base/common/resources';
|
|
|
5
5
|
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
6
6
|
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
|
|
7
7
|
import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
|
|
8
|
-
import { ExtHostContext,
|
|
9
|
-
import { EditorResourceAccessor, SideBySideEditor
|
|
8
|
+
import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
|
|
9
|
+
import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
|
|
10
10
|
import { DiffEditorInput } from 'vscode/vscode/vs/workbench/common/editor/diffEditorInput';
|
|
11
11
|
import { isGroupEditorMoveEvent } from 'vscode/vscode/vs/workbench/common/editor/editorGroupModel';
|
|
12
12
|
import { SideBySideEditorInput } from 'vscode/vscode/vs/workbench/common/editor/sideBySideEditorInput';
|
|
@@ -20,7 +20,7 @@ import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook
|
|
|
20
20
|
import { TerminalEditorInput } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput';
|
|
21
21
|
import { WebviewInput } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
|
|
22
22
|
import { editorGroupToColumn, columnToEditorGroup } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupColumn';
|
|
23
|
-
import {
|
|
23
|
+
import { preferredSideBySideGroupDirection } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
|
|
24
24
|
import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
|
|
25
25
|
import { SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
|
|
26
26
|
import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
@@ -73,7 +73,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
|
|
|
73
73
|
_editorInputToDto(editor) {
|
|
74
74
|
if (editor instanceof MergeEditorInput) {
|
|
75
75
|
return {
|
|
76
|
-
kind:
|
|
76
|
+
kind: 3 ,
|
|
77
77
|
base: editor.base,
|
|
78
78
|
input1: editor.input1.uri,
|
|
79
79
|
input2: editor.input2.uri,
|
|
@@ -82,7 +82,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
|
|
|
82
82
|
}
|
|
83
83
|
if (editor instanceof AbstractTextResourceEditorInput) {
|
|
84
84
|
return {
|
|
85
|
-
kind:
|
|
85
|
+
kind: 1 ,
|
|
86
86
|
uri: editor.resource
|
|
87
87
|
};
|
|
88
88
|
}
|
|
@@ -95,48 +95,48 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
|
|
|
95
95
|
&& primaryResource
|
|
96
96
|
&& secondaryResource) {
|
|
97
97
|
return {
|
|
98
|
-
kind:
|
|
98
|
+
kind: 1 ,
|
|
99
99
|
uri: primaryResource
|
|
100
100
|
};
|
|
101
101
|
}
|
|
102
|
-
return { kind:
|
|
102
|
+
return { kind: 0 };
|
|
103
103
|
}
|
|
104
104
|
if (editor instanceof NotebookEditorInput) {
|
|
105
105
|
return {
|
|
106
|
-
kind:
|
|
106
|
+
kind: 4 ,
|
|
107
107
|
notebookType: editor.viewType,
|
|
108
108
|
uri: editor.resource
|
|
109
109
|
};
|
|
110
110
|
}
|
|
111
111
|
if (editor instanceof CustomEditorInput) {
|
|
112
112
|
return {
|
|
113
|
-
kind:
|
|
113
|
+
kind: 6 ,
|
|
114
114
|
viewType: editor.viewType,
|
|
115
115
|
uri: editor.resource,
|
|
116
116
|
};
|
|
117
117
|
}
|
|
118
118
|
if (editor instanceof WebviewInput) {
|
|
119
119
|
return {
|
|
120
|
-
kind:
|
|
120
|
+
kind: 7 ,
|
|
121
121
|
viewType: editor.viewType
|
|
122
122
|
};
|
|
123
123
|
}
|
|
124
124
|
if (editor instanceof TerminalEditorInput) {
|
|
125
125
|
return {
|
|
126
|
-
kind:
|
|
126
|
+
kind: 8
|
|
127
127
|
};
|
|
128
128
|
}
|
|
129
129
|
if (editor instanceof DiffEditorInput) {
|
|
130
130
|
if (editor.modified instanceof AbstractTextResourceEditorInput && editor.original instanceof AbstractTextResourceEditorInput) {
|
|
131
131
|
return {
|
|
132
|
-
kind:
|
|
132
|
+
kind: 2 ,
|
|
133
133
|
modified: editor.modified.resource,
|
|
134
134
|
original: editor.original.resource
|
|
135
135
|
};
|
|
136
136
|
}
|
|
137
137
|
if (editor.modified instanceof NotebookEditorInput && editor.original instanceof NotebookEditorInput) {
|
|
138
138
|
return {
|
|
139
|
-
kind:
|
|
139
|
+
kind: 5 ,
|
|
140
140
|
notebookType: editor.original.viewType,
|
|
141
141
|
modified: editor.modified.resource,
|
|
142
142
|
original: editor.original.resource
|
|
@@ -145,14 +145,14 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
|
|
|
145
145
|
}
|
|
146
146
|
if (editor instanceof InteractiveEditorInput) {
|
|
147
147
|
return {
|
|
148
|
-
kind:
|
|
148
|
+
kind: 9 ,
|
|
149
149
|
uri: editor.resource,
|
|
150
150
|
inputBoxUri: editor.inputResource
|
|
151
151
|
};
|
|
152
152
|
}
|
|
153
153
|
if (editor instanceof ChatEditorInput) {
|
|
154
154
|
return {
|
|
155
|
-
kind:
|
|
155
|
+
kind: 10 ,
|
|
156
156
|
};
|
|
157
157
|
}
|
|
158
158
|
if (editor instanceof MultiDiffEditorInput) {
|
|
@@ -160,18 +160,18 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
|
|
|
160
160
|
for (const resource of (editor?.resources.get() ?? [])) {
|
|
161
161
|
if (resource.originalUri && resource.modifiedUri) {
|
|
162
162
|
diffEditors.push({
|
|
163
|
-
kind:
|
|
163
|
+
kind: 2 ,
|
|
164
164
|
original: resource.originalUri,
|
|
165
165
|
modified: resource.modifiedUri
|
|
166
166
|
});
|
|
167
167
|
}
|
|
168
168
|
}
|
|
169
169
|
return {
|
|
170
|
-
kind:
|
|
170
|
+
kind: 11 ,
|
|
171
171
|
diffEditors
|
|
172
172
|
};
|
|
173
173
|
}
|
|
174
|
-
return { kind:
|
|
174
|
+
return { kind: 0 };
|
|
175
175
|
}
|
|
176
176
|
_generateTabId(editor, groupId) {
|
|
177
177
|
let resourceString;
|
|
@@ -201,7 +201,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
|
|
|
201
201
|
groupId,
|
|
202
202
|
index: editorIndex,
|
|
203
203
|
tabDto: tabInfo.tab,
|
|
204
|
-
kind:
|
|
204
|
+
kind: 2
|
|
205
205
|
});
|
|
206
206
|
}
|
|
207
207
|
else {
|
|
@@ -235,7 +235,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
|
|
|
235
235
|
groupId,
|
|
236
236
|
index: editorIndex,
|
|
237
237
|
tabDto: tabInfo.tab,
|
|
238
|
-
kind:
|
|
238
|
+
kind: 2
|
|
239
239
|
});
|
|
240
240
|
}));
|
|
241
241
|
}
|
|
@@ -243,7 +243,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
|
|
|
243
243
|
groupId,
|
|
244
244
|
index: editorIndex,
|
|
245
245
|
tabDto: tabObject,
|
|
246
|
-
kind:
|
|
246
|
+
kind: 0
|
|
247
247
|
});
|
|
248
248
|
}
|
|
249
249
|
_onDidTabClose(groupId, editorIndex) {
|
|
@@ -265,7 +265,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
|
|
|
265
265
|
groupId,
|
|
266
266
|
index: editorIndex,
|
|
267
267
|
tabDto: removedTab[0],
|
|
268
|
-
kind:
|
|
268
|
+
kind: 1
|
|
269
269
|
});
|
|
270
270
|
}
|
|
271
271
|
_onDidTabActiveChange(groupId, editorIndex) {
|
|
@@ -279,7 +279,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
|
|
|
279
279
|
groupId,
|
|
280
280
|
index: editorIndex,
|
|
281
281
|
tabDto: activeTab,
|
|
282
|
-
kind:
|
|
282
|
+
kind: 2
|
|
283
283
|
});
|
|
284
284
|
}
|
|
285
285
|
_onDidTabDirty(groupId, editorIndex, editor) {
|
|
@@ -295,7 +295,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
|
|
|
295
295
|
groupId,
|
|
296
296
|
index: editorIndex,
|
|
297
297
|
tabDto: tabInfo.tab,
|
|
298
|
-
kind:
|
|
298
|
+
kind: 2
|
|
299
299
|
});
|
|
300
300
|
}
|
|
301
301
|
_onDidTabPinChange(groupId, editorIndex, editor) {
|
|
@@ -313,7 +313,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
|
|
|
313
313
|
groupId,
|
|
314
314
|
index: editorIndex,
|
|
315
315
|
tabDto: tab,
|
|
316
|
-
kind:
|
|
316
|
+
kind: 2
|
|
317
317
|
});
|
|
318
318
|
}
|
|
319
319
|
_onDidTabPreviewChange(groupId, editorIndex, editor) {
|
|
@@ -328,7 +328,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
|
|
|
328
328
|
}
|
|
329
329
|
tab.isPreview = !group.isPinned(editorIndex);
|
|
330
330
|
this._proxy.$acceptTabOperation({
|
|
331
|
-
kind:
|
|
331
|
+
kind: 2 ,
|
|
332
332
|
groupId,
|
|
333
333
|
tabDto: tab,
|
|
334
334
|
index: editorIndex
|
|
@@ -347,7 +347,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
|
|
|
347
347
|
}
|
|
348
348
|
tabs.splice(editorIndex, 0, removedTab[0]);
|
|
349
349
|
this._proxy.$acceptTabOperation({
|
|
350
|
-
kind:
|
|
350
|
+
kind: 3 ,
|
|
351
351
|
groupId,
|
|
352
352
|
tabDto: removedTab[0],
|
|
353
353
|
index: editorIndex,
|
|
@@ -389,7 +389,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
|
|
|
389
389
|
const event = changeEvent.event;
|
|
390
390
|
const groupId = changeEvent.groupId;
|
|
391
391
|
switch (event.kind) {
|
|
392
|
-
case
|
|
392
|
+
case 0 :
|
|
393
393
|
if (groupId === this._editorGroupsService.activeGroup.id) {
|
|
394
394
|
this._onDidGroupActivate();
|
|
395
395
|
break;
|
|
@@ -397,44 +397,44 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
|
|
|
397
397
|
else {
|
|
398
398
|
return;
|
|
399
399
|
}
|
|
400
|
-
case
|
|
400
|
+
case 9 :
|
|
401
401
|
if (event.editor !== undefined && event.editorIndex !== undefined) {
|
|
402
402
|
this._onDidTabLabelChange(groupId, event.editor, event.editorIndex);
|
|
403
403
|
break;
|
|
404
404
|
}
|
|
405
|
-
case
|
|
405
|
+
case 5 :
|
|
406
406
|
if (event.editor !== undefined && event.editorIndex !== undefined) {
|
|
407
407
|
this._onDidTabOpen(groupId, event.editor, event.editorIndex);
|
|
408
408
|
break;
|
|
409
409
|
}
|
|
410
|
-
case
|
|
410
|
+
case 6 :
|
|
411
411
|
if (event.editorIndex !== undefined) {
|
|
412
412
|
this._onDidTabClose(groupId, event.editorIndex);
|
|
413
413
|
break;
|
|
414
414
|
}
|
|
415
|
-
case
|
|
415
|
+
case 8 :
|
|
416
416
|
if (event.editorIndex !== undefined) {
|
|
417
417
|
this._onDidTabActiveChange(groupId, event.editorIndex);
|
|
418
418
|
break;
|
|
419
419
|
}
|
|
420
|
-
case
|
|
420
|
+
case 14 :
|
|
421
421
|
if (event.editorIndex !== undefined && event.editor !== undefined) {
|
|
422
422
|
this._onDidTabDirty(groupId, event.editorIndex, event.editor);
|
|
423
423
|
break;
|
|
424
424
|
}
|
|
425
|
-
case
|
|
425
|
+
case 13 :
|
|
426
426
|
if (event.editorIndex !== undefined && event.editor !== undefined) {
|
|
427
427
|
this._onDidTabPinChange(groupId, event.editorIndex, event.editor);
|
|
428
428
|
break;
|
|
429
429
|
}
|
|
430
|
-
case
|
|
430
|
+
case 11 :
|
|
431
431
|
if (event.editorIndex !== undefined && event.editor !== undefined) {
|
|
432
432
|
this._onDidTabPreviewChange(groupId, event.editorIndex, event.editor);
|
|
433
433
|
break;
|
|
434
434
|
}
|
|
435
|
-
case
|
|
435
|
+
case 12 :
|
|
436
436
|
break;
|
|
437
|
-
case
|
|
437
|
+
case 7 :
|
|
438
438
|
if (isGroupEditorMoveEvent(event) && event.editor && event.editorIndex !== undefined && event.oldEditorIndex !== undefined) {
|
|
439
439
|
this._onDidTabMove(groupId, event.editorIndex, event.oldEditorIndex, event.editor);
|
|
440
440
|
break;
|
|
@@ -456,7 +456,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
|
|
|
456
456
|
return;
|
|
457
457
|
}
|
|
458
458
|
if (this._groupLookup.get(groupId) === undefined) {
|
|
459
|
-
let direction =
|
|
459
|
+
let direction = 3 ;
|
|
460
460
|
if (viewColumn === SIDE_GROUP) {
|
|
461
461
|
direction = preferredSideBySideGroupDirection(this._configurationService);
|
|
462
462
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
|
|
2
2
|
import { Emitter } from 'vscode/vscode/vs/base/common/event';
|
|
3
3
|
import { DisposableStore, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
4
|
-
import { registerSingleton
|
|
4
|
+
import { registerSingleton } from 'vscode/vscode/vs/platform/instantiation/common/extensions';
|
|
5
5
|
import { createDecorator } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
6
6
|
import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
|
|
7
7
|
import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
|
|
@@ -36,7 +36,7 @@ class EmbeddingsService {
|
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
|
-
registerSingleton(IEmbeddingsService, EmbeddingsService,
|
|
39
|
+
registerSingleton(IEmbeddingsService, EmbeddingsService, 1 );
|
|
40
40
|
let MainThreadEmbeddings = class MainThreadEmbeddings {
|
|
41
41
|
constructor(context, embeddingsService) {
|
|
42
42
|
this.embeddingsService = embeddingsService;
|
|
@@ -9,13 +9,11 @@ import { localize } from 'vscode/vscode/vs/nls';
|
|
|
9
9
|
import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
|
|
10
10
|
import { areSameExtensions } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
|
|
11
11
|
import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
|
|
12
|
-
import {
|
|
12
|
+
import { WebSocketRemoteConnection, ManagedRemoteConnection } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
|
|
13
13
|
import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
|
|
14
14
|
import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service';
|
|
15
15
|
import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
|
|
16
|
-
import { EnablementState } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
|
|
17
16
|
import { IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
|
|
18
|
-
import { ExtensionHostKind } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostKind';
|
|
19
17
|
import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
|
|
20
18
|
import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
|
|
21
19
|
import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
|
|
@@ -90,40 +88,40 @@ let MainThreadExtensionService = class MainThreadExtensionService {
|
|
|
90
88
|
this._notificationService.notify({
|
|
91
89
|
severity: Severity$1.Error,
|
|
92
90
|
message: ( localize(
|
|
93
|
-
|
|
91
|
+
4835,
|
|
94
92
|
"Cannot activate the '{0}' extension because it depends on the '{1}' extension, which is not loaded. Would you like to reload the window to load the extension?",
|
|
95
93
|
extName,
|
|
96
94
|
missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
|
|
97
95
|
)),
|
|
98
96
|
actions: {
|
|
99
|
-
primary: [( (new Action('reload', ( localize(
|
|
97
|
+
primary: [( (new Action('reload', ( localize(4836, "Reload Window")), '', true, () => this._hostService.reload())))]
|
|
100
98
|
}
|
|
101
99
|
});
|
|
102
100
|
}
|
|
103
101
|
else {
|
|
104
102
|
const enablementState = this._extensionEnablementService.getEnablementState(missingInstalledDependency);
|
|
105
|
-
if (enablementState ===
|
|
103
|
+
if (enablementState === 4 ) {
|
|
106
104
|
this._notificationService.notify({
|
|
107
105
|
severity: Severity$1.Error,
|
|
108
106
|
message: ( localize(
|
|
109
|
-
|
|
107
|
+
4837,
|
|
110
108
|
"Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in the current workspace",
|
|
111
109
|
extName,
|
|
112
110
|
missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
|
|
113
111
|
)),
|
|
114
112
|
});
|
|
115
113
|
}
|
|
116
|
-
else if (enablementState ===
|
|
114
|
+
else if (enablementState === 0 ) {
|
|
117
115
|
this._notificationService.notify({
|
|
118
116
|
severity: Severity$1.Error,
|
|
119
117
|
message: ( localize(
|
|
120
|
-
|
|
118
|
+
4838,
|
|
121
119
|
"Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in Restricted Mode",
|
|
122
120
|
extName,
|
|
123
121
|
missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
|
|
124
122
|
)),
|
|
125
123
|
actions: {
|
|
126
|
-
primary: [( (new Action('manageWorkspaceTrust', ( localize(
|
|
124
|
+
primary: [( (new Action('manageWorkspaceTrust', ( localize(4839, "Manage Workspace Trust")), '', true, () => this._commandService.executeCommand('workbench.trust.manage'))))]
|
|
127
125
|
}
|
|
128
126
|
});
|
|
129
127
|
}
|
|
@@ -131,13 +129,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
|
|
|
131
129
|
this._notificationService.notify({
|
|
132
130
|
severity: Severity$1.Error,
|
|
133
131
|
message: ( localize(
|
|
134
|
-
|
|
132
|
+
4840,
|
|
135
133
|
"Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled. Would you like to enable the extension and reload the window?",
|
|
136
134
|
extName,
|
|
137
135
|
missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
|
|
138
136
|
)),
|
|
139
137
|
actions: {
|
|
140
|
-
primary: [( (new Action('enable', ( localize(
|
|
138
|
+
primary: [( (new Action('enable', ( localize(4841, "Enable and Reload")), '', true, () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === 7 ? 9 : 10 )
|
|
141
139
|
.then(() => this._hostService.reload(), e => this._notificationService.error(e)))))]
|
|
142
140
|
}
|
|
143
141
|
});
|
|
@@ -146,7 +144,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
|
|
|
146
144
|
this._notificationService.notify({
|
|
147
145
|
severity: Severity$1.Error,
|
|
148
146
|
message: ( localize(
|
|
149
|
-
|
|
147
|
+
4842,
|
|
150
148
|
"Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled.",
|
|
151
149
|
extName,
|
|
152
150
|
missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
|
|
@@ -167,21 +165,21 @@ let MainThreadExtensionService = class MainThreadExtensionService {
|
|
|
167
165
|
this._notificationService.notify({
|
|
168
166
|
severity: Severity$1.Error,
|
|
169
167
|
message: ( localize(
|
|
170
|
-
|
|
168
|
+
4843,
|
|
171
169
|
"Cannot activate the '{0}' extension because it depends on the '{1}' extension from '{2}', which is not installed. Would you like to install the extension and reload the window?",
|
|
172
170
|
extName,
|
|
173
171
|
dependencyExtension.displayName,
|
|
174
172
|
dependencyExtension.publisherDisplayName
|
|
175
173
|
)),
|
|
176
174
|
actions: {
|
|
177
|
-
primary: [( (new Action('install', ( localize(
|
|
175
|
+
primary: [( (new Action('install', ( localize(4844, "Install and Reload")), '', true, () => this._extensionsWorkbenchService.install(dependencyExtension)
|
|
178
176
|
.then(() => this._hostService.reload(), e => this._notificationService.error(e)))))]
|
|
179
177
|
}
|
|
180
178
|
});
|
|
181
179
|
}
|
|
182
180
|
else {
|
|
183
181
|
this._notificationService.error(( localize(
|
|
184
|
-
|
|
182
|
+
4845,
|
|
185
183
|
"Cannot activate the '{0}' extension because it depends on an unknown '{1}' extension.",
|
|
186
184
|
extName,
|
|
187
185
|
missingDependency
|
|
@@ -189,10 +187,10 @@ let MainThreadExtensionService = class MainThreadExtensionService {
|
|
|
189
187
|
}
|
|
190
188
|
}
|
|
191
189
|
async $setPerformanceMarks(marks) {
|
|
192
|
-
if (this._extensionHostKind ===
|
|
190
|
+
if (this._extensionHostKind === 1 ) {
|
|
193
191
|
this._timerService.setPerformanceMarks('localExtHost', marks);
|
|
194
192
|
}
|
|
195
|
-
else if (this._extensionHostKind ===
|
|
193
|
+
else if (this._extensionHostKind === 2 ) {
|
|
196
194
|
this._timerService.setPerformanceMarks('workerExtHost', marks);
|
|
197
195
|
}
|
|
198
196
|
else {
|
|
@@ -284,7 +282,7 @@ function reviveResolvedAuthority(resolvedAuthority) {
|
|
|
284
282
|
};
|
|
285
283
|
}
|
|
286
284
|
function reviveConnection(connection) {
|
|
287
|
-
if (connection.type ===
|
|
285
|
+
if (connection.type === 0 ) {
|
|
288
286
|
return (
|
|
289
287
|
(new WebSocketRemoteConnection(connection.host, connection.port))
|
|
290
288
|
);
|
|
@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
|
|
|
2
2
|
import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
|
|
3
3
|
import { DisposableMap, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
4
4
|
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
5
|
-
import { FilePermission, FileSystemProviderErrorCode, FileType, FileOperationError,
|
|
5
|
+
import { FilePermission, FileSystemProviderErrorCode, FileType, FileOperationError, toFileSystemProviderErrorCode } from 'vscode/vscode/vs/platform/files/common/files';
|
|
6
6
|
import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
|
|
7
7
|
import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
|
|
8
8
|
import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
|
|
@@ -105,16 +105,16 @@ let MainThreadFileSystem = MainThreadFileSystem_1 = class MainThreadFileSystem {
|
|
|
105
105
|
static _handleError(err) {
|
|
106
106
|
if (err instanceof FileOperationError) {
|
|
107
107
|
switch (err.fileOperationResult) {
|
|
108
|
-
case
|
|
108
|
+
case 1 :
|
|
109
109
|
err.name = FileSystemProviderErrorCode.FileNotFound;
|
|
110
110
|
break;
|
|
111
|
-
case
|
|
111
|
+
case 0 :
|
|
112
112
|
err.name = FileSystemProviderErrorCode.FileIsADirectory;
|
|
113
113
|
break;
|
|
114
|
-
case
|
|
114
|
+
case 6 :
|
|
115
115
|
err.name = FileSystemProviderErrorCode.NoPermissions;
|
|
116
116
|
break;
|
|
117
|
-
case
|
|
117
|
+
case 4 :
|
|
118
118
|
err.name = FileSystemProviderErrorCode.FileExists;
|
|
119
119
|
break;
|
|
120
120
|
}
|