bughz
/
code-server
mirror of https://github.com/coder/code-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fall back to remote extension server on web

This commit is contained in:
Asher 2021-02-09 10:39:35 -06:00
parent a6d4b24733
commit a65231808a
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
View File

@ -24,6 +24,7 @@ import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
import Severity from 'vs/base/common/severity'; import Severity from 'vs/base/common/severity';
import { canceled } from 'vs/base/common/errors'; import { canceled } from 'vs/base/common/errors';
import { IUserDataAutoSyncEnablementService, IUserDataSyncResourceEnablementService, SyncResource } from 'vs/platform/userDataSync/common/userDataSync'; import { IUserDataAutoSyncEnablementService, IUserDataSyncResourceEnablementService, SyncResource } from 'vs/platform/userDataSync/common/userDataSync';
import { isWeb } from 'vs/base/common/platform';
export class ExtensionManagementService extends Disposable implements IWorkbenchExtensioManagementService { 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 on web.
// NOTE@coder: Fall back to installing on the remote server. if (isWeb && this.extensionManagementServerService.remoteExtensionManagementServer) {
if (this.extensionManagementServerService.remoteExtensionManagementServer) {
return this.extensionManagementServerService.remoteExtensionManagementServer; return this.extensionManagementServerService.remoteExtensionManagementServer;
} }
return undefined;
=======
// Local server can accept any extension. So return local server if not compatible server found. // Local server can accept any extension. So return local server if not compatible server found.
return this.extensionManagementServerService.localExtensionManagementServer; return this.extensionManagementServerService.localExtensionManagementServer;
>>>>>>> e4a830e9b7ca039c7c70697786d29f5b6679d775
} }
private async hasToFlagExtensionsMachineScoped(extensions: IGalleryExtension[]): Promise<boolean> { private async hasToFlagExtensionsMachineScoped(extensions: IGalleryExtension[]): Promise<boolean> {