File tree Expand file tree Collapse file tree 2 files changed +16
-3
lines changed Expand file tree Collapse file tree 2 files changed +16
-3
lines changed Original file line number Diff line number Diff line change @@ -3204,10 +3204,23 @@ index c28b14774005509f58dddd2dec25547bac85e09f..6090200d9c3671fc1239880dbd060a01
3204
3204
return false;
3205
3205
}
3206
3206
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
3207
- index 33eb56db3c25a0dc028b0d54dfa102e5584441cf..e5167794c3f761b06c9745e12d49b4a5257b48ef 100644
3207
+ index 33eb56db3c25a0dc028b0d54dfa102e5584441cf..de70af33529e40a56969d8f241c82906cda72e1e 100644
3208
3208
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
3209
3209
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
3210
- @@ -236,6 +236,11 @@ export class ExtensionManagementService extends Disposable implements IExtension
3210
+ @@ -202,8 +202,11 @@ export class ExtensionManagementService extends Disposable implements IExtension
3211
+ }
3212
+
3213
+ // Install Language pack on all servers
3214
+ + // NOTE@coder: It does not appear language packs can be installed on the web
3215
+ + // extension management server at this time. Filter out the web to fix this.
3216
+ if (isLanguagePackExtension(manifest)) {
3217
+ - return Promise.all(this.servers.map(server => server.extensionManagementService.installFromGallery(gallery))).then(([local]) => local);
3218
+ + const servers = this.servers.filter(s => s !== this.extensionManagementServerService.webExtensionManagementServer);
3219
+ + return Promise.all(servers.map(server => server.extensionManagementService.installFromGallery(gallery))).then(([local]) => local);
3220
+ }
3221
+
3222
+ // 1. Install on preferred location
3223
+ @@ -236,6 +239,11 @@ export class ExtensionManagementService extends Disposable implements IExtension
3211
3224
return this.extensionManagementServerService.webExtensionManagementServer.extensionManagementService.installFromGallery(gallery);
3212
3225
}
3213
3226
Original file line number Diff line number Diff line change 17
17
}
18
18
// FIXME: Only works if path separators are /.
19
19
const path = nlsConfig . _resolvedLanguagePackCoreLocation + "/" + bundle . replace ( / \/ / g, "!" ) + ".nls.json"
20
- fetch ( `{{BASE} }/resource/?path=${ encodeURIComponent ( path ) } ` )
20
+ fetch ( `${ options . base } /resource/?path=${ encodeURIComponent ( path ) } ` )
21
21
. then ( ( response ) => response . json ( ) )
22
22
. then ( ( json ) => {
23
23
bundles [ bundle ] = json
You can’t perform that action at this time.
0 commit comments