提交 5adcd252 编写于 作者: S Sandeep Somavarapu

Fix #113257

上级 ed6c343e
......@@ -526,7 +526,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
try {
await this.extensionsWorkbenchService.install(extension);
} catch (err) {
runAction(this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, InstallOperation.Update, err));
runAction(this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, extension.latestVersion, InstallOperation.Update, err));
}
}));
}
......
......@@ -98,6 +98,7 @@ export class PromptExtensionInstallFailureAction extends Action {
constructor(
private readonly extension: IExtension,
private readonly version: string,
private readonly installOperation: InstallOperation,
private readonly error: Error,
@IProductService private readonly productService: IProductService,
......@@ -128,7 +129,7 @@ export class PromptExtensionInstallFailureAction extends Action {
if (this.extension.gallery && this.productService.extensionsGallery) {
promptChoices.push({
label: localize('download', "Try Downloading Manually..."),
run: () => this.openerService.open(URI.parse(`${this.productService.extensionsGallery!.serviceUrl}/publishers/${this.extension.publisher}/vsextensions/${this.extension.name}/${this.extension.version}/vspackage`)).then(() => {
run: () => this.openerService.open(URI.parse(`${this.productService.extensionsGallery!.serviceUrl}/publishers/${this.extension.publisher}/vsextensions/${this.extension.name}/${this.version}/vspackage`)).then(() => {
this.notificationService.prompt(
Severity.Info,
localize('install vsix', 'Once downloaded, please manually install the downloaded VSIX of \'{0}\'.', this.extension.identifier.id),
......@@ -277,7 +278,7 @@ export abstract class AbstractInstallAction extends ExtensionAction {
try {
return await this.extensionsWorkbenchService.install(extension, this.getInstallOptions());
} catch (error) {
await this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, InstallOperation.Install, error).run();
await this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, extension.latestVersion, InstallOperation.Install, error).run();
return undefined;
}
}
......@@ -705,7 +706,7 @@ export class UpdateAction extends ExtensionAction {
await this.extensionsWorkbenchService.install(extension);
alert(localize('updateExtensionComplete', "Updating extension {0} to version {1} completed.", extension.displayName, extension.latestVersion));
} catch (err) {
this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, InstallOperation.Update, err).run();
this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, extension.latestVersion, InstallOperation.Update, err).run();
}
}
......@@ -1053,7 +1054,7 @@ export class InstallAnotherVersionAction extends ExtensionAction {
await this.extensionsWorkbenchService.installVersion(this.extension!, pick.id);
}
} catch (error) {
this.instantiationService.createInstance(PromptExtensionInstallFailureAction, this.extension!, InstallOperation.Install, error).run();
this.instantiationService.createInstance(PromptExtensionInstallFailureAction, this.extension!, pick.latest ? this.extension!.latestVersion : pick.id, InstallOperation.Install, error).run();
}
}
return null;
......@@ -1641,7 +1642,7 @@ export class InstallRecommendedExtensionAction extends Action {
try {
await this.extensionWorkbenchService.install(extension);
} catch (err) {
this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, InstallOperation.Install, err).run();
this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, extension.latestVersion, InstallOperation.Install, err).run();
}
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册