diff --git a/src/vs/workbench/api/browser/mainThreadAuthentication.ts b/src/vs/workbench/api/browser/mainThreadAuthentication.ts index 18493b01c47..fb2e5ddfeda 100644 --- a/src/vs/workbench/api/browser/mainThreadAuthentication.ts +++ b/src/vs/workbench/api/browser/mainThreadAuthentication.ts @@ -249,7 +249,7 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu } $ensureProvider(id: string): Promise { - return this.extensionService.activateByEvent(getAuthenticationProviderActivationEvent(id), ActivationKind.Eager); + return this.extensionService.activateByEvent(getAuthenticationProviderActivationEvent(id), ActivationKind.Immediate); } $sendDidChangeSessions(id: string, event: modes.AuthenticationSessionsChangeEvent): void { diff --git a/src/vs/workbench/api/common/extHostExtensionService.ts b/src/vs/workbench/api/common/extHostExtensionService.ts index 8d5ab4a9ec8..6d9e1a525e0 100644 --- a/src/vs/workbench/api/common/extHostExtensionService.ts +++ b/src/vs/workbench/api/common/extHostExtensionService.ts @@ -687,7 +687,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme } public $activateByEvent(activationEvent: string, activationKind: ActivationKind): Promise { - if (activationKind === ActivationKind.Eager) { + if (activationKind === ActivationKind.Immediate) { return this._activateByEvent(activationEvent, false); } diff --git a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts index 5bd8624bc10..c89897ab69c 100644 --- a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts +++ b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts @@ -205,7 +205,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx // Record the fact that this activationEvent was requested (in case of a restart) this._allRequestedActivateEvents.add(activationEvent); - if (activationKind === ActivationKind.Eager) { + if (activationKind === ActivationKind.Immediate) { // Do not wait for the normal start-up of the extension host(s) return this._activateByEvent(activationEvent, activationKind); } diff --git a/src/vs/workbench/services/extensions/common/extensionHostManager.ts b/src/vs/workbench/services/extensions/common/extensionHostManager.ts index 6bad8c1bde3..d531ae94a20 100644 --- a/src/vs/workbench/services/extensions/common/extensionHostManager.ts +++ b/src/vs/workbench/services/extensions/common/extensionHostManager.ts @@ -220,7 +220,7 @@ export class ExtensionHostManager extends Disposable { } public activateByEvent(activationEvent: string, activationKind: ActivationKind): Promise { - if (activationKind === ActivationKind.Eager && !this._hasStarted) { + if (activationKind === ActivationKind.Immediate && !this._hasStarted) { return Promise.resolve(); } diff --git a/src/vs/workbench/services/extensions/common/extensions.ts b/src/vs/workbench/services/extensions/common/extensions.ts index 579f941fecd..83fb70f44b2 100644 --- a/src/vs/workbench/services/extensions/common/extensions.ts +++ b/src/vs/workbench/services/extensions/common/extensions.ts @@ -142,7 +142,7 @@ export interface IResponsiveStateChangeEvent { export const enum ActivationKind { Normal = 0, - Eager = 1 + Immediate = 1 } export interface IExtensionService { @@ -187,7 +187,7 @@ export interface IExtensionService { * * In extraordinary circumstances, if the activation event needs to activate * one or more extensions before the normal startup is finished, then you can use - * `ActivationKind.Eager`. Please do not use this flag unless really necessary + * `ActivationKind.Immediate`. Please do not use this flag unless really necessary * and you understand all consequences. */ activateByEvent(activationEvent: string, activationKind?: ActivationKind): Promise;