Skip to content

Commit 74d16f2

Browse files
committed
Fix language package installation
Updates #2046.
1 parent fa0286a commit 74d16f2

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

ci/dev/vscode.patch

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3143,10 +3143,23 @@ index c28b1477400..6090200d9c3 100644
31433143
return false;
31443144
}
31453145
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
3146-
index 33eb56db3c2..e5167794c3f 100644
3146+
index 33eb56db3c..2444bed0bf 100644
31473147
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
31483148
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
3149-
@@ -236,6 +236,11 @@ export class ExtensionManagementService extends Disposable implements IExtension
3149+
@@ -202,8 +202,11 @@ export class ExtensionManagementService extends Disposable implements IExtension
3150+
}
3151+
3152+
// Install Language pack on all servers
3153+
+ // NOTE@coder: It does not appear language packs can be installed on the web
3154+
+ // extension management server at this time so this throws an error.
3155+
if (isLanguagePackExtension(manifest)) {
3156+
- return Promise.all(this.servers.map(server => server.extensionManagementService.installFromGallery(gallery))).then(([local]) => local);
3157+
+ const servers = this.servers.filter(s => s !== this.extensionManagementServerService.webExtensionManagementServer);
3158+
+ return Promise.all(servers.map(server => server.extensionManagementService.installFromGallery(gallery))).then(([local]) => local);
3159+
}
3160+
3161+
// 1. Install on preferred location
3162+
@@ -236,6 +239,11 @@ export class ExtensionManagementService extends Disposable implements IExtension
31503163
return this.extensionManagementServerService.webExtensionManagementServer.extensionManagementService.installFromGallery(gallery);
31513164
}
31523165

0 commit comments

Comments
 (0)