-
Notifications
You must be signed in to change notification settings - Fork 30k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
This reverts commit 9c0c68c.
- Loading branch information
1 parent
4efa993
commit 4c4a738
Showing
29 changed files
with
570 additions
and
370 deletions.
There are no files selected for viewing
33 changes: 0 additions & 33 deletions
33
src/vs/code/electron-browser/sharedProcess/contrib/extensions.ts
This file was deleted.
Oops, something went wrong.
186 changes: 186 additions & 0 deletions
186
src/vs/code/electron-browser/sharedProcess/contrib/extensionsCleaner.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,186 @@ | ||
| /*--------------------------------------------------------------------------------------------- | ||
| * Copyright (c) Microsoft Corporation. All rights reserved. | ||
| * Licensed under the MIT License. See License.txt in the project root for license information. | ||
| *--------------------------------------------------------------------------------------------*/ | ||
|
|
||
| import { Disposable, DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle'; | ||
| import { URI } from 'vs/base/common/uri'; | ||
| import { IExtensionGalleryService, IExtensionIdentifier, IGlobalExtensionEnablementService, DidUninstallExtensionEvent, InstallExtensionResult, UninstallOptions } from 'vs/platform/extensionManagement/common/extensionManagement'; | ||
| import { getIdAndVersion } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; | ||
| import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService'; | ||
| import { ExtensionStorageService, IExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage'; | ||
| import { migrateUnsupportedExtensions } from 'vs/platform/extensionManagement/common/unsupportedExtensionsMigration'; | ||
| import { INativeServerExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService'; | ||
| import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions'; | ||
| import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; | ||
| import { ILogService } from 'vs/platform/log/common/log'; | ||
| import { IStorageService } from 'vs/platform/storage/common/storage'; | ||
| import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity'; | ||
| import { DidChangeProfilesEvent, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile'; | ||
|
|
||
| const uninstalOptions: UninstallOptions = { versionOnly: true, donotIncludePack: true, donotCheckDependents: true }; | ||
|
|
||
| export class ExtensionsCleaner extends Disposable { | ||
|
|
||
| constructor( | ||
| @INativeServerExtensionManagementService extensionManagementService: INativeServerExtensionManagementService, | ||
| @IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService, | ||
| @IExtensionGalleryService extensionGalleryService: IExtensionGalleryService, | ||
| @IExtensionStorageService extensionStorageService: IExtensionStorageService, | ||
| @IGlobalExtensionEnablementService extensionEnablementService: IGlobalExtensionEnablementService, | ||
| @IInstantiationService instantiationService: IInstantiationService, | ||
| @IStorageService storageService: IStorageService, | ||
| @ILogService logService: ILogService, | ||
| ) { | ||
| super(); | ||
|
|
||
| extensionManagementService.removeUninstalledExtensions(this.userDataProfilesService.profiles.length === 1); | ||
| migrateUnsupportedExtensions(extensionManagementService, extensionGalleryService, extensionStorageService, extensionEnablementService, logService); | ||
| ExtensionStorageService.removeOutdatedExtensionVersions(extensionManagementService, storageService); | ||
| this._register(instantiationService.createInstance(ProfileExtensionsCleaner)); | ||
| } | ||
| } | ||
|
|
||
| class ProfileExtensionsCleaner extends Disposable { | ||
|
|
||
| private profileExtensionsLocations = new Map<string, URI[]>; | ||
|
|
||
| private readonly profileModeDisposables = this._register(new MutableDisposable<DisposableStore>()); | ||
|
|
||
| constructor( | ||
| @INativeServerExtensionManagementService private readonly extensionManagementService: INativeServerExtensionManagementService, | ||
| @IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService, | ||
| @IExtensionsProfileScannerService private readonly extensionsProfileScannerService: IExtensionsProfileScannerService, | ||
| @IUriIdentityService private readonly uriIdentityService: IUriIdentityService, | ||
| @ILogService private readonly logService: ILogService, | ||
| ) { | ||
| super(); | ||
| this.onDidChangeProfiles({ added: this.userDataProfilesService.profiles, removed: [], all: this.userDataProfilesService.profiles }); | ||
| } | ||
|
|
||
| private async onDidChangeProfiles({ added, removed, all }: Omit<DidChangeProfilesEvent, 'updated'>): Promise<void> { | ||
| try { | ||
| await Promise.all(removed.map(profile => profile.extensionsResource ? this.removeExtensionsFromProfile(profile.extensionsResource) : Promise.resolve())); | ||
| } catch (error) { | ||
| this.logService.error(error); | ||
| } | ||
|
|
||
| if (all.length === 1) { | ||
| // Exit profile mode | ||
| this.profileModeDisposables.clear(); | ||
| // Listen for entering into profile mode | ||
| const disposable = this._register(this.userDataProfilesService.onDidChangeProfiles(() => { | ||
| disposable.dispose(); | ||
| this.onDidChangeProfiles({ added: this.userDataProfilesService.profiles, removed: [], all: this.userDataProfilesService.profiles }); | ||
| })); | ||
| return; | ||
| } | ||
|
|
||
| try { | ||
| if (added.length) { | ||
| await Promise.all(added.map(profile => profile.extensionsResource ? this.populateExtensionsFromProfile(profile.extensionsResource) : Promise.resolve())); | ||
| // Enter profile mode | ||
| if (!this.profileModeDisposables.value) { | ||
| this.profileModeDisposables.value = new DisposableStore(); | ||
| this.profileModeDisposables.value.add(toDisposable(() => this.profileExtensionsLocations.clear())); | ||
| this.profileModeDisposables.value.add(this.userDataProfilesService.onDidChangeProfiles(e => this.onDidChangeProfiles(e))); | ||
| this.profileModeDisposables.value.add(this.extensionManagementService.onDidInstallExtensions(e => this.onDidInstallExtensions(e))); | ||
| this.profileModeDisposables.value.add(this.extensionManagementService.onDidUninstallExtension(e => this.onDidUninstallExtension(e))); | ||
| await this.uninstallExtensionsNotInProfiles(); | ||
| } | ||
| } | ||
| } catch (error) { | ||
| this.logService.error(error); | ||
| } | ||
| } | ||
|
|
||
| private async uninstallExtensionsNotInProfiles(): Promise<void> { | ||
| const installed = await this.extensionManagementService.getAllUserInstalled(); | ||
| const toUninstall = installed.filter(installedExtension => installedExtension.installedTimestamp /* Installed by VS Code */ && !this.profileExtensionsLocations.has(this.getKey(installedExtension.identifier, installedExtension.manifest.version))); | ||
| if (toUninstall.length) { | ||
| await Promise.all(toUninstall.map(extension => this.extensionManagementService.uninstall(extension, uninstalOptions))); | ||
| } | ||
| } | ||
|
|
||
| private async onDidInstallExtensions(installedExtensions: readonly InstallExtensionResult[]): Promise<void> { | ||
| for (const { local, profileLocation } of installedExtensions) { | ||
| if (!local || !profileLocation) { | ||
| continue; | ||
| } | ||
| this.addExtensionWithKey(this.getKey(local.identifier, local.manifest.version), profileLocation); | ||
| } | ||
| } | ||
|
|
||
| private async onDidUninstallExtension(e: DidUninstallExtensionEvent): Promise<void> { | ||
| if (!e.profileLocation || !e.version) { | ||
| return; | ||
| } | ||
| if (this.removeExtensionWithKey(this.getKey(e.identifier, e.version), e.profileLocation)) { | ||
| await this.uninstallExtensions([{ identifier: e.identifier, version: e.version }]); | ||
| } | ||
| } | ||
|
|
||
| private async populateExtensionsFromProfile(extensionsProfileLocation: URI): Promise<void> { | ||
| const extensions = await this.extensionsProfileScannerService.scanProfileExtensions(extensionsProfileLocation); | ||
| for (const extension of extensions) { | ||
| this.addExtensionWithKey(this.getKey(extension.identifier, extension.version), extensionsProfileLocation); | ||
| } | ||
| } | ||
|
|
||
| private async removeExtensionsFromProfile(removedProfile: URI): Promise<void> { | ||
| const extensionsToRemove: { identifier: IExtensionIdentifier; version: string }[] = []; | ||
| for (const key of [...this.profileExtensionsLocations.keys()]) { | ||
| if (!this.removeExtensionWithKey(key, removedProfile)) { | ||
| continue; | ||
| } | ||
| const extensionToRemove = this.fromKey(key); | ||
| if (extensionToRemove) { | ||
| extensionsToRemove.push(extensionToRemove); | ||
| } | ||
| } | ||
| if (extensionsToRemove.length) { | ||
| await this.uninstallExtensions(extensionsToRemove); | ||
| } | ||
| } | ||
|
|
||
| private addExtensionWithKey(key: string, extensionsProfileLocation: URI): void { | ||
| let locations = this.profileExtensionsLocations.get(key); | ||
| if (!locations) { | ||
| locations = []; | ||
| this.profileExtensionsLocations.set(key, locations); | ||
| } | ||
| locations.push(extensionsProfileLocation); | ||
| } | ||
|
|
||
| private removeExtensionWithKey(key: string, profileLocation: URI): boolean { | ||
| const profiles = this.profileExtensionsLocations.get(key); | ||
| if (profiles) { | ||
| const index = profiles.findIndex(profile => this.uriIdentityService.extUri.isEqual(profile, profileLocation)); | ||
| if (index > -1) { | ||
| profiles.splice(index, 1); | ||
| } | ||
| } | ||
| if (!profiles?.length) { | ||
| this.profileExtensionsLocations.delete(key); | ||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| private async uninstallExtensions(extensionsToRemove: { identifier: IExtensionIdentifier; version: string }[]): Promise<void> { | ||
| const installed = await this.extensionManagementService.getAllUserInstalled(); | ||
| const toUninstall = installed.filter(installedExtension => installedExtension.installedTimestamp /* Installed by VS Code */ && extensionsToRemove.some(e => this.getKey(installedExtension.identifier, installedExtension.manifest.version) === this.getKey(e.identifier, e.version))); | ||
| if (toUninstall.length) { | ||
| await Promise.all(toUninstall.map(extension => this.extensionManagementService.uninstall(extension, uninstalOptions))); | ||
| } | ||
| } | ||
|
|
||
| private getKey(identifier: IExtensionIdentifier, version: string): string { | ||
| return `${ExtensionIdentifier.toKey(identifier.id)}@${version}`; | ||
| } | ||
|
|
||
| private fromKey(key: string): { identifier: IExtensionIdentifier; version: string } | undefined { | ||
| const [id, version] = getIdAndVersion(key); | ||
| return version ? { identifier: { id }, version } : undefined; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.