fix #117169

microsoft · Sep 23, 2021 · e1fb453 · e1fb453
1 parent 07ac6a9
commit e1fb453
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/src/vs/platform/extensionManagement/node/extensionDownloader.ts b/src/vs/platform/extensionManagement/node/extensionDownloader.ts
@@ -72,7 +72,8 @@ export class ExtensionsDownloader extends Disposable {
 	}
 
 	async delete(location: URI): Promise<void> {
-		// noop as caching is enabled always
+		await this.cleanUpPromise;
+		await this.fileService.del(location);
 	}
 
 	private async rename(from: URI, to: URI, retryUntil: number): Promise<void> {

diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -288,12 +288,25 @@ class InstallGalleryExtensionTask extends AbstractInstallExtensionTask {
 		installableExtension.metadata.isMachineScoped = this.options.isMachineScoped || existingExtension?.isMachineScoped;
 		installableExtension.metadata.isBuiltin = this.options.isBuiltin || existingExtension?.isBuiltin;
 
-		const local = await this.installExtension(installableExtension, token);
-		if (existingExtension && semver.neq(existingExtension.manifest.version, this.gallery.version)) {
-			await this.extensionsScanner.setUninstalled(existingExtension);
+		try {
+			const local = await this.installExtension(installableExtension, token);
+			if (existingExtension && semver.neq(existingExtension.manifest.version, this.gallery.version)) {
+				await this.extensionsScanner.setUninstalled(existingExtension);
+			}
+			return local;
+		} catch (error) {
+			await this.deleteDownloadedVSIX(installableExtension.zipPath);
+			throw error;
+		}
+	}
+
+	private async deleteDownloadedVSIX(vsix: string): Promise<void> {
+		try {
+			await this.extensionsDownloader.delete(URI.file(vsix));
+		} catch (error) {
+			/* Ignore */
+			this.logService.warn('Error while deleting the downloaded vsix', vsix.toString(), getErrorMessage(error));
 		}
-		try { await this.extensionsDownloader.delete(URI.file(installableExtension.zipPath)); } catch (error) { /* Ignore */ }
-		return local;
 	}
 
 	private async downloadInstallableExtension(extension: IGalleryExtension, operation: InstallOperation): Promise<Required<InstallableExtension>> {
@@ -316,6 +329,7 @@ class InstallGalleryExtensionTask extends AbstractInstallExtensionTask {
 			const manifest = await getManifest(zipPath);
 			return (<Required<InstallableExtension>>{ zipPath, identifierWithVersion: new ExtensionIdentifierWithVersion(extension.identifier, manifest.version), metadata });
 		} catch (error) {
+			await this.deleteDownloadedVSIX(zipPath);
 			throw new ExtensionManagementError(joinErrors(error).message, INSTALL_ERROR_VALIDATING);
 		}
 	}