Fixes microsoft/vscode-remote-release#1400: Allow UI extensions to ru…

…n remotely
microsoft · Sep 23, 2019 · 00983bc · 00983bc · alexdima · Sep 23, 2019
1 parent e5383cf
commit 00983bc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionEnablementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionEnablementService.ts
@@ -148,8 +148,11 @@ export class ExtensionEnablementService extends Disposable implements IExtension
 
 	private _isDisabledByExtensionKind(extension: IExtension): boolean {
 		if (this.extensionManagementServerService.localExtensionManagementServer && this.extensionManagementServerService.remoteExtensionManagementServer) {
-			const server = isUIExtension(extension.manifest, this.productService, this.configurationService) ? this.extensionManagementServerService.localExtensionManagementServer : this.extensionManagementServerService.remoteExtensionManagementServer;
-			return this.extensionManagementServerService.getExtensionManagementServer(extension.location) !== server;
+			if (!isUIExtension(extension.manifest, this.productService, this.configurationService)) {
+				// workspace extensions must run on the remote, but UI extensions can run on either side
+				const server = this.extensionManagementServerService.remoteExtensionManagementServer;
+				return this.extensionManagementServerService.getExtensionManagementServer(extension.location) !== server;
+			}
 		}
 		return false;
 	}

diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
@@ -505,13 +505,13 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 			// remove disabled extensions
 			remoteEnv.extensions = remove(remoteEnv.extensions, extension => this._isDisabled(extension));
 
-			// remove UI extensions from the remote extensions
-			remoteEnv.extensions = remove(remoteEnv.extensions, extension => isUIExtension(extension));
-
 			// remove non-UI extensions from the local extensions
 			localExtensions = remove(localExtensions, extension => !extension.isBuiltin && !isUIExtension(extension));
 
-			// in case of overlap, the remote wins
+			// in case of UI extensions overlap, the local extension wins
+			remoteEnv.extensions = remove(remoteEnv.extensions, localExtensions.filter(extension => isUIExtension(extension)));
+
+			// in case of other extensions overlap, the remote extension wins
 			localExtensions = remove(localExtensions, remoteEnv.extensions);
 
 			// save for remote extension's init data