Skip to content

Commit 1e06c18

Browse files
author
Loïc Mangeonjean
committed
fix: for extHost ILoggerService even for local extHost
1 parent e166dae commit 1e06c18

File tree

1 file changed

+19
-8
lines changed

1 file changed

+19
-8
lines changed

scripts/vscode.patch

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,10 @@ index ec414fd9269..ebda0de7819 100644
359359

360360
export interface SCMProviderFeatures {
361361
diff --git a/src/vs/workbench/api/common/extHostExtensionService.ts b/src/vs/workbench/api/common/extHostExtensionService.ts
362-
index 0c35ea254f3..bfd9f4083c2 100644
362+
index 0c35ea254f3..3a913226546 100644
363363
--- a/src/vs/workbench/api/common/extHostExtensionService.ts
364364
+++ b/src/vs/workbench/api/common/extHostExtensionService.ts
365-
@@ -42,7 +42,7 @@ import { Schemas } from 'vs/base/common/network';
365+
@@ -44,7 +44,7 @@ import { Schemas } from 'vs/base/common/network';
366366
import { IResolveAuthorityResult } from 'vs/workbench/services/extensions/common/extensionHostProxy';
367367
import { IExtHostLocalizationService } from 'vs/workbench/api/common/extHostLocalizationService';
368368
import { StopWatch } from 'vs/base/common/stopwatch';
@@ -371,7 +371,7 @@ index 0c35ea254f3..bfd9f4083c2 100644
371371
import { IExtHostManagedSockets } from 'vs/workbench/api/common/extHostManagedSockets';
372372
import { Dto } from 'vs/workbench/services/extensions/common/proxyIdentifier';
373373

374-
@@ -248,9 +248,11 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
374+
@@ -250,9 +250,11 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
375375
this._extHostTerminalService.dispose();
376376
this._activator.dispose();
377377

@@ -387,24 +387,35 @@ index 0c35ea254f3..bfd9f4083c2 100644
387387
// Invalidate all proxies
388388
this._extHostContext.dispose();
389389
diff --git a/src/vs/workbench/api/common/extensionHostMain.ts b/src/vs/workbench/api/common/extensionHostMain.ts
390-
index a06c4e93d8f..97b8c87f525 100644
390+
index a06c4e93d8f..18c66beee89 100644
391391
--- a/src/vs/workbench/api/common/extensionHostMain.ts
392392
+++ b/src/vs/workbench/api/common/extensionHostMain.ts
393-
@@ -23,6 +23,9 @@ import { IURITransformerService, URITransformerService } from 'vs/workbench/api/
393+
@@ -12,7 +12,7 @@ import { MainContext, MainThreadConsoleShape } from 'vs/workbench/api/common/ext
394+
import { IExtensionHostInitData } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
395+
import { RPCProtocol } from 'vs/workbench/services/extensions/common/rpcProtocol';
396+
import { ExtensionIdentifier, IExtensionDescription, IRelaxedExtensionDescription } from 'vs/platform/extensions/common/extensions';
397+
-import { ILogService } from 'vs/platform/log/common/log';
398+
+import { ILogService, ILoggerService } from 'vs/platform/log/common/log';
399+
import { getSingletonServiceDescriptors } from 'vs/platform/instantiation/common/extensions';
400+
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
401+
import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
402+
@@ -23,6 +23,10 @@ import { IURITransformerService, URITransformerService } from 'vs/workbench/api/
394403
import { IExtHostExtensionService, IHostUtils } from 'vs/workbench/api/common/extHostExtensionService';
395404
import { IExtHostTelemetry } from 'vs/workbench/api/common/extHostTelemetry';
396405
import { Mutable } from 'vs/base/common/types';
397406
+import { isWebWorker } from 'vs/base/common/platform';
398407
+import { ExtHostLogService } from 'vs/workbench/api/common/extHostLogService';
399408
+import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
409+
+import { ExtHostLoggerService } from 'vs/workbench/api/common/extHostLoggerService';
400410

401411
export interface IExitFn {
402412
(code?: number): any;
403-
@@ -158,10 +161,13 @@ export class ExtensionHostMain {
413+
@@ -158,10 +162,14 @@ export class ExtensionHostMain {
404414
services.set(IExtHostRpcService, new ExtHostRpcService(this._rpcProtocol));
405415
services.set(IURITransformerService, new URITransformerService(uriTransformer));
406416
services.set(IHostUtils, hostUtils);
407417
+ services.set(ILogService, new SyncDescriptor(ExtHostLogService, [true], true));
418+
+ services.set(ILoggerService, new SyncDescriptor(ExtHostLoggerService, [], true));
408419

409420
const instaService: IInstantiationService = new InstantiationService(services, true);
410421

@@ -415,7 +426,7 @@ index a06c4e93d8f..97b8c87f525 100644
415426

416427
// ugly self - inject
417428
this._logService = instaService.invokeFunction(accessor => accessor.get(ILogService));
418-
@@ -180,8 +186,10 @@ export class ExtensionHostMain {
429+
@@ -180,8 +188,10 @@ export class ExtensionHostMain {
419430
this._extensionService = instaService.invokeFunction(accessor => accessor.get(IExtHostExtensionService));
420431
this._extensionService.initialize();
421432

@@ -428,7 +439,7 @@ index a06c4e93d8f..97b8c87f525 100644
428439
}
429440

430441
async asBrowserUri(uri: URI): Promise<URI> {
431-
@@ -189,10 +197,19 @@ export class ExtensionHostMain {
442+
@@ -189,10 +199,19 @@ export class ExtensionHostMain {
432443
return URI.revive(await mainThreadExtensionsProxy.$asBrowserUri(uri));
433444
}
434445

0 commit comments

Comments
 (0)