daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

recovery fix: fixing installing extensions everywhere when it is already installed locally (#236562) 

* recovery fix: fixing installing extensions everywhere when it is already installed locally

* clean up
pull/236567/head
Sandeep Somavarapu 2024-12-19 10:55:10 +01:00 committed by GitHub
parent d74499bdb9
commit 7e000daa48
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
View File

@ -2368,8 +2368,9 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
if (extension?.isMalicious) {
throw new Error(nls.localize('malicious', "This extension is reported to be problematic."));
}
// TODO: @sandy081 - Install the extension only on servers where it is not installed
// Do not install if requested to enable and extension is already installed
if (!(installOptions.enable && extension?.local)) {
if (installOptions.installEverywhere || !(installOptions.enable && extension?.local)) {
if (!installable) {
if (!gallery) {
const id = isString(arg) ? arg : (<IExtension>arg).identifier.id;
@ -2730,10 +2731,11 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
return this.extensionManagementService.installVSIX(vsix, manifest, installOptions);
}
private installFromGallery(extension: IExtension, gallery: IGalleryExtension, installOptions?: InstallOptions): Promise<ILocalExtension> {
private installFromGallery(extension: IExtension, gallery: IGalleryExtension, installOptions?: InstallExtensionOptions): Promise<ILocalExtension> {
installOptions = installOptions ?? {};
installOptions.pinned = extension.local?.pinned || !this.shouldAutoUpdateExtension(extension);
if (extension.local) {
// TODO: @sandy081 - Install the extension only on servers where it is not installed
if (!installOptions.installEverywhere && extension.local) {
installOptions.productVersion = this.getProductVersion();
installOptions.operation = InstallOperation.Update;
return this.extensionManagementService.updateFromGallery(gallery, extension.local, installOptions);

8
src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
View File

@ -466,7 +466,7 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
installOptions = { ...(installOptions || {}), isMachineScoped };
}
if (installOptions.installEverywhere || (!installOptions.isMachineScoped && this.isExtensionsSyncEnabled())) {
if (!installOptions.isMachineScoped && this.isExtensionsSyncEnabled()) {
if (this.extensionManagementServerService.localExtensionManagementServer
&& !servers.includes(this.extensionManagementServerService.localExtensionManagementServer)
&& await this.extensionManagementServerService.localExtensionManagementServer.extensionManagementService.canInstall(gallery) === true) {
@ -597,7 +597,7 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
}
}
private async validateAndGetExtensionManagementServersToInstall(gallery: IGalleryExtension, installOptions?: InstallOptions): Promise<IExtensionManagementServer[]> {
private async validateAndGetExtensionManagementServersToInstall(gallery: IGalleryExtension, installOptions?: IWorkbenchInstallOptions): Promise<IExtensionManagementServer[]> {
const manifest = await this.extensionGalleryService.getManifest(gallery, CancellationToken.None);
if (!manifest) {
@ -606,8 +606,8 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
const servers: IExtensionManagementServer[] = [];
// Install Language pack on local and remote servers
if (isLanguagePackExtension(manifest)) {
// Install everywhere if asked to install everywhere or if the extension is a language pack
if (installOptions?.installEverywhere || isLanguagePackExtension(manifest)) {
servers.push(...this.servers.filter(server => server !== this.extensionManagementServerService.webExtensionManagementServer));
} else {
const server = this.getExtensionManagementServerToInstall(manifest);