maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

#15756 rename

Browse source
This commit is contained in:
Sandeep Somavarapu 2021-11-24 23:42:19 +01:00
parent a74b70781e
commit 4947eba7a5
No known key found for this signature in database
GPG key ID: 1FED25EC4646638B
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
View file

@ -22,7 +22,7 @@ import { ILogService } from 'vs/platform/log/common/log';
import { IProductService } from 'vs/platform/product/common/productService';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
export type Metadata = Partial<IGalleryMetadata & { isMachineScoped: boolean; isBuiltin: boolean; isPreReleaseVersion: boolean, hadPreReleaseVersion: boolean, installedTimestamp: number }>;
export type Metadata = Partial<IGalleryMetadata & { isMachineScoped: boolean; isBuiltin: boolean; isPreReleaseVersion: boolean, preRelease: boolean, installedTimestamp: number }>;
export interface IInstallExtensionTask {
readonly identifier: IExtensionIdentifier;

2
src/vs/platform/extensionManagement/common/extensionManagement.ts
View file

@ -274,7 +274,7 @@ export interface ILocalExtension extends IExtension {
publisherDisplayName: string | null;
installedTimestamp?: number;
isPreReleaseVersion: boolean;
hadPreReleaseVersion: boolean;
preRelease: boolean;
}
export const enum SortBy {

2
src/vs/platform/extensionManagement/node/extensionManagementService.ts
View file

@ -288,7 +288,7 @@ class InstallGalleryExtensionTask extends AbstractInstallExtensionTask {
installableExtension.metadata.isMachineScoped = this.options.isMachineScoped || existingExtension?.isMachineScoped;
installableExtension.metadata.isBuiltin = this.options.isBuiltin || existingExtension?.isBuiltin;
installableExtension.metadata.isPreReleaseVersion = this.gallery.properties.isPreReleaseVersion;
installableExtension.metadata.hadPreReleaseVersion = this.gallery.hasPreReleaseVersion ? this.gallery.properties.isPreReleaseVersion : existingExtension?.hadPreReleaseVersion;
installableExtension.metadata.preRelease = this.gallery.hasPreReleaseVersion ? this.gallery.properties.isPreReleaseVersion : existingExtension?.preRelease;
try {
const local = await this.installExtension(installableExtension, token);

2
src/vs/platform/extensionManagement/node/extensionsScanner.ts
View file

@ -333,7 +333,7 @@ export class ExtensionsScanner extends Disposable {
local.identifier.uuid = metadata?.id;
local.isMachineScoped = !!metadata?.isMachineScoped;
local.isPreReleaseVersion = !!metadata?.isPreReleaseVersion;
local.hadPreReleaseVersion = !!metadata?.hadPreReleaseVersion;
local.preRelease = !!metadata?.preRelease;
local.isBuiltin = local.type === ExtensionType.System || !!metadata?.isBuiltin;
local.installedTimestamp = metadata?.installedTimestamp;
}

6
src/vs/platform/userDataSync/common/extensionsSync.ts
View file

@ -412,7 +412,7 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse
}
if (!installedExtension // Install if the extension does not exist
|| installedExtension.hadPreReleaseVersion !== e.preRelease // Install if the extension pre-release preference has changed
|| installedExtension.preRelease !== e.preRelease // Install if the extension pre-release preference has changed
) {
if (await this.extensionManagementService.canInstall(extension)) {
this.logService.trace(`${this.syncResourceLogLabel}: Installing extension...`, e.identifier.id, extension.version);
@ -472,8 +472,8 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse
private getLocalExtensions(installedExtensions: ILocalExtension[]): ISyncExtensionWithVersion[] {
const disabledExtensions = this.extensionEnablementService.getDisabledExtensions();
return installedExtensions
.map(({ identifier, isBuiltin, manifest, hadPreReleaseVersion }) => {
const syncExntesion: ISyncExtensionWithVersion = { identifier, version: manifest.version, preRelease: hadPreReleaseVersion };
.map(({ identifier, isBuiltin, manifest, preRelease }) => {
const syncExntesion: ISyncExtensionWithVersion = { identifier, version: manifest.version, preRelease };
if (disabledExtensions.some(disabledExtension => areSameExtensions(disabledExtension, identifier))) {
syncExntesion.disabled = true;
}

2
src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
View file

@ -1019,7 +1019,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
(this.getAutoUpdateValue() === true || (e.local && this.extensionEnablementService.isEnabled(e.local)))
);
return Promises.settled(toUpdate.map(e => this.install(e, e.local?.hadPreReleaseVersion ? { installPreReleaseVersion: true } : undefined)));
return Promises.settled(toUpdate.map(e => this.install(e, e.local?.preRelease ? { installPreReleaseVersion: true } : undefined)));
}
async canInstall(extension: IExtension): Promise<boolean> {

4
src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts
View file

@ -110,7 +110,7 @@ function toLocalExtension(extension: IScannedExtension): ILocalExtension {
publisherDisplayName: metadata.publisherDisplayName || null,
installedTimestamp: metadata.installedTimestamp,
isPreReleaseVersion: !!metadata.isPreReleaseVersion,
hadPreReleaseVersion: !!metadata.hadPreReleaseVersion
preRelease: !!metadata.preRelease
};
}
@ -152,7 +152,7 @@ class InstallExtensionTask extends AbstractExtensionTask<ILocalExtension> implem
metadata.publisherId = this.extension.publisherId;
metadata.installedTimestamp = Date.now();
metadata.isPreReleaseVersion = this.extension.properties.isPreReleaseVersion;
metadata.hadPreReleaseVersion = this.extension.hasPreReleaseVersion ? this.extension.properties.isPreReleaseVersion : metadata.hadPreReleaseVersion;
metadata.preRelease = this.extension.hasPreReleaseVersion ? this.extension.properties.isPreReleaseVersion : metadata.preRelease;
}
const scannedExtension = URI.isUri(this.extension) ? await this.webExtensionsScannerService.addExtension(this.extension, metadata)