Fix microsoft/vscode-remote/issues/1455

sandy081 · sandy081 · commit 58b38d5ee54c · 2019-04-23T17:49:35.000+02:00
diff --git 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));
 					}

Original file line number	Diff line number	Diff line change
`@@ -812,7 +812,8 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension`
`812`	`812`	`}`
`813`	`813`
`814`	`814`	`return this.installWithProgress(async () => {`
`815`		`- await this.extensionService.installFromGallery(gallery);`
	`815`	`+ const extensionService = extension.server ? extension.server.extensionManagementService : this.extensionService;`
	`816`	`+ await extensionService.installFromGallery(gallery);`
`816`	`817`	`this.checkAndEnableDisabledDependencies(gallery.identifier);`
`817`	`818`	`return this.local.filter(local => areSameExtensions(local.identifier, gallery.identifier))[0];`
`818`	`819`	`}, gallery.displayName);`
`@@ -854,7 +855,8 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension`
`854`	`855`	`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)));`
`855`	`856`	`}`
`856`	`857`	`return this.installWithProgress(async () => {`
`857`		`- await this.extensionService.installFromGallery(gallery);`
	`858`	`+ const extensionService = extension.server ? extension.server.extensionManagementService : this.extensionService;`
	`859`	`+ await extensionService.installFromGallery(gallery);`
`858`	`860`	`if (extension.latestVersion !== version) {`
`859`	`861`	`this.ignoreAutoUpdate(new ExtensionIdentifierWithVersion(gallery.identifier, version));`
`860`	`862`	`}`