From 40d0c883415592ce6ae207eb3e9fb561408fb04c Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Thu, 25 Feb 2021 12:02:35 -0700 Subject: [PATCH] fix: extHostExtensionService Looks like they modified the function signature for _loadCommonJSModule. I believe the first param is now the extensionId or null. Probably for logging reason guessing. --- .../vs/workbench/api/common/extHostExtensionService.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lib/vscode/src/vs/workbench/api/common/extHostExtensionService.ts b/lib/vscode/src/vs/workbench/api/common/extHostExtensionService.ts index 0df22198..2274a4f1 100644 --- a/lib/vscode/src/vs/workbench/api/common/extHostExtensionService.ts +++ b/lib/vscode/src/vs/workbench/api/common/extHostExtensionService.ts @@ -369,11 +369,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme const activationTimesBuilder = new ExtensionActivationTimesBuilder(reason.startup); return Promise.all([ -<<<<<<< HEAD - this._loadCommonJSModule(joinPath(extensionDescription.extensionLocation, entryPoint), activationTimesBuilder, !extensionDescription.browser), -======= this._loadCommonJSModule(extensionDescription.identifier, joinPath(extensionDescription.extensionLocation, entryPoint), activationTimesBuilder), ->>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4 this._loadExtensionContext(extensionDescription) ]).then(values => { performance.mark(`code/extHost/willActivateExtension/${extensionDescription.identifier.value}`); @@ -783,11 +779,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme protected abstract _beforeAlmostReadyToRunExtensions(): Promise; protected abstract _getEntryPoint(extensionDescription: IExtensionDescription): string | undefined; -<<<<<<< HEAD - protected abstract _loadCommonJSModule(module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder, isRemote?: boolean): Promise; -======= protected abstract _loadCommonJSModule(extensionId: ExtensionIdentifier | null, module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise; ->>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4 public abstract $setRemoteEnvironment(env: { [key: string]: string | null }): Promise; }