OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

fix: extHostExtensionService

Browse Source 
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.
This commit is contained in:
Joe Previte 2021-02-25 12:02:35 -07:00
parent 2bd9b6e1bf
commit 40d0c88341
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/vscode/src/vs/workbench/api/common/extHostExtensionService.ts
View File

@ -369,11 +369,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
const activationTimesBuilder = new ExtensionActivationTimesBuilder(reason.startup); const activationTimesBuilder = new ExtensionActivationTimesBuilder(reason.startup);
return Promise.all([ return Promise.all([
<<<<<<< HEAD
this._loadCommonJSModule<IExtensionModule>(joinPath(extensionDescription.extensionLocation, entryPoint), activationTimesBuilder, !extensionDescription.browser),
=======
this._loadCommonJSModule<IExtensionModule>(extensionDescription.identifier, joinPath(extensionDescription.extensionLocation, entryPoint), activationTimesBuilder), this._loadCommonJSModule<IExtensionModule>(extensionDescription.identifier, joinPath(extensionDescription.extensionLocation, entryPoint), activationTimesBuilder),
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
this._loadExtensionContext(extensionDescription) this._loadExtensionContext(extensionDescription)
]).then(values => { ]).then(values => {
performance.mark(`code/extHost/willActivateExtension/${extensionDescription.identifier.value}`); performance.mark(`code/extHost/willActivateExtension/${extensionDescription.identifier.value}`);
@ -783,11 +779,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
protected abstract _beforeAlmostReadyToRunExtensions(): Promise<void>; protected abstract _beforeAlmostReadyToRunExtensions(): Promise<void>;
protected abstract _getEntryPoint(extensionDescription: IExtensionDescription): string | undefined; protected abstract _getEntryPoint(extensionDescription: IExtensionDescription): string | undefined;
<<<<<<< HEAD
protected abstract _loadCommonJSModule<T>(module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder, isRemote?: boolean): Promise<T>;
=======
protected abstract _loadCommonJSModule<T>(extensionId: ExtensionIdentifier | null, module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T>; protected abstract _loadCommonJSModule<T>(extensionId: ExtensionIdentifier | null, module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T>;
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
public abstract $setRemoteEnvironment(env: { [key: string]: string | null }): Promise<void>; public abstract $setRemoteEnvironment(env: { [key: string]: string | null }): Promise<void>;
} }