fix #188582 (#188917)

microsoft · Jul 26, 2023 · 0b58930 · 0b58930
1 parent 5e3392e
commit 0b58930
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts b/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts
@@ -127,8 +127,8 @@ export abstract class AbstractExtensionsProfileScannerService extends Disposable
 			await this.withProfileExtensions(profileLocation, profileExtensions => {
 				const result: IScannedProfileExtension[] = [];
 				for (const extension of profileExtensions) {
-					if (extensions.some(([e]) => areSameExtensions(e.identifier, extension.identifier) && e.manifest.version !== extension.version)) {
-						// Remove the existing extension with different version
+					if (extensions.some(([e]) => areSameExtensions(e.identifier, extension.identifier))) {
+						// Remove the existing extension
 						extensionsToRemove.push(extension);
 					} else {
 						result.push(extension);

diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -570,8 +570,10 @@ export class ExtensionsScanner extends Disposable {
 		await this.withUninstalledExtensions(uninstalled => delete uninstalled[extensionKey.toString()]);
 	}
 
-	removeExtension(extension: ILocalExtension | IScannedExtension, type: string): Promise<void> {
-		return this.deleteExtensionFromLocation(extension.identifier.id, extension.location, type);
+	async removeExtension(extension: ILocalExtension | IScannedExtension, type: string): Promise<void> {
+		if (this.uriIdentityService.extUri.isEqualOrParent(this.extensionsScannerService.userExtensionsLocation, extension.location)) {
+			return this.deleteExtensionFromLocation(extension.identifier.id, extension.location, type);
+		}
 	}
 
 	async removeUninstalledExtension(extension: ILocalExtension | IScannedExtension): Promise<void> {