@codingame/monaco-vscode-extensions-service-override 25.1.1 → 26.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/index.js +7 -0
- package/package.json +3 -3
- package/vscode/src/vs/base/common/console.js +24 -15
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagementCLI.d.ts +4 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagementCLI.js +149 -84
- package/vscode/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.js +20 -12
- package/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.js +38 -21
- package/vscode/src/vs/platform/remote/common/managedSocket.js +7 -10
- package/vscode/src/vs/workbench/api/browser/mainThreadAiEmbeddingVector.js +5 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadAiRelatedInformation.js +5 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadAiSettingsSearch.js +4 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js +200 -143
- package/vscode/src/vs/workbench/api/browser/mainThreadBulkEdits.js +10 -14
- package/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.js +41 -31
- package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.d.ts +9 -12
- package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.js +168 -115
- package/vscode/src/vs/workbench/api/browser/mainThreadChatCodeMapper.js +11 -13
- package/vscode/src/vs/workbench/api/browser/mainThreadChatContext.d.ts +5 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadChatContext.js +42 -15
- package/vscode/src/vs/workbench/api/browser/mainThreadChatOutputRenderer.js +8 -7
- package/vscode/src/vs/workbench/api/browser/mainThreadChatSessions.d.ts +4 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadChatSessions.js +170 -99
- package/vscode/src/vs/workbench/api/browser/mainThreadChatStatus.js +2 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadClipboard.js +4 -9
- package/vscode/src/vs/workbench/api/browser/mainThreadCodeInsets.js +13 -12
- package/vscode/src/vs/workbench/api/browser/mainThreadCommands.js +16 -19
- package/vscode/src/vs/workbench/api/browser/mainThreadComments.js +127 -70
- package/vscode/src/vs/workbench/api/browser/mainThreadConfiguration.js +80 -26
- package/vscode/src/vs/workbench/api/browser/mainThreadConsole.js +5 -11
- package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js +199 -97
- package/vscode/src/vs/workbench/api/browser/mainThreadDataChannels.js +1 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadDebugService.js +88 -73
- package/vscode/src/vs/workbench/api/browser/mainThreadDecorations.js +5 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadDiagnostics.js +16 -12
- package/vscode/src/vs/workbench/api/browser/mainThreadDialogs.js +10 -8
- package/vscode/src/vs/workbench/api/browser/mainThreadDocumentContentProviders.js +14 -6
- package/vscode/src/vs/workbench/api/browser/mainThreadDocuments.js +52 -37
- package/vscode/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.js +78 -58
- package/vscode/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.js +5 -7
- package/vscode/src/vs/workbench/api/browser/mainThreadEditor.js +75 -63
- package/vscode/src/vs/workbench/api/browser/mainThreadEditorTabs.js +99 -91
- package/vscode/src/vs/workbench/api/browser/mainThreadEditors.js +93 -55
- package/vscode/src/vs/workbench/api/browser/mainThreadEmbeddings.js +3 -7
- package/vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js +85 -60
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystem.js +49 -45
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js +114 -72
- package/vscode/src/vs/workbench/api/browser/mainThreadInteractive.js +4 -7
- package/vscode/src/vs/workbench/api/browser/mainThreadLabelService.js +1 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageFeatures.d.ts +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageFeatures.js +381 -238
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModelTools.d.ts +7 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModelTools.js +90 -13
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js +81 -58
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguages.js +9 -10
- package/vscode/src/vs/workbench/api/browser/mainThreadLocalization.js +2 -7
- package/vscode/src/vs/workbench/api/browser/mainThreadLogService.js +6 -10
- package/vscode/src/vs/workbench/api/browser/mainThreadManagedSockets.js +12 -10
- package/vscode/src/vs/workbench/api/browser/mainThreadMcp.d.ts +3 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadMcp.js +162 -97
- package/vscode/src/vs/workbench/api/browser/mainThreadMessageService.js +32 -26
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebook.js +38 -32
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookDocuments.js +48 -46
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.js +22 -18
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookDto.js +5 -8
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookEditors.js +35 -21
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookKernels.js +31 -28
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js +5 -7
- package/vscode/src/vs/workbench/api/browser/mainThreadOutputService.js +47 -23
- package/vscode/src/vs/workbench/api/browser/mainThreadProfileContentHandlers.js +15 -12
- package/vscode/src/vs/workbench/api/browser/mainThreadProgress.js +17 -18
- package/vscode/src/vs/workbench/api/browser/mainThreadQuickDiff.js +6 -7
- package/vscode/src/vs/workbench/api/browser/mainThreadQuickOpen.js +83 -66
- package/vscode/src/vs/workbench/api/browser/mainThreadRemoteConnectionData.js +1 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadSCM.js +250 -92
- package/vscode/src/vs/workbench/api/browser/mainThreadSaveParticipant.js +6 -8
- package/vscode/src/vs/workbench/api/browser/mainThreadSearch.js +37 -26
- package/vscode/src/vs/workbench/api/browser/mainThreadSecretState.js +34 -21
- package/vscode/src/vs/workbench/api/browser/mainThreadShare.js +3 -6
- package/vscode/src/vs/workbench/api/browser/mainThreadSpeech.js +19 -14
- package/vscode/src/vs/workbench/api/browser/mainThreadStatusBar.js +41 -16
- package/vscode/src/vs/workbench/api/browser/mainThreadStorage.js +18 -17
- package/vscode/src/vs/workbench/api/browser/mainThreadTask.js +145 -145
- package/vscode/src/vs/workbench/api/browser/mainThreadTelemetry.js +19 -11
- package/vscode/src/vs/workbench/api/browser/mainThreadTerminalService.js +176 -80
- package/vscode/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.js +52 -21
- package/vscode/src/vs/workbench/api/browser/mainThreadTesting.js +26 -24
- package/vscode/src/vs/workbench/api/browser/mainThreadTheming.js +1 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadTimeline.js +5 -8
- package/vscode/src/vs/workbench/api/browser/mainThreadTreeViews.d.ts +4 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadTreeViews.js +106 -46
- package/vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js +83 -65
- package/vscode/src/vs/workbench/api/browser/mainThreadUriOpeners.js +20 -20
- package/vscode/src/vs/workbench/api/browser/mainThreadUrls.js +14 -9
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviewManager.js +17 -9
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviewPanels.js +49 -38
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviewViews.js +10 -13
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.js +38 -27
- package/vscode/src/vs/workbench/api/browser/mainThreadWindow.js +5 -11
- package/vscode/src/vs/workbench/api/browser/mainThreadWorkspace.d.ts +4 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadWorkspace.js +73 -43
- package/vscode/src/vs/workbench/api/common/shared/dataTransferCache.js +2 -2
- package/vscode/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.js +17 -10
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/contributedOpeners.js +17 -11
- package/vscode/src/vs/workbench/services/extensionManagement/browser/extensionBisect.js +107 -80
- package/vscode/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.js +336 -175
- package/vscode/src/vs/workbench/services/extensions/browser/extensionService.js +126 -71
- package/vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.js +76 -54
- package/vscode/src/vs/workbench/services/extensions/browser/webWorkerFileSystemProvider.js +1 -2
- package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.d.ts +2 -0
- package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js +343 -192
- package/vscode/src/vs/workbench/services/extensions/common/extHostCustomers.js +5 -3
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.d.ts +0 -1
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js +75 -68
- package/vscode/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.js +135 -36
- package/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.js +22 -18
- package/vscode/src/vs/workbench/services/extensions/common/extensionsUtil.js +14 -12
- package/vscode/src/vs/workbench/services/extensions/common/lazyCreateExtensionHostManager.js +21 -9
- package/vscode/src/vs/workbench/services/extensions/common/remoteExtensionHost.js +48 -25
- package/vscode/src/vs/workbench/services/themes/browser/cssExtensionPoint.d.ts +24 -0
- package/vscode/src/vs/workbench/services/themes/browser/cssExtensionPoint.js +300 -0
|
@@ -40,8 +40,57 @@ import { AsyncIterableProducer } from '@codingame/monaco-vscode-api/vscode/vs/ba
|
|
|
40
40
|
|
|
41
41
|
var BrowserExtensionHostKindPicker_1;
|
|
42
42
|
let ExtensionService = class ExtensionService extends AbstractExtensionService {
|
|
43
|
-
constructor(
|
|
44
|
-
|
|
43
|
+
constructor(
|
|
44
|
+
options,
|
|
45
|
+
extensionsProposedApi,
|
|
46
|
+
extensionHostFactory,
|
|
47
|
+
extensionHostKindPicker,
|
|
48
|
+
instantiationService,
|
|
49
|
+
notificationService,
|
|
50
|
+
_browserEnvironmentService,
|
|
51
|
+
telemetryService,
|
|
52
|
+
extensionEnablementService,
|
|
53
|
+
fileService,
|
|
54
|
+
productService,
|
|
55
|
+
extensionManagementService,
|
|
56
|
+
contextService,
|
|
57
|
+
configurationService,
|
|
58
|
+
extensionManifestPropertiesService,
|
|
59
|
+
_webExtensionsScannerService,
|
|
60
|
+
logService,
|
|
61
|
+
remoteAgentService,
|
|
62
|
+
remoteExtensionsScannerService,
|
|
63
|
+
lifecycleService,
|
|
64
|
+
remoteAuthorityResolverService,
|
|
65
|
+
_userDataInitializationService,
|
|
66
|
+
_userDataProfileService,
|
|
67
|
+
_workspaceTrustManagementService,
|
|
68
|
+
_remoteExplorerService,
|
|
69
|
+
dialogService
|
|
70
|
+
) {
|
|
71
|
+
super(
|
|
72
|
+
options,
|
|
73
|
+
extensionsProposedApi,
|
|
74
|
+
extensionHostFactory,
|
|
75
|
+
extensionHostKindPicker,
|
|
76
|
+
instantiationService,
|
|
77
|
+
notificationService,
|
|
78
|
+
_browserEnvironmentService,
|
|
79
|
+
telemetryService,
|
|
80
|
+
extensionEnablementService,
|
|
81
|
+
fileService,
|
|
82
|
+
productService,
|
|
83
|
+
extensionManagementService,
|
|
84
|
+
contextService,
|
|
85
|
+
configurationService,
|
|
86
|
+
extensionManifestPropertiesService,
|
|
87
|
+
logService,
|
|
88
|
+
remoteAgentService,
|
|
89
|
+
remoteExtensionsScannerService,
|
|
90
|
+
lifecycleService,
|
|
91
|
+
remoteAuthorityResolverService,
|
|
92
|
+
dialogService
|
|
93
|
+
);
|
|
45
94
|
this._browserEnvironmentService = _browserEnvironmentService;
|
|
46
95
|
this._webExtensionsScannerService = _webExtensionsScannerService;
|
|
47
96
|
this._userDataInitializationService = _userDataInitializationService;
|
|
@@ -69,11 +118,12 @@ let ExtensionService = class ExtensionService extends AbstractExtensionService {
|
|
|
69
118
|
try {
|
|
70
119
|
await Promise.all([
|
|
71
120
|
this._webExtensionsScannerService.scanSystemExtensions().then(extensions => system.push(...( extensions.map(e => toExtensionDescription(e))))),
|
|
72
|
-
this._webExtensionsScannerService.scanUserExtensions(this._userDataProfileService.currentProfile.extensionsResource, {
|
|
121
|
+
this._webExtensionsScannerService.scanUserExtensions(this._userDataProfileService.currentProfile.extensionsResource, {
|
|
122
|
+
skipInvalidExtensions: true
|
|
123
|
+
}).then(extensions => user.push(...( extensions.map(e => toExtensionDescription(e))))),
|
|
73
124
|
this._webExtensionsScannerService.scanExtensionsUnderDevelopment().then(extensions => development.push(...( extensions.map(e => toExtensionDescription(e, true)))))
|
|
74
125
|
]);
|
|
75
|
-
}
|
|
76
|
-
catch (error) {
|
|
126
|
+
} catch (error) {
|
|
77
127
|
this._logService.error(error);
|
|
78
128
|
}
|
|
79
129
|
return dedupExtensions(system, user, [], development, this._logService);
|
|
@@ -108,8 +158,7 @@ let ExtensionService = class ExtensionService extends AbstractExtensionService {
|
|
|
108
158
|
let resolverResult;
|
|
109
159
|
try {
|
|
110
160
|
resolverResult = await this._resolveAuthorityInitial(remoteAuthority);
|
|
111
|
-
}
|
|
112
|
-
catch (err) {
|
|
161
|
+
} catch (err) {
|
|
113
162
|
if (RemoteAuthorityResolverError.isHandled(err)) {
|
|
114
163
|
console.log(`Error handled: Not showing a notification for the error`);
|
|
115
164
|
}
|
|
@@ -120,7 +169,7 @@ let ExtensionService = class ExtensionService extends AbstractExtensionService {
|
|
|
120
169
|
this._remoteExplorerService.setTunnelInformation(resolverResult.tunnelInformation);
|
|
121
170
|
const connection = this._remoteAgentService.getConnection();
|
|
122
171
|
if (connection) {
|
|
123
|
-
this._register(connection.onDidStateChange(async
|
|
172
|
+
this._register(connection.onDidStateChange(async e => {
|
|
124
173
|
if (e.type === PersistentConnectionEventType.ConnectionLost) {
|
|
125
174
|
this._remoteAuthorityResolverService._clearResolvedAuthority(remoteAuthority);
|
|
126
175
|
}
|
|
@@ -132,7 +181,7 @@ let ExtensionService = class ExtensionService extends AbstractExtensionService {
|
|
|
132
181
|
async _onExtensionHostExit(code) {
|
|
133
182
|
await this._doStopExtensionHosts();
|
|
134
183
|
const automatedWindow = mainWindow;
|
|
135
|
-
if (typeof automatedWindow.codeAutomationExit ===
|
|
184
|
+
if (typeof automatedWindow.codeAutomationExit === "function") {
|
|
136
185
|
automatedWindow.codeAutomationExit(code, await getLogs(this._fileService, this._environmentService));
|
|
137
186
|
}
|
|
138
187
|
}
|
|
@@ -140,32 +189,18 @@ let ExtensionService = class ExtensionService extends AbstractExtensionService {
|
|
|
140
189
|
return this._resolveAuthorityOnExtensionHosts(ExtensionHostKind.LocalWebWorker, remoteAuthority);
|
|
141
190
|
}
|
|
142
191
|
};
|
|
143
|
-
ExtensionService = ( __decorate([
|
|
144
|
-
( __param(4, IInstantiationService)),
|
|
145
|
-
( __param(5, INotificationService)),
|
|
146
|
-
( __param(6, IBrowserWorkbenchEnvironmentService)),
|
|
147
|
-
( __param(7, ITelemetryService)),
|
|
148
|
-
( __param(8, IWorkbenchExtensionEnablementService)),
|
|
149
|
-
( __param(9, IFileService)),
|
|
150
|
-
( __param(10, IProductService)),
|
|
151
|
-
( __param(11, IWorkbenchExtensionManagementService)),
|
|
152
|
-
( __param(12, IWorkspaceContextService)),
|
|
153
|
-
( __param(13, IConfigurationService)),
|
|
154
|
-
( __param(14, IExtensionManifestPropertiesService)),
|
|
155
|
-
( __param(15, IWebExtensionsScannerService)),
|
|
156
|
-
( __param(16, ILogService)),
|
|
157
|
-
( __param(17, IRemoteAgentService)),
|
|
158
|
-
( __param(18, IRemoteExtensionsScannerService)),
|
|
159
|
-
( __param(19, ILifecycleService)),
|
|
160
|
-
( __param(20, IRemoteAuthorityResolverService)),
|
|
161
|
-
( __param(21, IUserDataInitializationService)),
|
|
162
|
-
( __param(22, IUserDataProfileService)),
|
|
163
|
-
( __param(23, IWorkspaceTrustManagementService)),
|
|
164
|
-
( __param(24, IRemoteExplorerService)),
|
|
165
|
-
( __param(25, IDialogService))
|
|
166
|
-
], ExtensionService));
|
|
192
|
+
ExtensionService = ( __decorate([( __param(4, IInstantiationService)), ( __param(5, INotificationService)), ( __param(6, IBrowserWorkbenchEnvironmentService)), ( __param(7, ITelemetryService)), ( __param(8, IWorkbenchExtensionEnablementService)), ( __param(9, IFileService)), ( __param(10, IProductService)), ( __param(11, IWorkbenchExtensionManagementService)), ( __param(12, IWorkspaceContextService)), ( __param(13, IConfigurationService)), ( __param(14, IExtensionManifestPropertiesService)), ( __param(15, IWebExtensionsScannerService)), ( __param(16, ILogService)), ( __param(17, IRemoteAgentService)), ( __param(18, IRemoteExtensionsScannerService)), ( __param(19, ILifecycleService)), ( __param(20, IRemoteAuthorityResolverService)), ( __param(21, IUserDataInitializationService)), ( __param(22, IUserDataProfileService)), ( __param(23, IWorkspaceTrustManagementService)), ( __param(24, IRemoteExplorerService)), ( __param(25, IDialogService))], ExtensionService));
|
|
167
193
|
let BrowserExtensionHostFactory = class BrowserExtensionHostFactory {
|
|
168
|
-
constructor(
|
|
194
|
+
constructor(
|
|
195
|
+
_extensionsProposedApi,
|
|
196
|
+
_scanWebExtensions,
|
|
197
|
+
_getExtensionRegistrySnapshotWhenReady,
|
|
198
|
+
_instantiationService,
|
|
199
|
+
_remoteAgentService,
|
|
200
|
+
_remoteAuthorityResolverService,
|
|
201
|
+
_extensionEnablementService,
|
|
202
|
+
_logService
|
|
203
|
+
) {
|
|
169
204
|
this._extensionsProposedApi = _extensionsProposedApi;
|
|
170
205
|
this._scanWebExtensions = _scanWebExtensions;
|
|
171
206
|
this._getExtensionRegistrySnapshotWhenReady = _getExtensionRegistrySnapshotWhenReady;
|
|
@@ -177,19 +212,29 @@ let BrowserExtensionHostFactory = class BrowserExtensionHostFactory {
|
|
|
177
212
|
}
|
|
178
213
|
createExtensionHost(runningLocations, runningLocation, isInitialStart) {
|
|
179
214
|
switch (runningLocation.kind) {
|
|
180
|
-
|
|
215
|
+
case ExtensionHostKind.LocalProcess:
|
|
216
|
+
{
|
|
181
217
|
return null;
|
|
182
218
|
}
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
219
|
+
case ExtensionHostKind.LocalWebWorker:
|
|
220
|
+
{
|
|
221
|
+
const startup = (isInitialStart ? ExtensionHostStartup.EagerManualStart : ExtensionHostStartup.EagerAutoStart);
|
|
222
|
+
return this._instantiationService.createInstance(
|
|
223
|
+
WebWorkerExtensionHost,
|
|
224
|
+
runningLocation,
|
|
225
|
+
startup,
|
|
226
|
+
this._createLocalExtensionHostDataProvider(runningLocations, runningLocation, isInitialStart)
|
|
227
|
+
);
|
|
188
228
|
}
|
|
189
|
-
|
|
229
|
+
case ExtensionHostKind.Remote:
|
|
230
|
+
{
|
|
190
231
|
const remoteAgentConnection = this._remoteAgentService.getConnection();
|
|
191
232
|
if (remoteAgentConnection) {
|
|
192
|
-
return this._instantiationService.createInstance(
|
|
233
|
+
return this._instantiationService.createInstance(
|
|
234
|
+
RemoteExtensionHost,
|
|
235
|
+
runningLocation,
|
|
236
|
+
this._createRemoteExtensionHostDataProvider(runningLocations, remoteAgentConnection.remoteAuthority)
|
|
237
|
+
);
|
|
193
238
|
}
|
|
194
239
|
return null;
|
|
195
240
|
}
|
|
@@ -199,17 +244,30 @@ let BrowserExtensionHostFactory = class BrowserExtensionHostFactory {
|
|
|
199
244
|
return {
|
|
200
245
|
getInitData: async () => {
|
|
201
246
|
if (isInitialStart) {
|
|
202
|
-
const localExtensions = checkEnabledAndProposedAPI(
|
|
247
|
+
const localExtensions = checkEnabledAndProposedAPI(
|
|
248
|
+
this._logService,
|
|
249
|
+
this._extensionEnablementService,
|
|
250
|
+
this._extensionsProposedApi,
|
|
251
|
+
await this._scanWebExtensions(),
|
|
252
|
+
true
|
|
253
|
+
);
|
|
203
254
|
const runningLocation = runningLocations.computeRunningLocation(localExtensions, [], false);
|
|
204
|
-
const myExtensions = filterExtensionDescriptions(
|
|
255
|
+
const myExtensions = filterExtensionDescriptions(
|
|
256
|
+
localExtensions,
|
|
257
|
+
runningLocation,
|
|
258
|
+
extRunningLocation => desiredRunningLocation.equals(extRunningLocation)
|
|
259
|
+
);
|
|
205
260
|
const extensions = ( new ExtensionHostExtensions(0, localExtensions, ( myExtensions.map(extension => extension.identifier))));
|
|
206
|
-
return {
|
|
207
|
-
|
|
208
|
-
|
|
261
|
+
return {
|
|
262
|
+
extensions
|
|
263
|
+
};
|
|
264
|
+
} else {
|
|
209
265
|
const snapshot = await this._getExtensionRegistrySnapshotWhenReady();
|
|
210
266
|
const myExtensions = runningLocations.filterByRunningLocation(snapshot.extensions, desiredRunningLocation);
|
|
211
267
|
const extensions = ( new ExtensionHostExtensions(snapshot.versionId, snapshot.extensions, ( myExtensions.map(extension => extension.identifier))));
|
|
212
|
-
return {
|
|
268
|
+
return {
|
|
269
|
+
extensions
|
|
270
|
+
};
|
|
213
271
|
}
|
|
214
272
|
}
|
|
215
273
|
};
|
|
@@ -221,7 +279,7 @@ let BrowserExtensionHostFactory = class BrowserExtensionHostFactory {
|
|
|
221
279
|
const snapshot = await this._getExtensionRegistrySnapshotWhenReady();
|
|
222
280
|
const remoteEnv = await this._remoteAgentService.getEnvironment();
|
|
223
281
|
if (!remoteEnv) {
|
|
224
|
-
throw ( new Error(
|
|
282
|
+
throw ( new Error("Cannot provide init data for remote extension host!"));
|
|
225
283
|
}
|
|
226
284
|
const myExtensions = runningLocations.filterByExtensionHostKind(snapshot.extensions, ExtensionHostKind.Remote);
|
|
227
285
|
const extensions = ( new ExtensionHostExtensions(snapshot.versionId, snapshot.extensions, ( myExtensions.map(extension => extension.identifier))));
|
|
@@ -232,53 +290,52 @@ let BrowserExtensionHostFactory = class BrowserExtensionHostFactory {
|
|
|
232
290
|
extensionHostLogsPath: remoteEnv.extensionHostLogsPath,
|
|
233
291
|
globalStorageHome: remoteEnv.globalStorageHome,
|
|
234
292
|
workspaceStorageHome: remoteEnv.workspaceStorageHome,
|
|
235
|
-
extensions
|
|
293
|
+
extensions
|
|
236
294
|
};
|
|
237
295
|
}
|
|
238
296
|
};
|
|
239
297
|
}
|
|
240
298
|
};
|
|
241
|
-
BrowserExtensionHostFactory = ( __decorate([
|
|
242
|
-
( __param(3, IInstantiationService)),
|
|
243
|
-
( __param(4, IRemoteAgentService)),
|
|
244
|
-
( __param(5, IRemoteAuthorityResolverService)),
|
|
245
|
-
( __param(6, IWorkbenchExtensionEnablementService)),
|
|
246
|
-
( __param(7, ILogService))
|
|
247
|
-
], BrowserExtensionHostFactory));
|
|
299
|
+
BrowserExtensionHostFactory = ( __decorate([( __param(3, IInstantiationService)), ( __param(4, IRemoteAgentService)), ( __param(5, IRemoteAuthorityResolverService)), ( __param(6, IWorkbenchExtensionEnablementService)), ( __param(7, ILogService))], BrowserExtensionHostFactory));
|
|
248
300
|
let BrowserExtensionHostKindPicker = BrowserExtensionHostKindPicker_1 = class BrowserExtensionHostKindPicker {
|
|
249
301
|
constructor(_logService) {
|
|
250
302
|
this._logService = _logService;
|
|
251
303
|
}
|
|
252
|
-
pickExtensionHostKind(
|
|
304
|
+
pickExtensionHostKind(
|
|
305
|
+
extensionId,
|
|
306
|
+
extensionKinds,
|
|
307
|
+
isInstalledLocally,
|
|
308
|
+
isInstalledRemotely,
|
|
309
|
+
preference
|
|
310
|
+
) {
|
|
253
311
|
const result = BrowserExtensionHostKindPicker_1.pickRunningLocation(extensionKinds, isInstalledLocally, isInstalledRemotely, preference);
|
|
254
|
-
this._logService.trace(
|
|
312
|
+
this._logService.trace(
|
|
313
|
+
`pickRunningLocation for ${extensionId.value}, extension kinds: [${extensionKinds.join(", ")}], isInstalledLocally: ${isInstalledLocally}, isInstalledRemotely: ${isInstalledRemotely}, preference: ${extensionRunningPreferenceToString(preference)} => ${extensionHostKindToString(result)}`
|
|
314
|
+
);
|
|
255
315
|
return result;
|
|
256
316
|
}
|
|
257
317
|
static pickRunningLocation(extensionKinds, isInstalledLocally, isInstalledRemotely, preference) {
|
|
258
318
|
const result = [];
|
|
259
319
|
let canRunRemotely = false;
|
|
260
320
|
for (const extensionKind of extensionKinds) {
|
|
261
|
-
if (extensionKind ===
|
|
321
|
+
if (extensionKind === "ui" && isInstalledRemotely) {
|
|
262
322
|
if (preference === ExtensionRunningPreference.Remote) {
|
|
263
323
|
return ExtensionHostKind.Remote;
|
|
264
|
-
}
|
|
265
|
-
else {
|
|
324
|
+
} else {
|
|
266
325
|
canRunRemotely = true;
|
|
267
326
|
}
|
|
268
327
|
}
|
|
269
|
-
if (extensionKind ===
|
|
328
|
+
if (extensionKind === "workspace" && isInstalledRemotely) {
|
|
270
329
|
if (preference === ExtensionRunningPreference.None || preference === ExtensionRunningPreference.Remote) {
|
|
271
330
|
return ExtensionHostKind.Remote;
|
|
272
|
-
}
|
|
273
|
-
else {
|
|
331
|
+
} else {
|
|
274
332
|
result.push(ExtensionHostKind.Remote);
|
|
275
333
|
}
|
|
276
334
|
}
|
|
277
|
-
if (extensionKind ===
|
|
335
|
+
if (extensionKind === "web" && (isInstalledLocally || isInstalledRemotely)) {
|
|
278
336
|
if (preference === ExtensionRunningPreference.None || preference === ExtensionRunningPreference.Local) {
|
|
279
337
|
return ExtensionHostKind.LocalWebWorker;
|
|
280
|
-
}
|
|
281
|
-
else {
|
|
338
|
+
} else {
|
|
282
339
|
result.push(ExtensionHostKind.LocalWebWorker);
|
|
283
340
|
}
|
|
284
341
|
}
|
|
@@ -289,8 +346,6 @@ let BrowserExtensionHostKindPicker = BrowserExtensionHostKindPicker_1 = class Br
|
|
|
289
346
|
return (result.length > 0 ? result[0] : null);
|
|
290
347
|
}
|
|
291
348
|
};
|
|
292
|
-
BrowserExtensionHostKindPicker = BrowserExtensionHostKindPicker_1 = ( __decorate([
|
|
293
|
-
( __param(0, ILogService))
|
|
294
|
-
], BrowserExtensionHostKindPicker));
|
|
349
|
+
BrowserExtensionHostKindPicker = BrowserExtensionHostKindPicker_1 = ( __decorate([( __param(0, ILogService))], BrowserExtensionHostKindPicker));
|
|
295
350
|
|
|
296
351
|
export { BrowserExtensionHostFactory, BrowserExtensionHostKindPicker, ExtensionService };
|
|
@@ -13,7 +13,7 @@ import { isWeb, Language, language } from '@codingame/monaco-vscode-api/vscode/v
|
|
|
13
13
|
import { joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
|
|
14
14
|
import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
|
|
15
15
|
import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
|
|
16
|
-
import '@codingame/monaco-vscode-api/vscode/vs/nls';
|
|
16
|
+
import { getNLSLanguage, getNLSMessages } from '@codingame/monaco-vscode-api/vscode/vs/nls';
|
|
17
17
|
import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
|
|
18
18
|
import { ILayoutService } from '@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service';
|
|
19
19
|
import { ILogService, ILoggerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
|
|
@@ -31,10 +31,25 @@ import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-ap
|
|
|
31
31
|
import { IDefaultLogLevelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/log/common/defaultLogLevels.service';
|
|
32
32
|
import { ExtensionHostExitCode, isMessageOfType, MessageType, createMessageOfType, UIKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostProtocol';
|
|
33
33
|
import { ExtensionHostStartup } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
|
|
34
|
-
import { getNLSLanguage, getNLSMessages } from '@codingame/monaco-vscode-api/vscode/vs/nls.messages';
|
|
35
34
|
|
|
36
35
|
let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
37
|
-
constructor(
|
|
36
|
+
constructor(
|
|
37
|
+
runningLocation,
|
|
38
|
+
startup,
|
|
39
|
+
_initDataProvider,
|
|
40
|
+
_telemetryService,
|
|
41
|
+
_contextService,
|
|
42
|
+
_labelService,
|
|
43
|
+
_logService,
|
|
44
|
+
_loggerService,
|
|
45
|
+
_environmentService,
|
|
46
|
+
_userDataProfilesService,
|
|
47
|
+
_productService,
|
|
48
|
+
_layoutService,
|
|
49
|
+
_storageService,
|
|
50
|
+
_webWorkerService,
|
|
51
|
+
_defaultLogLevelsService
|
|
52
|
+
) {
|
|
38
53
|
super();
|
|
39
54
|
this.runningLocation = runningLocation;
|
|
40
55
|
this.startup = startup;
|
|
@@ -59,15 +74,15 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
59
74
|
this._isTerminating = false;
|
|
60
75
|
this._protocolPromise = null;
|
|
61
76
|
this._protocol = null;
|
|
62
|
-
this._extensionHostLogsLocation = joinPath(this._environmentService.extHostLogsPath,
|
|
77
|
+
this._extensionHostLogsLocation = joinPath(this._environmentService.extHostLogsPath, "webWorker");
|
|
63
78
|
}
|
|
64
79
|
async _getWebWorkerExtensionHostIframeSrc() {
|
|
65
80
|
const suffixSearchParams = ( new URLSearchParams());
|
|
66
81
|
if (this._environmentService.debugExtensionHost && this._environmentService.debugRenderer) {
|
|
67
|
-
suffixSearchParams.set(
|
|
82
|
+
suffixSearchParams.set("debugged", "1");
|
|
68
83
|
}
|
|
69
84
|
COI.addSearchParam(suffixSearchParams, true, true);
|
|
70
|
-
suffixSearchParams.set(
|
|
85
|
+
suffixSearchParams.set("parentOrigin", mainWindow.origin);
|
|
71
86
|
const suffix = `?${( suffixSearchParams.toString())}`;
|
|
72
87
|
const iframeModulePath = `vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html`;
|
|
73
88
|
if (isWeb) {
|
|
@@ -75,26 +90,24 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
75
90
|
const commit = this._productService.commit;
|
|
76
91
|
const quality = this._productService.quality;
|
|
77
92
|
if (webEndpointUrlTemplate && commit && quality) {
|
|
78
|
-
const key =
|
|
93
|
+
const key = "webWorkerExtensionHostIframeStableOriginUUID";
|
|
79
94
|
let stableOriginUUID = this._storageService.get(key, StorageScope.WORKSPACE);
|
|
80
|
-
if (typeof stableOriginUUID ===
|
|
95
|
+
if (typeof stableOriginUUID === "undefined") {
|
|
81
96
|
stableOriginUUID = generateUuid();
|
|
82
97
|
this._storageService.store(key, stableOriginUUID, StorageScope.WORKSPACE, StorageTarget.MACHINE);
|
|
83
98
|
}
|
|
84
99
|
const hash = await parentOriginHash(mainWindow.origin, stableOriginUUID);
|
|
85
|
-
const baseUrl = (
|
|
86
|
-
|
|
87
|
-
.replace('{{commit}}', commit)
|
|
88
|
-
.replace('{{quality}}', quality));
|
|
100
|
+
const baseUrl = (
|
|
101
|
+
webEndpointUrlTemplate.replace("{{uuid}}", `v--${hash}`).replace("{{commit}}", commit).replace("{{quality}}", quality));
|
|
89
102
|
const res = ( new URL(`${baseUrl}/out/${iframeModulePath}${suffix}`));
|
|
90
|
-
res.searchParams.set(
|
|
103
|
+
res.searchParams.set("salt", stableOriginUUID);
|
|
91
104
|
return ( res.toString());
|
|
92
105
|
}
|
|
93
106
|
}
|
|
94
107
|
const relativeExtensionHostIframeSrc = this._webWorkerService.getWorkerUrl(( new WebWorkerDescriptor({
|
|
95
108
|
esmModuleLocation: ( FileAccess.asBrowserUri(iframeModulePath)),
|
|
96
109
|
esmModuleLocationBundler: ( new URL(`../worker/webWorkerExtensionHostIframe.html`, import.meta.url)),
|
|
97
|
-
label:
|
|
110
|
+
label: "webWorkerExtensionHostIframe"
|
|
98
111
|
})));
|
|
99
112
|
return `${relativeExtensionHostIframeSrc}${suffix}`;
|
|
100
113
|
}
|
|
@@ -108,14 +121,17 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
108
121
|
async _startInsideIframe() {
|
|
109
122
|
const webWorkerExtensionHostIframeSrc = await this._getWebWorkerExtensionHostIframeSrc();
|
|
110
123
|
const emitter = this._register(( new Emitter()));
|
|
111
|
-
const iframe = createElement(
|
|
112
|
-
iframe.setAttribute(
|
|
113
|
-
iframe.setAttribute(
|
|
114
|
-
iframe.setAttribute(
|
|
115
|
-
iframe.setAttribute(
|
|
116
|
-
iframe.style.display =
|
|
124
|
+
const iframe = createElement("iframe");
|
|
125
|
+
iframe.setAttribute("class", "web-worker-ext-host-iframe");
|
|
126
|
+
iframe.setAttribute("sandbox", "allow-scripts allow-same-origin");
|
|
127
|
+
iframe.setAttribute("allow", "usb; serial; hid; cross-origin-isolated; local-network-access;");
|
|
128
|
+
iframe.setAttribute("aria-hidden", "true");
|
|
129
|
+
iframe.style.display = "none";
|
|
117
130
|
const vscodeWebWorkerExtHostId = generateUuid();
|
|
118
|
-
iframe.setAttribute(
|
|
131
|
+
iframe.setAttribute(
|
|
132
|
+
"src",
|
|
133
|
+
`${webWorkerExtensionHostIframeSrc}&vscodeWebWorkerExtHostId=${vscodeWebWorkerExtHostId}`
|
|
134
|
+
);
|
|
119
135
|
const barrier = ( new Barrier());
|
|
120
136
|
let port;
|
|
121
137
|
let barrierError = null;
|
|
@@ -129,15 +145,17 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
129
145
|
this._onDidExit.fire([ExtensionHostExitCode.UnexpectedError, barrierError.message]);
|
|
130
146
|
barrier.open();
|
|
131
147
|
};
|
|
132
|
-
const resolveBarrier =
|
|
148
|
+
const resolveBarrier = messagePort => {
|
|
133
149
|
port = messagePort;
|
|
134
150
|
clearTimeout(startTimeout);
|
|
135
151
|
barrier.open();
|
|
136
152
|
};
|
|
137
153
|
startTimeout = setTimeout(() => {
|
|
138
|
-
console.warn(
|
|
154
|
+
console.warn(
|
|
155
|
+
`The Web Worker Extension Host did not start in 60s, that might be a problem.`
|
|
156
|
+
);
|
|
139
157
|
}, 60000);
|
|
140
|
-
this._register(addDisposableListener(mainWindow,
|
|
158
|
+
this._register(addDisposableListener(mainWindow, "message", event => {
|
|
141
159
|
if (event.source !== iframe.contentWindow) {
|
|
142
160
|
return;
|
|
143
161
|
}
|
|
@@ -145,14 +163,18 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
145
163
|
return;
|
|
146
164
|
}
|
|
147
165
|
if (event.data.error) {
|
|
148
|
-
const {
|
|
166
|
+
const {
|
|
167
|
+
name,
|
|
168
|
+
message,
|
|
169
|
+
stack
|
|
170
|
+
} = event.data.error;
|
|
149
171
|
const err = ( new Error());
|
|
150
172
|
err.message = message;
|
|
151
173
|
err.name = name;
|
|
152
174
|
err.stack = stack;
|
|
153
175
|
return rejectBarrier(ExtensionHostExitCode.UnexpectedError, err);
|
|
154
176
|
}
|
|
155
|
-
if (event.data.type ===
|
|
177
|
+
if (event.data.type === "vscode.bootstrap.nls") {
|
|
156
178
|
iframe.contentWindow.postMessage({
|
|
157
179
|
type: event.data.type,
|
|
158
180
|
data: {
|
|
@@ -164,13 +186,15 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
164
186
|
language: getNLSLanguage()
|
|
165
187
|
}
|
|
166
188
|
}
|
|
167
|
-
},
|
|
189
|
+
}, "*");
|
|
168
190
|
return;
|
|
169
191
|
}
|
|
170
|
-
const {
|
|
192
|
+
const {
|
|
193
|
+
data
|
|
194
|
+
} = event.data;
|
|
171
195
|
if (barrier.isOpen() || !(data instanceof mainWindow.MessagePort)) {
|
|
172
|
-
console.warn(
|
|
173
|
-
const err = ( new Error(
|
|
196
|
+
console.warn("UNEXPECTED message", event);
|
|
197
|
+
const err = ( new Error("UNEXPECTED message"));
|
|
174
198
|
return rejectBarrier(ExtensionHostExitCode.UnexpectedError, err);
|
|
175
199
|
}
|
|
176
200
|
resolveBarrier(data);
|
|
@@ -182,12 +206,17 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
182
206
|
throw barrierError;
|
|
183
207
|
}
|
|
184
208
|
const messagePorts = this._environmentService.options?.messagePorts ?? ( new Map());
|
|
185
|
-
iframe.contentWindow.postMessage({
|
|
186
|
-
|
|
187
|
-
|
|
209
|
+
iframe.contentWindow.postMessage({
|
|
210
|
+
type: "vscode.init",
|
|
211
|
+
data: messagePorts
|
|
212
|
+
}, "*", [...( messagePorts.values())]);
|
|
213
|
+
port.onmessage = event => {
|
|
214
|
+
const {
|
|
215
|
+
data
|
|
216
|
+
} = event;
|
|
188
217
|
if (!(data instanceof mainWindow.ArrayBuffer)) {
|
|
189
|
-
console.warn(
|
|
190
|
-
this._onDidExit.fire([77,
|
|
218
|
+
console.warn("UNKNOWN data received", data);
|
|
219
|
+
this._onDidExit.fire([77, "UNKNOWN data received"]);
|
|
191
220
|
return;
|
|
192
221
|
}
|
|
193
222
|
emitter.fire(VSBuffer.wrap(new mainWindow.Uint8Array(data, 0, data.byteLength)));
|
|
@@ -202,7 +231,9 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
202
231
|
return this._performHandshake(protocol);
|
|
203
232
|
}
|
|
204
233
|
async _performHandshake(protocol) {
|
|
205
|
-
await Event.toPromise(
|
|
234
|
+
await Event.toPromise(
|
|
235
|
+
Event.filter(protocol.onMessage, msg => isMessageOfType(msg, MessageType.Ready))
|
|
236
|
+
);
|
|
206
237
|
if (this._isTerminating) {
|
|
207
238
|
throw canceled();
|
|
208
239
|
}
|
|
@@ -210,7 +241,9 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
210
241
|
if (this._isTerminating) {
|
|
211
242
|
throw canceled();
|
|
212
243
|
}
|
|
213
|
-
await Event.toPromise(
|
|
244
|
+
await Event.toPromise(
|
|
245
|
+
Event.filter(protocol.onMessage, msg => isMessageOfType(msg, MessageType.Initialized))
|
|
246
|
+
);
|
|
214
247
|
if (this._isTerminating) {
|
|
215
248
|
throw canceled();
|
|
216
249
|
}
|
|
@@ -248,10 +281,11 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
248
281
|
environment: {
|
|
249
282
|
isExtensionDevelopmentDebug: this._environmentService.debugRenderer,
|
|
250
283
|
appName: this._productService.nameLong,
|
|
251
|
-
appHost: this._productService.embedderIdentifier ?? (isWeb ?
|
|
284
|
+
appHost: this._productService.embedderIdentifier ?? (isWeb ? "web" : "desktop"),
|
|
252
285
|
appUriScheme: this._productService.urlProtocol,
|
|
253
286
|
appLanguage: language,
|
|
254
287
|
isExtensionTelemetryLoggingOnly: isLoggingOnly(this._productService, this._environmentService),
|
|
288
|
+
isPortable: false,
|
|
255
289
|
extensionDevelopmentLocationURI: this._environmentService.extensionDevelopmentLocationURI,
|
|
256
290
|
extensionTestsLocationURI: this._environmentService.extensionTestsLocationURI,
|
|
257
291
|
globalStorageHome: this._userDataProfilesService.defaultProfile.globalStorageHome,
|
|
@@ -262,7 +296,8 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
262
296
|
configuration: workspace.configuration || undefined,
|
|
263
297
|
id: workspace.id,
|
|
264
298
|
name: this._labelService.getWorkspaceLabel(workspace),
|
|
265
|
-
transient: workspace.transient
|
|
299
|
+
transient: workspace.transient,
|
|
300
|
+
isAgentSessionsWorkspace: workspace.isAgentSessionsWorkspace
|
|
266
301
|
},
|
|
267
302
|
consoleForward: {
|
|
268
303
|
includeStack: false,
|
|
@@ -293,22 +328,9 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
|
|
|
293
328
|
};
|
|
294
329
|
}
|
|
295
330
|
};
|
|
296
|
-
WebWorkerExtensionHost = ( __decorate([
|
|
297
|
-
( __param(3, ITelemetryService)),
|
|
298
|
-
( __param(4, IWorkspaceContextService)),
|
|
299
|
-
( __param(5, ILabelService)),
|
|
300
|
-
( __param(6, ILogService)),
|
|
301
|
-
( __param(7, ILoggerService)),
|
|
302
|
-
( __param(8, IBrowserWorkbenchEnvironmentService)),
|
|
303
|
-
( __param(9, IUserDataProfilesService)),
|
|
304
|
-
( __param(10, IProductService)),
|
|
305
|
-
( __param(11, ILayoutService)),
|
|
306
|
-
( __param(12, IStorageService)),
|
|
307
|
-
( __param(13, IWebWorkerService)),
|
|
308
|
-
( __param(14, IDefaultLogLevelsService))
|
|
309
|
-
], WebWorkerExtensionHost));
|
|
331
|
+
WebWorkerExtensionHost = ( __decorate([( __param(3, ITelemetryService)), ( __param(4, IWorkspaceContextService)), ( __param(5, ILabelService)), ( __param(6, ILogService)), ( __param(7, ILoggerService)), ( __param(8, IBrowserWorkbenchEnvironmentService)), ( __param(9, IUserDataProfilesService)), ( __param(10, IProductService)), ( __param(11, ILayoutService)), ( __param(12, IStorageService)), ( __param(13, IWebWorkerService)), ( __param(14, IDefaultLogLevelsService))], WebWorkerExtensionHost));
|
|
310
332
|
const extensionHostWorkerMainDescriptor = ( new WebWorkerDescriptor({
|
|
311
|
-
label:
|
|
333
|
+
label: "extensionHostWorkerMain"
|
|
312
334
|
}));
|
|
313
335
|
|
|
314
336
|
export { WebWorkerExtensionHost };
|
|
@@ -17,8 +17,7 @@ class FetchFileSystemProvider {
|
|
|
17
17
|
return ( new Uint8Array(await res.arrayBuffer()));
|
|
18
18
|
}
|
|
19
19
|
throw createFileSystemProviderError(res.statusText, FileSystemProviderErrorCode.Unknown);
|
|
20
|
-
}
|
|
21
|
-
catch (err) {
|
|
20
|
+
} catch (err) {
|
|
22
21
|
throw createFileSystemProviderError(err, FileSystemProviderErrorCode.Unknown);
|
|
23
22
|
}
|
|
24
23
|
}
|
|
@@ -71,6 +71,7 @@ export declare abstract class AbstractExtensionService extends Disposable implem
|
|
|
71
71
|
private readonly _installedExtensionsReady;
|
|
72
72
|
private readonly _extensionStatus;
|
|
73
73
|
private readonly _allRequestedActivateEvents;
|
|
74
|
+
private readonly _pendingRemoteActivationEvents;
|
|
74
75
|
private readonly _runningLocations;
|
|
75
76
|
private readonly _remoteCrashTracker;
|
|
76
77
|
private _deltaExtensionsQueue;
|
|
@@ -93,6 +94,7 @@ export declare abstract class AbstractExtensionService extends Disposable implem
|
|
|
93
94
|
private _initializePromise;
|
|
94
95
|
protected _initializeIfNeeded(): Promise<void> | null;
|
|
95
96
|
protected _initialize(): Promise<void>;
|
|
97
|
+
private _activateDeferredRemoteEvents;
|
|
96
98
|
private _resolveAndProcessExtensions;
|
|
97
99
|
private _handleExtensionTests;
|
|
98
100
|
private findTestExtensionHost;
|