diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts index 06403239f22d6..b0adc00683364 100644 --- a/src/vs/platform/extensionManagement/common/extensionManagement.ts +++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts @@ -280,7 +280,7 @@ export interface IExtensionManagementService { install(zipPath: string): TPromise; installFromGallery(extension: IGalleryExtension): TPromise; uninstall(extension: ILocalExtension, force?: boolean): TPromise; - reinstall(extension: ILocalExtension): TPromise; + reinstallFromGallery(extension: ILocalExtension): TPromise; getInstalled(type?: LocalExtensionType): TPromise; getExtensionsReport(): TPromise; diff --git a/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts b/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts index bde1ae27e552e..77da87df28e97 100644 --- a/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts +++ b/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts @@ -18,7 +18,7 @@ export interface IExtensionManagementChannel extends IChannel { call(command: 'install', path: string): TPromise; call(command: 'installFromGallery', extension: IGalleryExtension): TPromise; call(command: 'uninstall', args: [ILocalExtension, boolean]): TPromise; - call(command: 'reinstall', args: [ILocalExtension]): TPromise; + call(command: 'reinstallFromGallery', args: [ILocalExtension]): TPromise; call(command: 'getInstalled'): TPromise; call(command: 'getExtensionsReport'): TPromise; call(command: string, arg?: any): TPromise; @@ -47,7 +47,7 @@ export class ExtensionManagementChannel implements IExtensionManagementChannel { case 'install': return this.service.install(arg); case 'installFromGallery': return this.service.installFromGallery(arg[0]); case 'uninstall': return this.service.uninstall(arg[0], arg[1]); - case 'reinstall': return this.service.reinstall(arg[0]); + case 'reinstallFromGallery': return this.service.reinstallFromGallery(arg[0]); case 'getInstalled': return this.service.getInstalled(arg); case 'updateMetadata': return this.service.updateMetadata(arg[0], arg[1]); case 'getExtensionsReport': return this.service.getExtensionsReport(); @@ -86,8 +86,8 @@ export class ExtensionManagementChannelClient implements IExtensionManagementSer return this.channel.call('uninstall', [extension, force]); } - reinstall(extension: ILocalExtension): TPromise { - return this.channel.call('reinstall', [extension]); + reinstallFromGallery(extension: ILocalExtension): TPromise { + return this.channel.call('reinstallFromGallery', [extension]); } getInstalled(type: LocalExtensionType = null): TPromise { diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts index 91a36de844394..a7b8a21fa2ced 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts @@ -244,7 +244,7 @@ export class ExtensionManagementService extends Disposable implements IExtension error => this.onDidInstallExtensions([extension], [], [error])); } - reinstall(extension: ILocalExtension): TPromise { + reinstallFromGallery(extension: ILocalExtension): TPromise { if (!this.galleryService.isEnabled()) { return TPromise.wrapError(new Error(nls.localize('MarketPlaceDisabled', "Marketplace is not enabled"))); } diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts index dd3a9550bd9cd..4f5875b5302db 100644 --- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts +++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts @@ -670,7 +670,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { return this.progressService.withProgress({ location: ProgressLocation.Extensions, tooltip: `${local.identifier.id}` - }, () => this.extensionService.reinstall(local).then(() => null)); + }, () => this.extensionService.reinstallFromGallery(local).then(() => null)); } private promptAndSetEnablement(extension: IExtension, enablementState: EnablementState, enable: boolean): TPromise {