Don't uninstall application-scoped extensions when importing profile (#190067) (#190085)

joyceerhl · web-flow · commit 6c3e3dba23e8 · 2023-08-09T22:15:31.000+01:00
Don't uninstall application-scoped extensions
diff --git a/src/vs/workbench/services/userDataProfile/browser/extensionsResource.ts b/src/vs/workbench/services/userDataProfile/browser/extensionsResource.ts
@@ -130,7 +130,7 @@ export class ExtensionsResource implements IProfileResource {
 					extensionsToEnableOrDisable.push({ extension: e.identifier, enable: !e.disabled });
 				}
 			}
-			const extensionsToUninstall: ILocalExtension[] = installedExtensions.filter(extension => !extension.isBuiltin && !profileExtensions.some(({ identifier }) => areSameExtensions(identifier, extension.identifier)));
+			const extensionsToUninstall: ILocalExtension[] = installedExtensions.filter(extension => !extension.isBuiltin && !profileExtensions.some(({ identifier }) => areSameExtensions(identifier, extension.identifier)) && !extension.isApplicationScoped);
 			for (const { extension, enable } of extensionsToEnableOrDisable) {
 				if (enable) {
 					this.logService.trace(`Importing Profile (${profile.name}): Enabling extension...`, extension.id);

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ export class ExtensionsResource implements IProfileResource {`
`130`	`130`	`extensionsToEnableOrDisable.push({ extension: e.identifier, enable: !e.disabled });`
`131`	`131`	`}`
`132`	`132`	`}`
`133`		`- const extensionsToUninstall: ILocalExtension[] = installedExtensions.filter(extension => !extension.isBuiltin && !profileExtensions.some(({ identifier }) => areSameExtensions(identifier, extension.identifier)));`
	`133`	`+ const extensionsToUninstall: ILocalExtension[] = installedExtensions.filter(extension => !extension.isBuiltin && !profileExtensions.some(({ identifier }) => areSameExtensions(identifier, extension.identifier)) && !extension.isApplicationScoped);`
`134`	`134`	`for (const { extension, enable } of extensionsToEnableOrDisable) {`
`135`	`135`	`if (enable) {`
`136`	`136`	this.logService.trace(`Importing Profile (${profile.name}): Enabling extension...`, extension.id);