@codingame/monaco-vscode-extensions-service-override 4.5.1 → 4.5.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +3 -3
- package/vscode/src/vs/base/common/console.js +1 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagementCLI.js +67 -134
- package/vscode/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js +32 -37
- package/vscode/src/vs/workbench/api/browser/mainThreadBulkEdits.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.js +12 -11
- package/vscode/src/vs/workbench/api/browser/mainThreadChat.js +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.js +5 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadCodeInsets.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadCommands.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadComments.js +44 -38
- package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js +60 -66
- package/vscode/src/vs/workbench/api/browser/mainThreadDebugService.js +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadDocuments.js +6 -6
- package/vscode/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.js +10 -9
- package/vscode/src/vs/workbench/api/browser/mainThreadEditor.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadEditorTabs.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadEditors.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js +41 -50
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystem.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js +53 -100
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageFeatures.js +4 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js +21 -29
- package/vscode/src/vs/workbench/api/browser/mainThreadLogService.js +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadMessageService.js +47 -56
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookEditors.js +3 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookKernels.js +5 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js +7 -10
- package/vscode/src/vs/workbench/api/browser/mainThreadProgress.js +11 -12
- package/vscode/src/vs/workbench/api/browser/mainThreadSaveParticipant.js +8 -11
- package/vscode/src/vs/workbench/api/browser/mainThreadSearch.js +3 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadTask.js +179 -162
- package/vscode/src/vs/workbench/api/browser/mainThreadTreeViews.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js +28 -30
- package/vscode/src/vs/workbench/api/browser/mainThreadUriOpeners.js +23 -23
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviewPanels.js +3 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviewViews.js +3 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.js +19 -18
- package/vscode/src/vs/workbench/api/browser/mainThreadWorkspace.js +36 -33
- package/vscode/src/vs/workbench/api/common/shared/dataTransferCache.js +2 -2
- package/vscode/src/vs/workbench/services/extensionManagement/browser/extensionBisect.js +56 -121
- package/vscode/src/vs/workbench/services/extensions/browser/extensionService.js +1 -1
- package/vscode/src/vs/workbench/services/extensions/browser/webWorkerFileSystemProvider.js +5 -5
- package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js +130 -142
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js +33 -32
- package/vscode/src/vs/workbench/services/extensions/common/extensionsUtil.js +9 -8
- package/vscode/src/vs/workbench/services/extensions/common/lazyCreateExtensionHostManager.js +1 -1
|
@@ -19,6 +19,7 @@ import { extensionHostKindToString } from 'vscode/vscode/vs/workbench/services/e
|
|
|
19
19
|
import { RPCProtocol } from 'vscode/vscode/vs/workbench/services/extensions/common/rpcProtocol';
|
|
20
20
|
|
|
21
21
|
var ExtensionHostManager_1;
|
|
22
|
+
const _moduleId = "vs/workbench/services/extensions/common/extensionHostManager";
|
|
22
23
|
let ExtensionHostManager = ExtensionHostManager_1 = class ExtensionHostManager extends Disposable {
|
|
23
24
|
get pid() {
|
|
24
25
|
return this._extensionHost.pid;
|
|
@@ -39,11 +40,11 @@ let ExtensionHostManager = ExtensionHostManager_1 = class ExtensionHostManager e
|
|
|
39
40
|
this._environmentService = _environmentService;
|
|
40
41
|
this._telemetryService = _telemetryService;
|
|
41
42
|
this._logService = _logService;
|
|
42
|
-
this._onDidChangeResponsiveState = this._register(( new Emitter()));
|
|
43
|
+
this._onDidChangeResponsiveState = this._register(( (new Emitter())));
|
|
43
44
|
this.onDidChangeResponsiveState = this._onDidChangeResponsiveState.event;
|
|
44
45
|
this._hasStarted = false;
|
|
45
|
-
this._cachedActivationEvents = ( new Map());
|
|
46
|
-
this._resolvedActivationEvents = ( new Set());
|
|
46
|
+
this._cachedActivationEvents = ( (new Map()));
|
|
47
|
+
this._resolvedActivationEvents = ( (new Set()));
|
|
47
48
|
this._rpcProtocol = null;
|
|
48
49
|
this._customers = [];
|
|
49
50
|
this._extensionHost = extensionHost;
|
|
@@ -163,19 +164,19 @@ let ExtensionHostManager = ExtensionHostManager_1 = class ExtensionHostManager e
|
|
|
163
164
|
_createExtensionHostCustomers(kind, protocol) {
|
|
164
165
|
let logger = null;
|
|
165
166
|
if (this._environmentService.logExtensionHostCommunication) {
|
|
166
|
-
logger = ( new RPCLogger(kind));
|
|
167
|
+
logger = ( (new RPCLogger(kind)));
|
|
167
168
|
}
|
|
168
169
|
else if (TelemetryRPCLogger.isEnabled()) {
|
|
169
|
-
logger = ( new TelemetryRPCLogger(this._telemetryService));
|
|
170
|
+
logger = ( (new TelemetryRPCLogger(this._telemetryService)));
|
|
170
171
|
}
|
|
171
|
-
this._rpcProtocol = ( new RPCProtocol(protocol, logger));
|
|
172
|
+
this._rpcProtocol = ( (new RPCProtocol(protocol, logger)));
|
|
172
173
|
this._register(this._rpcProtocol.onDidChangeResponsiveState((responsiveState) => this._onDidChangeResponsiveState.fire(responsiveState)));
|
|
173
174
|
let extensionHostProxy = null;
|
|
174
175
|
let mainProxyIdentifiers = [];
|
|
175
176
|
const extHostContext = {
|
|
176
177
|
remoteAuthority: this._extensionHost.remoteAuthority,
|
|
177
178
|
extensionHostKind: this.kind,
|
|
178
|
-
getProxy: (identifier) => ( this._rpcProtocol.getProxy(identifier)),
|
|
179
|
+
getProxy: (identifier) => ( (this._rpcProtocol.getProxy(identifier))),
|
|
179
180
|
set: (identifier, instance) => this._rpcProtocol.set(identifier, instance),
|
|
180
181
|
dispose: () => this._rpcProtocol.dispose(),
|
|
181
182
|
assertRegistered: (identifiers) => this._rpcProtocol.assertRegistered(identifiers),
|
|
@@ -214,7 +215,7 @@ let ExtensionHostManager = ExtensionHostManager_1 = class ExtensionHostManager e
|
|
|
214
215
|
}
|
|
215
216
|
}
|
|
216
217
|
if (!extensionHostProxy) {
|
|
217
|
-
throw new Error(`Missing IExtensionHostProxy!`);
|
|
218
|
+
throw ( (new Error(`Missing IExtensionHostProxy!`)));
|
|
218
219
|
}
|
|
219
220
|
this._rpcProtocol.assertRegistered(mainProxyIdentifiers);
|
|
220
221
|
return extensionHostProxy;
|
|
@@ -230,13 +231,15 @@ let ExtensionHostManager = ExtensionHostManager_1 = class ExtensionHostManager e
|
|
|
230
231
|
if (activationKind === 1 && !this._hasStarted) {
|
|
231
232
|
return Promise.resolve();
|
|
232
233
|
}
|
|
233
|
-
if (!( this._cachedActivationEvents.has(activationEvent))) {
|
|
234
|
+
if (!( (this._cachedActivationEvents.has(activationEvent)))) {
|
|
234
235
|
this._cachedActivationEvents.set(activationEvent, this._activateByEvent(activationEvent, activationKind));
|
|
235
236
|
}
|
|
236
237
|
return this._cachedActivationEvents.get(activationEvent);
|
|
237
238
|
}
|
|
238
239
|
activationEventIsDone(activationEvent) {
|
|
239
|
-
return (
|
|
240
|
+
return (
|
|
241
|
+
(this._resolvedActivationEvents.has(activationEvent))
|
|
242
|
+
);
|
|
240
243
|
}
|
|
241
244
|
async _activateByEvent(activationEvent, activationKind) {
|
|
242
245
|
if (!this._proxy) {
|
|
@@ -284,7 +287,7 @@ let ExtensionHostManager = ExtensionHostManager_1 = class ExtensionHostManager e
|
|
|
284
287
|
};
|
|
285
288
|
}
|
|
286
289
|
logInfo(`invoking...`);
|
|
287
|
-
const intervalLogger = ( new IntervalTimer());
|
|
290
|
+
const intervalLogger = ( (new IntervalTimer()));
|
|
288
291
|
try {
|
|
289
292
|
intervalLogger.cancelAndSet(() => logInfo('waiting...'), 1000);
|
|
290
293
|
const resolverResult = await proxy.resolveAuthority(remoteAuthority, resolveAttempt);
|
|
@@ -313,7 +316,7 @@ let ExtensionHostManager = ExtensionHostManager_1 = class ExtensionHostManager e
|
|
|
313
316
|
async getCanonicalURI(remoteAuthority, uri) {
|
|
314
317
|
const proxy = await this._proxy;
|
|
315
318
|
if (!proxy) {
|
|
316
|
-
throw new Error(`Cannot resolve canonical URI`);
|
|
319
|
+
throw ( (new Error(`Cannot resolve canonical URI`)));
|
|
317
320
|
}
|
|
318
321
|
return proxy.getCanonicalURI(remoteAuthority, uri);
|
|
319
322
|
}
|
|
@@ -328,7 +331,7 @@ let ExtensionHostManager = ExtensionHostManager_1 = class ExtensionHostManager e
|
|
|
328
331
|
async extensionTestsExecute() {
|
|
329
332
|
const proxy = await this._proxy;
|
|
330
333
|
if (!proxy) {
|
|
331
|
-
throw new Error('Could not obtain Extension Host Proxy');
|
|
334
|
+
throw ( (new Error('Could not obtain Extension Host Proxy')));
|
|
332
335
|
}
|
|
333
336
|
return proxy.extensionTestsExecute();
|
|
334
337
|
}
|
|
@@ -357,12 +360,12 @@ let ExtensionHostManager = ExtensionHostManager_1 = class ExtensionHostManager e
|
|
|
357
360
|
return proxy.setRemoteEnvironment(env);
|
|
358
361
|
}
|
|
359
362
|
};
|
|
360
|
-
ExtensionHostManager = ExtensionHostManager_1 = ( __decorate([
|
|
361
|
-
( __param(3, IInstantiationService)),
|
|
362
|
-
( __param(4, IWorkbenchEnvironmentService)),
|
|
363
|
-
( __param(5, ITelemetryService)),
|
|
364
|
-
( __param(6, ILogService))
|
|
365
|
-
], ExtensionHostManager));
|
|
363
|
+
ExtensionHostManager = ExtensionHostManager_1 = ( (__decorate([
|
|
364
|
+
( (__param(3, IInstantiationService))),
|
|
365
|
+
( (__param(4, IWorkbenchEnvironmentService))),
|
|
366
|
+
( (__param(5, ITelemetryService))),
|
|
367
|
+
( (__param(6, ILogService)))
|
|
368
|
+
], ExtensionHostManager)));
|
|
366
369
|
function friendlyExtHostName(kind, pid) {
|
|
367
370
|
if (pid) {
|
|
368
371
|
return `${extensionHostKindToString(kind)} pid: ${pid}`;
|
|
@@ -378,7 +381,7 @@ function prettyWithoutArrays(data) {
|
|
|
378
381
|
return data;
|
|
379
382
|
}
|
|
380
383
|
if (data && typeof data === 'object' && typeof data.toString === 'function') {
|
|
381
|
-
const result = ( data.toString());
|
|
384
|
+
const result = ( (data.toString()));
|
|
382
385
|
if (result !== '[object Object]') {
|
|
383
386
|
return result;
|
|
384
387
|
}
|
|
@@ -387,7 +390,9 @@ function prettyWithoutArrays(data) {
|
|
|
387
390
|
}
|
|
388
391
|
function pretty(data) {
|
|
389
392
|
if (Array.isArray(data)) {
|
|
390
|
-
return (
|
|
393
|
+
return (
|
|
394
|
+
(data.map(prettyWithoutArrays))
|
|
395
|
+
);
|
|
391
396
|
}
|
|
392
397
|
return prettyWithoutArrays(data);
|
|
393
398
|
}
|
|
@@ -426,7 +431,7 @@ let TelemetryRPCLogger = class TelemetryRPCLogger {
|
|
|
426
431
|
}
|
|
427
432
|
constructor(_telemetryService) {
|
|
428
433
|
this._telemetryService = _telemetryService;
|
|
429
|
-
this._pendingRequests = ( new Map());
|
|
434
|
+
this._pendingRequests = ( (new Map()));
|
|
430
435
|
}
|
|
431
436
|
logIncoming(msgLength, req, initiator, str) {
|
|
432
437
|
if (initiator === 0 && /^receiveReply(Err)?:/.test(str)) {
|
|
@@ -454,9 +459,9 @@ let TelemetryRPCLogger = class TelemetryRPCLogger {
|
|
|
454
459
|
}
|
|
455
460
|
}
|
|
456
461
|
};
|
|
457
|
-
TelemetryRPCLogger = ( __decorate([
|
|
458
|
-
( __param(0, ITelemetryService))
|
|
459
|
-
], TelemetryRPCLogger));
|
|
462
|
+
TelemetryRPCLogger = ( (__decorate([
|
|
463
|
+
( (__param(0, ITelemetryService)))
|
|
464
|
+
], TelemetryRPCLogger)));
|
|
460
465
|
const providers = [];
|
|
461
466
|
function registerLatencyTestProvider(provider) {
|
|
462
467
|
providers.push(provider);
|
|
@@ -478,19 +483,15 @@ registerAction2(class MeasureExtHostLatencyAction extends Action2 {
|
|
|
478
483
|
constructor() {
|
|
479
484
|
super({
|
|
480
485
|
id: 'editor.action.measureExtHostLatency',
|
|
481
|
-
title: ( localize2WithPath(
|
|
482
|
-
'vs/workbench/services/extensions/common/extensionHostManager',
|
|
483
|
-
'measureExtHostLatency',
|
|
484
|
-
"Measure Extension Host Latency"
|
|
485
|
-
)),
|
|
486
|
+
title: ( localize2WithPath(_moduleId, 0, "Measure Extension Host Latency")),
|
|
486
487
|
category: Categories.Developer,
|
|
487
488
|
f1: true
|
|
488
489
|
});
|
|
489
490
|
}
|
|
490
491
|
async run(accessor) {
|
|
491
492
|
const editorService = accessor.get(IEditorService);
|
|
492
|
-
const measurements = await Promise.all(( getLatencyTestProviders().map(provider => provider.measure())));
|
|
493
|
-
editorService.openEditor({ resource: undefined, contents: ( measurements.map(MeasureExtHostLatencyAction._print)).join('\n\n'), options: { pinned: true } });
|
|
493
|
+
const measurements = await Promise.all(( (getLatencyTestProviders().map(provider => provider.measure()))));
|
|
494
|
+
editorService.openEditor({ resource: undefined, contents: ( (measurements.map(MeasureExtHostLatencyAction._print))).join('\n\n'), options: { pinned: true } });
|
|
494
495
|
}
|
|
495
496
|
static _print(m) {
|
|
496
497
|
if (!m) {
|
|
@@ -2,14 +2,15 @@ import { ExtensionIdentifierMap } from 'vscode/vscode/vs/platform/extensions/com
|
|
|
2
2
|
import { localizeWithPath } from 'vscode/vscode/vs/nls';
|
|
3
3
|
import { semverExports } from 'vscode/external/vscode-semver/semver.js';
|
|
4
4
|
|
|
5
|
+
const _moduleId = "vs/workbench/services/extensions/common/extensionsUtil";
|
|
5
6
|
function dedupExtensions(system, user, development, logService) {
|
|
6
|
-
const result = ( new ExtensionIdentifierMap());
|
|
7
|
+
const result = ( (new ExtensionIdentifierMap()));
|
|
7
8
|
system.forEach((systemExtension) => {
|
|
8
9
|
const extension = result.get(systemExtension.identifier);
|
|
9
10
|
if (extension) {
|
|
10
11
|
logService.warn(( localizeWithPath(
|
|
11
|
-
|
|
12
|
-
|
|
12
|
+
_moduleId,
|
|
13
|
+
0,
|
|
13
14
|
"Overwriting extension {0} with {1}.",
|
|
14
15
|
extension.extensionLocation.fsPath,
|
|
15
16
|
systemExtension.extensionLocation.fsPath
|
|
@@ -29,8 +30,8 @@ function dedupExtensions(system, user, development, logService) {
|
|
|
29
30
|
}
|
|
30
31
|
else {
|
|
31
32
|
logService.warn(( localizeWithPath(
|
|
32
|
-
|
|
33
|
-
|
|
33
|
+
_moduleId,
|
|
34
|
+
0,
|
|
34
35
|
"Overwriting extension {0} with {1}.",
|
|
35
36
|
extension.extensionLocation.fsPath,
|
|
36
37
|
userExtension.extensionLocation.fsPath
|
|
@@ -45,8 +46,8 @@ function dedupExtensions(system, user, development, logService) {
|
|
|
45
46
|
});
|
|
46
47
|
development.forEach(developedExtension => {
|
|
47
48
|
logService.info(( localizeWithPath(
|
|
48
|
-
|
|
49
|
-
|
|
49
|
+
_moduleId,
|
|
50
|
+
1,
|
|
50
51
|
"Loading development extension at {0}",
|
|
51
52
|
developedExtension.extensionLocation.fsPath
|
|
52
53
|
)));
|
|
@@ -58,7 +59,7 @@ function dedupExtensions(system, user, development, logService) {
|
|
|
58
59
|
}
|
|
59
60
|
result.set(developedExtension.identifier, developedExtension);
|
|
60
61
|
});
|
|
61
|
-
return Array.from(( result.values()));
|
|
62
|
+
return Array.from(( (result.values())));
|
|
62
63
|
}
|
|
63
64
|
|
|
64
65
|
export { dedupExtensions };
|
package/vscode/src/vs/workbench/services/extensions/common/lazyCreateExtensionHostManager.js
CHANGED
|
@@ -129,7 +129,7 @@ let LazyCreateExtensionHostManager = class LazyCreateExtensionHostManager extend
|
|
|
129
129
|
if (this._actual) {
|
|
130
130
|
return this._actual.getCanonicalURI(remoteAuthority, uri);
|
|
131
131
|
}
|
|
132
|
-
throw new Error(`Cannot resolve canonical URI`);
|
|
132
|
+
throw ( new Error(`Cannot resolve canonical URI`));
|
|
133
133
|
}
|
|
134
134
|
async start(extensionRegistryVersionId, allExtensions, myExtensions) {
|
|
135
135
|
if (myExtensions.length > 0) {
|