#48430 Change return type

src/vs/platform/extensionManagement/common/extensionManagement.ts

@@ -205,6 +205,7 @@ export enum LocalExtensionType {
 export interface ILocalExtension {
 	type: LocalExtensionType;
 	identifier: IExtensionIdentifier;
+	galleryIdentifier: IExtensionIdentifier;
 	manifest: IExtensionManifest;
 	metadata: IGalleryMetadata;
 	location: URI;
@@ -303,10 +304,10 @@ export interface IExtensionManagementService {
 	onUninstallExtension: Event<IExtensionIdentifier>;
 	onDidUninstallExtension: Event<DidUninstallExtensionEvent>;
 
-	install(zipPath: string): TPromise<ILocalExtension>;
-	installFromGallery(extension: IGalleryExtension): TPromise<ILocalExtension>;
+	install(zipPath: string): TPromise<void>;
+	installFromGallery(extension: IGalleryExtension): TPromise<void>;
 	uninstall(extension: ILocalExtension, force?: boolean): TPromise<void>;
-	reinstallFromGallery(extension: ILocalExtension): TPromise<ILocalExtension>;
+	reinstallFromGallery(extension: ILocalExtension): TPromise<void>;
 	getInstalled(type?: LocalExtensionType): TPromise<ILocalExtension[]>;
 	getExtensionsReport(): TPromise<IReportedExtension[]>;
 

src/vs/platform/extensionManagement/common/extensionManagementIpc.ts

@@ -17,10 +17,10 @@ export interface IExtensionManagementChannel extends IChannel {
 	listen(event: 'onDidInstallExtension'): Event<DidInstallExtensionEvent>;
 	listen(event: 'onUninstallExtension'): Event<IExtensionIdentifier>;
 	listen(event: 'onDidUninstallExtension'): Event<DidUninstallExtensionEvent>;
-	call(command: 'install', args: [string]): TPromise<ILocalExtension>;
-	call(command: 'installFromGallery', args: [IGalleryExtension]): TPromise<ILocalExtension>;
+	call(command: 'install', args: [string]): TPromise<void>;
+	call(command: 'installFromGallery', args: [IGalleryExtension]): TPromise<void>;
 	call(command: 'uninstall', args: [ILocalExtension, boolean]): TPromise<void>;
-	call(command: 'reinstallFromGallery', args: [ILocalExtension]): TPromise<ILocalExtension>;
+	call(command: 'reinstallFromGallery', args: [ILocalExtension]): TPromise<void>;
 	call(command: 'getInstalled', args: [LocalExtensionType]): TPromise<ILocalExtension[]>;
 	call(command: 'getExtensionsReport'): TPromise<IReportedExtension[]>;
 	call(command: 'updateMetadata', args: [ILocalExtension, IGalleryMetadata]): TPromise<ILocalExtension>;
@@ -81,23 +81,20 @@ export class ExtensionManagementChannelClient implements IExtensionManagementSer
 	get onUninstallExtension(): Event<IExtensionIdentifier> { return this.channel.listen('onUninstallExtension'); }
 	get onDidUninstallExtension(): Event<DidUninstallExtensionEvent> { return this.channel.listen('onDidUninstallExtension'); }
 
-	install(zipPath: string): TPromise<ILocalExtension> {
-		return this.channel.call('install', [zipPath])
-			.then(extension => this._transform(extension));
+	install(zipPath: string): TPromise<void> {
+		return this.channel.call('install', [zipPath]);
 	}
 
-	installFromGallery(extension: IGalleryExtension): TPromise<ILocalExtension> {
-		return this.channel.call('installFromGallery', [extension])
-			.then(extension => this._transform(extension));
+	installFromGallery(extension: IGalleryExtension): TPromise<void> {
+		return this.channel.call('installFromGallery', [extension]);
 	}
 
 	uninstall(extension: ILocalExtension, force = false): TPromise<void> {
 		return this.channel.call('uninstall', [extension, force]);
 	}
 
-	reinstallFromGallery(extension: ILocalExtension): TPromise<ILocalExtension> {
-		return this.channel.call('reinstallFromGallery', [extension])
-			.then(extension => this._transform(extension));
+	reinstallFromGallery(extension: ILocalExtension): TPromise<void> {
+		return this.channel.call('reinstallFromGallery', [extension]);
 	}
 
 	getInstalled(type: LocalExtensionType = null): TPromise<ILocalExtension[]> {

src/vs/platform/extensionManagement/common/multiExtensionManagement.ts

@@ -41,7 +41,7 @@ export class MulitExtensionManagementService implements IExtensionManagementServ
 		return this.getServer(extension).extensionManagementService.uninstall(extension, force);
 	}
 
-	reinstallFromGallery(extension: ILocalExtension): TPromise<ILocalExtension> {
+	reinstallFromGallery(extension: ILocalExtension): TPromise<void> {
 		return this.getServer(extension).extensionManagementService.reinstallFromGallery(extension);
 	}
 
@@ -49,12 +49,12 @@ export class MulitExtensionManagementService implements IExtensionManagementServ
 		return this.getServer(extension).extensionManagementService.updateMetadata(extension, metadata);
 	}
 
-	install(zipPath: string): TPromise<ILocalExtension> {
+	install(zipPath: string): TPromise<void> {
 		return this.servers[0].extensionManagementService.install(zipPath);
 	}
 
-	installFromGallery(extension: IGalleryExtension): TPromise<ILocalExtension> {
-		return this.servers[0].extensionManagementService.installFromGallery(extension);
+	installFromGallery(extension: IGalleryExtension): TPromise<void> {
+		return TPromise.join(this.servers.map(server => server.extensionManagementService.installFromGallery(extension))).then(() => null);
 	}
 
 	getExtensionsReport(): TPromise<IReportedExtension[]> {

src/vs/platform/extensionManagement/node/extensionManagementService.ts

@@ -152,14 +152,14 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		}));
 	}
 
-	install(zipPath: string): TPromise<ILocalExtension> {
+	install(zipPath: string): TPromise<void> {
 		zipPath = path.resolve(zipPath);
 
 		return validateLocalExtension(zipPath)
 			.then(manifest => {
 				const identifier = { id: getLocalExtensionIdFromManifest(manifest) };
 				if (manifest.engines && manifest.engines.vscode && !isEngineValid(manifest.engines.vscode)) {
-					return TPromise.wrapError<ILocalExtension>(new Error(nls.localize('incompatible', "Unable to install Extension '{0}' as it is not compatible with Code '{1}'.", identifier.id, pkg.version)));
+					return TPromise.wrapError<void>(new Error(nls.localize('incompatible', "Unable to install Extension '{0}' as it is not compatible with Code '{1}'.", identifier.id, pkg.version)));
 				}
 				return this.removeIfExists(identifier.id)
 					.then(
@@ -173,7 +173,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 											metadata => this.installFromZipPath(identifier, zipPath, metadata, manifest),
 											error => this.installFromZipPath(identifier, zipPath, null, manifest))
 										.then(
-											local => { this.logService.info('Successfully installed the extension:', identifier.id); return local; },
+											() => { this.logService.info('Successfully installed the extension:', identifier.id); },
 											e => {
 												this.logService.error('Failed to install the extension:', identifier.id, e.message);
 												return TPromise.wrapError(e);
@@ -240,7 +240,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			}));
 	}
 
-	installFromGallery(extension: IGalleryExtension): TPromise<ILocalExtension> {
+	installFromGallery(extension: IGalleryExtension): TPromise<void> {
 		this.onInstallExtensions([extension]);
 		return this.toNonCancellablePromise(this.getInstalled(LocalExtensionType.User)
 			.then(installed => this.collectExtensionsToInstall(extension)
@@ -253,13 +253,13 @@ export class ExtensionManagementService extends Disposable implements IExtension
 						return this.downloadAndInstallExtensions(extensionsToInstall, operataions)
 							.then(
 								locals => this.onDidInstallExtensions(extensionsToInstall, locals, operataions, [])
-									.then(() => locals.filter(l => areSameExtensions({ id: getGalleryExtensionIdFromLocal(l), uuid: l.identifier.uuid }, extension.identifier))[0]),
+									.then(() => null),
 								errors => this.onDidInstallExtensions(extensionsToInstall, [], operataions, errors));
 					},
 					error => this.onDidInstallExtensions([extension], [], [this.getOperation(extension.identifier, installed)], [error]))));
 	}
 
-	reinstallFromGallery(extension: ILocalExtension): TPromise<ILocalExtension> {
+	reinstallFromGallery(extension: ILocalExtension): TPromise<void> {
 		if (!this.galleryService.isEnabled()) {
 			return TPromise.wrapError(new Error(nls.localize('MarketPlaceDisabled', "Marketplace is not enabled")));
 		}
@@ -762,7 +762,8 @@ export class ExtensionManagementService extends Disposable implements IExtension
 						manifest.extensionDependencies = manifest.extensionDependencies.map(id => adoptToGalleryExtensionId(id));
 					}
 					const identifier = { id: type === LocalExtensionType.System ? folderName : getLocalExtensionIdFromManifest(manifest), uuid: metadata ? metadata.id : null };
-					return { type, identifier, manifest, metadata, location: URI.file(extensionPath), readmeUrl, changelogUrl };
+					const galleryIdentifier = { id: getGalleryExtensionId(manifest.publisher, manifest.name), uuid: identifier.uuid };
+					return { type, identifier, galleryIdentifier, manifest, metadata, location: URI.file(extensionPath), readmeUrl, changelogUrl };
 				}))
 			.then(null, () => null);
 	}

src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts

@@ -655,7 +655,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 			location: ProgressLocation.Extensions,
 			title: nls.localize('installingMarketPlaceExtension', 'Installing extension from Marketplace....'),
 			source: `${extension.id}`
-		}, () => this.extensionService.installFromGallery(gallery).then(() => null));
+		}, () => this.extensionService.installFromGallery(gallery));
 	}
 
 	setEnablement(extensions: IExtension | IExtension[], enablementState: EnablementState): TPromise<void> {

src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts

@@ -24,7 +24,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { Schemas } from 'vs/base/common/network';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { getInstalledExtensions, IExtensionStatus, onExtensionChanged, isKeymapExtension } from 'vs/workbench/parts/extensions/electron-browser/extensionsUtils';
-import { IExtensionEnablementService, IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService, EnablementState } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionEnablementService, IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService, EnablementState, LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { used } from 'vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page';
 import { ILifecycleService, StartupKind } from 'vs/platform/lifecycle/common/lifecycle';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
@@ -39,6 +39,7 @@ import { IEditorInputFactory, EditorInput } from 'vs/workbench/common/editor';
 import { getIdAndVersionFromLocalExtensionId } from 'vs/platform/extensionManagement/node/extensionManagementUtil';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { TimeoutTimer } from 'vs/base/common/async';
+import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 
 used();
 
@@ -420,7 +421,9 @@ class WelcomePage {
 						return null;
 					}
 					return this.extensionManagementService.installFromGallery(extension)
-						.then(local => {
+						.then(() => this.extensionManagementService.getInstalled(LocalExtensionType.User))
+						.then(installed => {
+							const local = installed.filter(i => areSameExtensions(extension.identifier, i.galleryIdentifier))[0];
 							// TODO: Do this as part of the install to avoid multiple events.
 							return this.extensionEnablementService.setEnablement(local, EnablementState.Disabled).then(() => local);
 						});