Fixes extension activation fail after upgrade with Error: Cannot find module 'vscode' (microsoft#187090)

jeanp413 · web-flow · commit 0aee7020c254 · 2023-07-18T23:49:48.000+02:00
Fixes microsoft#185733
diff --git a/src/vs/workbench/api/common/extHostExtensionService.ts b/src/vs/workbench/api/common/extHostExtensionService.ts
@@ -966,7 +966,8 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 
 	public $activateByEvent(activationEvent: string, activationKind: ActivationKind): Promise<void> {
 		if (activationKind === ActivationKind.Immediate) {
-			return this._activateByEvent(activationEvent, false);
+			return this._almostReadyToRunExtensions.wait()
+				.then(_ => this._activateByEvent(activationEvent, false));
 		}
 
 		return (

Original file line number	Diff line number	Diff line change
`@@ -966,7 +966,8 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme`
`966`	`966`
`967`	`967`	`public $activateByEvent(activationEvent: string, activationKind: ActivationKind): Promise<void> {`
`968`	`968`	`if (activationKind === ActivationKind.Immediate) {`
`969`		`- return this._activateByEvent(activationEvent, false);`
	`969`	`+ return this._almostReadyToRunExtensions.wait()`
	`970`	`+ .then(_ => this._activateByEvent(activationEvent, false));`
`970`	`971`	`}`
`971`	`972`
`972`	`973`	`return (`