Rename ActivationKind.Eager to ActivationKind.Immediate

alexdima · alexdima · commit df5d0e588ff6 · 2020-08-26T20:18:10.000+02:00
diff --git 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<void> {
-		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
@@ -687,7 +687,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 	}
 
 	public $activateByEvent(activationEvent: string, activationKind: ActivationKind): Promise<void> {
-		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
@@ -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
@@ -220,7 +220,7 @@ export class ExtensionHostManager extends Disposable {
 	}
 
 	public activateByEvent(activationEvent: string, activationKind: ActivationKind): Promise<void> {
-		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
@@ -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<void>;

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`$ensureProvider(id: string): Promise<void> {`
`252`		`- return this.extensionService.activateByEvent(getAuthenticationProviderActivationEvent(id), ActivationKind.Eager);`
	`252`	`+ return this.extensionService.activateByEvent(getAuthenticationProviderActivationEvent(id), ActivationKind.Immediate);`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`$sendDidChangeSessions(id: string, event: modes.AuthenticationSessionsChangeEvent): void {`
Original file line number	Diff line number	Diff line change
`@@ -687,7 +687,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme`
`687`	`687`	`}`
`688`	`688`
`689`	`689`	`public $activateByEvent(activationEvent: string, activationKind: ActivationKind): Promise<void> {`
`690`		`- if (activationKind === ActivationKind.Eager) {`
	`690`	`+ if (activationKind === ActivationKind.Immediate) {`
`691`	`691`	`return this._activateByEvent(activationEvent, false);`
`692`	`692`	`}`
`693`	`693`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx`
`205`	`205`	`// Record the fact that this activationEvent was requested (in case of a restart)`
`206`	`206`	`this._allRequestedActivateEvents.add(activationEvent);`
`207`	`207`
`208`		`- if (activationKind === ActivationKind.Eager) {`
	`208`	`+ if (activationKind === ActivationKind.Immediate) {`
`209`	`209`	`// Do not wait for the normal start-up of the extension host(s)`
`210`	`210`	`return this._activateByEvent(activationEvent, activationKind);`
`211`	`211`	`}`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ export class ExtensionHostManager extends Disposable {`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`public activateByEvent(activationEvent: string, activationKind: ActivationKind): Promise<void> {`
`223`		`- if (activationKind === ActivationKind.Eager && !this._hasStarted) {`
	`223`	`+ if (activationKind === ActivationKind.Immediate && !this._hasStarted) {`
`224`	`224`	`return Promise.resolve();`
`225`	`225`	`}`
`226`	`226`