Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-20 23:29:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

#66397 Use single identifier for local extension which is gallery one

Browse Source
This commit is contained in:
Sandeep Somavarapu
2019-01-14 17:11:33 +01:00
parent 8c4af4953c
commit 57d59ad535
25 changed files with 252 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/code/node/cliProcessMain.ts
+4 -4
View File
@@ -153,7 +153,7 @@ class Main {
return Promise.reject(new Error(`${notFound(version ? `${id}@${version}` : id)}\n${useId}`));
}
const [installedExtension] = installed.filter(e => areSameExtensions(e.galleryIdentifier, { id }));
const [installedExtension] = installed.filter(e => areSameExtensions(e.identifier, { id }));
if (installedExtension) {
if (extension.version !== installedExtension.manifest.version) {
if (version || force) {
@@ -186,10 +186,10 @@ class Main {
const extensionIdentifier = { id: getGalleryExtensionId(manifest.publisher, manifest.name) };
const installedExtensions = await this.extensionManagementService.getInstalled(ExtensionType.User);
const newer = installedExtensions.filter(local => areSameExtensions(extensionIdentifier, local.galleryIdentifier) && semver.gt(local.manifest.version, manifest.version))[0];
const newer = installedExtensions.filter(local => areSameExtensions(extensionIdentifier, local.identifier) && semver.gt(local.manifest.version, manifest.version))[0];
if (newer && !force) {
console.log(localize('forceDowngrade', "A newer version of this extension '{0}' v{1} is already installed. Use '--force' option to downgrade to older version.", newer.galleryIdentifier.id, newer.manifest.version, manifest.version));
console.log(localize('forceDowngrade', "A newer version of this extension '{0}' v{1} is already installed. Use '--force' option to downgrade to older version.", newer.identifier.id, newer.manifest.version, manifest.version));
return false;
}
@@ -225,7 +225,7 @@ class Main {
return sequence(extensions.map(extension => () => {
return getExtensionId(extension).then(id => {
return this.extensionManagementService.getInstalled(ExtensionType.User).then(installed => {
const [extension] = installed.filter(e => areSameExtensions(e.galleryIdentifier, { id }));
const [extension] = installed.filter(e => areSameExtensions(e.identifier, { id }));
if (!extension) {
return Promise.reject(new Error(`${notInstalled(id)}\n${useId}`));