From 58b38d5ee54cbcc97cb864a49b16cab6439f00e3 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 23 Apr 2019 17:49:35 +0200 Subject: [PATCH] Fix Microsoft/vscode-remote/issues/1455 --- .../contrib/extensions/node/extensionsWorkbenchService.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/node/extensionsWorkbenchService.ts index 6fe65c58580..c33c39b2e70 100644 --- a/src/vs/workbench/contrib/extensions/node/extensionsWorkbenchService.ts +++ b/src/vs/workbench/contrib/extensions/node/extensionsWorkbenchService.ts @@ -812,7 +812,8 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension } return this.installWithProgress(async () => { - await this.extensionService.installFromGallery(gallery); + const extensionService = extension.server ? extension.server.extensionManagementService : this.extensionService; + await extensionService.installFromGallery(gallery); this.checkAndEnableDisabledDependencies(gallery.identifier); return this.local.filter(local => areSameExtensions(local.identifier, gallery.identifier))[0]; }, gallery.displayName); @@ -854,7 +855,8 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension return Promise.reject(new Error(nls.localize('incompatible', "Unable to install extension '{0}' with version '{1}' as it is not compatible with VS Code.", extension.gallery!.identifier.id, version))); } return this.installWithProgress(async () => { - await this.extensionService.installFromGallery(gallery); + const extensionService = extension.server ? extension.server.extensionManagementService : this.extensionService; + await extensionService.installFromGallery(gallery); if (extension.latestVersion !== version) { this.ignoreAutoUpdate(new ExtensionIdentifierWithVersion(gallery.identifier, version)); } -- GitLab