Skip to content

Commit a2d77ed

Browse files
committed
refactor: re-apply display-language patch
This kinda got removed but I added it back in.
1 parent 63b89ab commit a2d77ed

File tree

1 file changed

+25
-17
lines changed

1 file changed

+25
-17
lines changed

patches/display-language.diff

+25-17
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
1919
===================================================================
2020
--- code-server.orig/lib/vscode/src/vs/server/node/serverServices.ts
2121
+++ code-server/lib/vscode/src/vs/server/node/serverServices.ts
22-
@@ -209,6 +209,9 @@ export async function setupServerService
22+
@@ -216,6 +216,9 @@ export async function setupServerService
2323
const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority));
2424
socketServer.registerChannel('extensions', channel);
2525

@@ -125,7 +125,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/common/environmentServ
125125
===================================================================
126126
--- code-server.orig/lib/vscode/src/vs/platform/environment/common/environmentService.ts
127127
+++ code-server/lib/vscode/src/vs/platform/environment/common/environmentService.ts
128-
@@ -105,7 +105,7 @@ export abstract class AbstractNativeEnvi
128+
@@ -110,7 +110,7 @@ export abstract class AbstractNativeEnvi
129129
return URI.file(join(vscodePortable, 'argv.json'));
130130
}
131131

@@ -248,7 +248,7 @@ Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
248248
===================================================================
249249
--- code-server.orig/lib/vscode/src/vs/workbench/workbench.web.main.ts
250250
+++ code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
251-
@@ -123,8 +123,9 @@ import 'vs/workbench/contrib/logs/browse
251+
@@ -119,8 +119,9 @@ import 'vs/workbench/contrib/logs/browse
252252
// Explorer
253253
import 'vs/workbench/contrib/files/browser/files.web.contribution';
254254

@@ -264,27 +264,35 @@ Index: code-server/lib/vscode/src/vs/platform/languagePacks/browser/languagePack
264264
===================================================================
265265
--- code-server.orig/lib/vscode/src/vs/platform/languagePacks/browser/languagePacks.ts
266266
+++ code-server/lib/vscode/src/vs/platform/languagePacks/browser/languagePacks.ts
267-
@@ -4,10 +4,23 @@
268-
*--------------------------------------------------------------------------------------------*/
269-
270-
import { ILanguagePackItem, LanguagePackBaseService } from 'vs/platform/languagePacks/common/languagePacks';
267+
@@ -6,18 +6,24 @@
268+
import { CancellationTokenSource } from 'vs/base/common/cancellation';
269+
import { Language } from 'vs/base/common/platform';
270+
import { URI } from 'vs/base/common/uri';
271271
+import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
272-
+import { ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks';
272+
import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
273+
import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
274+
-import { ILanguagePackItem, LanguagePackBaseService } from 'vs/platform/languagePacks/common/languagePacks';
275+
+import { ILanguagePackItem, ILanguagePackService, LanguagePackBaseService } from 'vs/platform/languagePacks/common/languagePacks';
276+
import { ILogService } from 'vs/platform/log/common/log';
273277
+import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
274-
+import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
275278

276279
export class WebLanguagePacksService extends LanguagePackBaseService {
277-
- // Web doesn't have a concept of language packs, so we just return an empty array
278280
+ private readonly languagePackService: ILanguagePackService;
279281
+
280-
+ constructor(
282+
constructor(
281283
+ @IRemoteAgentService remoteAgentService: IRemoteAgentService,
282-
+ @IExtensionGalleryService extensionGalleryService: IExtensionGalleryService
283-
+ ) {
284-
+ super(extensionGalleryService)
285-
+ this.languagePackService = ProxyChannel.toService<ILanguagePackService>(remoteAgentService.getConnection()!.getChannel('languagePacks'));
286-
+ }
287-
+
284+
@IExtensionResourceLoaderService private readonly extensionResourceLoaderService: IExtensionResourceLoaderService,
285+
@IExtensionGalleryService extensionGalleryService: IExtensionGalleryService,
286+
@ILogService private readonly logService: ILogService
287+
) {
288+
super(extensionGalleryService);
289+
+ this.languagePackService = ProxyChannel.toService<ILanguagePackService>(remoteAgentService.getConnection()!.getChannel('languagePacks'))
290+
}
291+
292+
async getBuiltInExtensionTranslationsUri(id: string): Promise<URI | undefined> {
293+
@@ -73,6 +79,6 @@ export class WebLanguagePacksService ext
294+
295+
// Web doesn't have a concept of language packs, so we just return an empty array
288296
getInstalledLanguages(): Promise<ILanguagePackItem[]> {
289297
- return Promise.resolve([]);
290298
+ return this.languagePackService.getInstalledLanguages()

0 commit comments

Comments
 (0)