From a65231808a2d2abad75323337edd294dc82b34f1 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 9 Feb 2021 10:39:35 -0600 Subject: [PATCH] Fall back to remote extension server on web --- .../common/extensionManagementService.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/lib/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts index 552d7859..7112f282 100644 --- a/lib/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts +++ b/lib/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts @@ -24,6 +24,7 @@ import { IDialogService } from 'vs/platform/dialogs/common/dialogs'; import Severity from 'vs/base/common/severity'; import { canceled } from 'vs/base/common/errors'; import { IUserDataAutoSyncEnablementService, IUserDataSyncResourceEnablementService, SyncResource } from 'vs/platform/userDataSync/common/userDataSync'; +import { isWeb } from 'vs/base/common/platform'; export class ExtensionManagementService extends Disposable implements IWorkbenchExtensioManagementService { @@ -304,17 +305,13 @@ export class ExtensionManagementService extends Disposable implements IWorkbench } } -<<<<<<< HEAD - // NOTE@coder: Fall back to installing on the remote server. - if (this.extensionManagementServerService.remoteExtensionManagementServer) { + // NOTE@coder: Fall back to installing on the remote server on web. + if (isWeb && this.extensionManagementServerService.remoteExtensionManagementServer) { return this.extensionManagementServerService.remoteExtensionManagementServer; } - return undefined; -======= // Local server can accept any extension. So return local server if not compatible server found. return this.extensionManagementServerService.localExtensionManagementServer; ->>>>>>> e4a830e9b7ca039c7c70697786d29f5b6679d775 } private async hasToFlagExtensionsMachineScoped(extensions: IGalleryExtension[]): Promise {