From f80eac47bbfbb5b6e70d31429a468820ae590fb9 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 9 Feb 2022 16:53:25 +0100 Subject: [PATCH] #142040 fix storing preRelease flag in web --- .../common/webExtensionManagementService.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts index 7148be4a0f2..c8210fb8179 100644 --- a/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts +++ b/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts @@ -14,6 +14,7 @@ import { AbstractExtensionManagementService, AbstractExtensionTask, IInstallExte import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService'; import { IProductService } from 'vs/platform/product/common/productService'; +import { isBoolean } from 'vs/base/common/types'; export class WebExtensionManagementService extends AbstractExtensionManagementService implements IExtensionManagementService { @@ -152,7 +153,10 @@ class InstallExtensionTask extends AbstractExtensionTask implem metadata.publisherId = this.extension.publisherId; metadata.installedTimestamp = Date.now(); metadata.isPreReleaseVersion = this.extension.properties.isPreReleaseVersion; - metadata.preRelease = this.extension.hasPreReleaseVersion ? this.extension.properties.isPreReleaseVersion : (metadata.preRelease || this.options.installPreReleaseVersion); + metadata.preRelease = this.extension.properties.isPreReleaseVersion || + (isBoolean(this.options.installPreReleaseVersion) + ? this.options.installPreReleaseVersion /* Respect the passed flag */ + : metadata?.preRelease /* Respect the existing pre-release flag if it was set */); } const scannedExtension = URI.isUri(this.extension) ? await this.webExtensionsScannerService.addExtension(this.extension, metadata)