Merge pull request #102948 from microsoft/sandy081/fix100323

Fix - Await until uninstall hook is finished before removing extension

Author: sandy081

src/vs/platform/extensionManagement/node/extensionLifecycle.ts

@@ -14,14 +14,15 @@ import { Event } from 'vs/base/common/event';
 import { Schemas } from 'vs/base/common/network';
 import { INativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
 import { rimraf } from 'vs/base/node/pfs';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
 export class ExtensionsLifecycle extends Disposable {
 
 	private processesLimiter: Limiter<void> = new Limiter(5); // Run max 5 processes in parallel
 
 	constructor(
-		private environmentService: INativeEnvironmentService,
-		private logService: ILogService
+		@IEnvironmentService private environmentService: INativeEnvironmentService,
+		@ILogService private readonly logService: ILogService
 	) {
 		super();
 	}

src/vs/platform/extensionManagement/node/extensionManagementService.ts

@@ -93,7 +93,8 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		@IInstantiationService instantiationService: IInstantiationService,
 	) {
 		super();
-		this.extensionsScanner = this._register(instantiationService.createInstance(ExtensionsScanner));
+		const extensionLifecycle = this._register(instantiationService.createInstance(ExtensionsLifecycle));
+		this.extensionsScanner = this._register(instantiationService.createInstance(ExtensionsScanner, extension => extensionLifecycle.postUninstall(extension)));
 		this.manifestCache = this._register(new ExtensionsManifestCache(environmentService, this));
 		this.extensionsDownloader = this._register(instantiationService.createInstance(ExtensionsDownloader));
 
@@ -103,9 +104,6 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			this.installingExtensions.clear();
 			this.uninstallingExtensions.clear();
 		}));
-
-		const extensionLifecycle = this._register(new ExtensionsLifecycle(environmentService, this.logService));
-		this._register(this.extensionsScanner.onDidRemoveExtension(extension => extensionLifecycle.postUninstall(extension)));
 	}
 
 	zip(extension: ILocalExtension): Promise<URI> {

src/vs/platform/extensionManagement/node/extensionsScanner.ts

@@ -23,7 +23,6 @@ import { CancellationToken } from 'vscode';
 import { extract, ExtractError } from 'vs/base/node/zip';
 import { isWindows } from 'vs/base/common/platform';
 import { flatten } from 'vs/base/common/arrays';
-import { Emitter } from 'vs/base/common/event';
 import { assign } from 'vs/base/common/objects';
 
 const ERROR_SCANNING_SYS_EXTENSIONS = 'scanningSystem';
@@ -41,10 +40,8 @@ export class ExtensionsScanner extends Disposable {
 	private readonly uninstalledPath: string;
 	private readonly uninstalledFileLimiter: Queue<any>;
 
-	private _onDidRemoveExtension = new Emitter<ILocalExtension>();
-	readonly onDidRemoveExtension = this._onDidRemoveExtension.event;
-
 	constructor(
+		private readonly beforeRemovingExtension: (e: ILocalExtension) => Promise<void>,
 		@ILogService private readonly logService: ILogService,
 		@IEnvironmentService private readonly environmentService: INativeEnvironmentService,
 		@IProductService private readonly productService: IProductService,
@@ -280,7 +277,7 @@ export class ExtensionsScanner extends Disposable {
 		await Promise.all(byExtension.map(async e => {
 			const latest = e.sort((a, b) => semver.rcompare(a.manifest.version, b.manifest.version))[0];
 			if (!installed.has(latest.identifier.id.toLowerCase())) {
-				this._onDidRemoveExtension.fire(latest);
+				await this.beforeRemovingExtension(latest);
 			}
 		}));
 		const toRemove: ILocalExtension[] = extensions.filter(e => uninstalled[new ExtensionIdentifierWithVersion(e.identifier, e.manifest.version).key()]);