@@ -9,15 +9,15 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
9
9
===================================================================
10
10
--- code-server.orig/lib/vscode/src/vs/server/node/serverServices.ts
11
11
+++ code-server/lib/vscode/src/vs/server/node/serverServices.ts
12
- @@ -12,7 +12,7 @@ import * as path from 'vs/ base/common/pa
13
- import { IURITransformer } from 'vs/ base/common/uriIpc';
14
- import { getMachineId, getSqmMachineId, getdevDeviceId } from 'vs/ base/node/id';
15
- import { Promises } from 'vs/ base/node/pfs';
16
- - import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, StaticRouter } from 'vs/ base/parts/ipc/common/ipc';
17
- + import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, ProxyChannel, StaticRouter } from 'vs/ base/parts/ipc/common/ipc';
18
- import { ProtocolConstants } from 'vs/ base/parts/ipc/common/ipc.net';
19
- import { IConfigurationService } from 'vs/ platform/configuration/common/configuration';
20
- import { ConfigurationService } from 'vs/ platform/configuration/common/configurationService';
12
+ @@ -12,7 +12,7 @@ import * as path from '../../ base/common
13
+ import { IURITransformer } from '../../ base/common/uriIpc.js ';
14
+ import { getMachineId, getSqmMachineId, getdevDeviceId } from '../../ base/node/id.js ';
15
+ import { Promises } from '../../ base/node/pfs.js ';
16
+ - import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, StaticRouter } from '../../ base/parts/ipc/common/ipc.js ';
17
+ + import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, ProxyChannel, StaticRouter } from '../../ base/parts/ipc/common/ipc.js ';
18
+ import { ProtocolConstants } from '../../ base/parts/ipc/common/ipc.net.js ';
19
+ import { IConfigurationService } from '../../ platform/configuration/common/configuration.js ';
20
+ import { ConfigurationService } from '../../ platform/configuration/common/configurationService.js ';
21
21
@@ -243,6 +243,9 @@ export async function setupServerService
22
22
const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority));
23
23
socketServer.registerChannel('extensions', channel);
@@ -51,9 +51,9 @@ Index: code-server/lib/vscode/src/vs/server/node/remoteLanguagePacks.ts
51
51
52
52
+ import { promises as fs } from 'fs';
53
53
+ import * as path from 'path';
54
- import { FileAccess } from 'vs/ base/common/network';
55
- import { join } from 'vs/ base/common/path';
56
- import type { INLSConfiguration } from 'vs/ nls';
54
+ import { FileAccess } from '../../ base/common/network.js ';
55
+ import { join } from '../../ base/common/path.js ';
56
+ import type { INLSConfiguration } from '../../ nls.js ';
57
57
@@ -33,7 +35,94 @@ export async function getNLSConfiguratio
58
58
if (!result) {
59
59
result = resolveNLSConfiguration({ userLocale: language, osLocale: language, commit: product.commit, userDataPath, nlsMetadataPath });
@@ -153,14 +153,14 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
153
153
===================================================================
154
154
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
155
155
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
156
- @@ -26,6 +26,7 @@ import { URI } from 'vs/ base/common/uri'
157
- import { streamToBuffer } from 'vs/ base/common/buffer';
158
- import { IProductConfiguration } from 'vs/ base/common/product';
159
- import { isString } from 'vs/ base/common/types';
160
- + import { getLocaleFromConfig, getBrowserNLSConfiguration } from 'vs/server/node/ remoteLanguagePacks';
161
- import { CharCode } from 'vs/ base/common/charCode';
162
- import { IExtensionManifest } from 'vs/ platform/extensions/common/extensions';
163
- import { isESM } from 'vs/ base/common/amd';
156
+ @@ -26,6 +26,7 @@ import { URI } from '../../ base/common/u
157
+ import { streamToBuffer } from '../../ base/common/buffer.js ';
158
+ import { IProductConfiguration } from '../../ base/common/product.js ';
159
+ import { isString } from '../../ base/common/types.js ';
160
+ + import { getLocaleFromConfig, getBrowserNLSConfiguration } from './ remoteLanguagePacks.js ';
161
+ import { CharCode } from '../../ base/common/charCode.js ';
162
+ import { IExtensionManifest } from '../../ platform/extensions/common/extensions.js ';
163
+ import { isESM } from '../../ base/common/amd.js ';
164
164
@@ -99,6 +100,7 @@ export class WebClientServer {
165
165
private readonly _webExtensionResourceUrlTemplate: URI | undefined;
166
166
@@ -222,46 +222,21 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
222
222
223
223
/* ----- server setup ----- */
224
224
225
- Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
226
- ===================================================================
227
- --- code-server.orig/lib/vscode/src/vs/workbench/workbench.web.main.ts
228
- +++ code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
229
- @@ -52,7 +52,7 @@ import 'vs/workbench/services/dialogs/br
230
- import 'vs/workbench/services/host/browser/browserHostService';
231
- import 'vs/workbench/services/lifecycle/browser/lifecycleService';
232
- import 'vs/workbench/services/clipboard/browser/clipboardService';
233
- - import 'vs/workbench/services/localization/browser/localeService';
234
- + import 'vs/workbench/services/localization/electron-sandbox/localeService';
235
- import 'vs/workbench/services/path/browser/pathService';
236
- import 'vs/workbench/services/themes/browser/browserHostColorSchemeService';
237
- import 'vs/workbench/services/encryption/browser/encryptionService';
238
- @@ -118,8 +118,9 @@ registerSingleton(ILanguagePackService,
239
- // Logs
240
- import 'vs/workbench/contrib/logs/browser/logs.contribution';
241
-
242
- - // Localization
243
- - import 'vs/workbench/contrib/localization/browser/localization.contribution';
244
- + // Localization. This does not actually import anything specific to Electron so
245
- + // it should be safe.
246
- + import 'vs/workbench/contrib/localization/electron-sandbox/localization.contribution';
247
-
248
- // Performance
249
- import 'vs/workbench/contrib/performance/browser/performance.web.contribution';
250
225
Index: code-server/lib/vscode/src/vs/platform/languagePacks/browser/languagePacks.ts
251
226
===================================================================
252
227
--- code-server.orig/lib/vscode/src/vs/platform/languagePacks/browser/languagePacks.ts
253
228
+++ code-server/lib/vscode/src/vs/platform/languagePacks/browser/languagePacks.ts
254
229
@@ -5,18 +5,24 @@
255
230
256
- import { CancellationTokenSource } from 'vs/ base/common/cancellation';
257
- import { URI } from 'vs/ base/common/uri';
258
- + import { ProxyChannel } from 'vs/ base/parts/ipc/common/ipc';
259
- import { IExtensionGalleryService } from 'vs/platform /extensionManagement/common/extensionManagement';
260
- import { IExtensionResourceLoaderService } from 'vs/platform /extensionResourceLoader/common/extensionResourceLoader';
261
- - import { ILanguagePackItem, LanguagePackBaseService } from 'vs/platform/languagePacks/ common/languagePacks';
262
- + import { ILanguagePackItem, ILanguagePackService, LanguagePackBaseService } from 'vs/platform/languagePacks/ common/languagePacks';
263
- import { ILogService } from 'vs/platform /log/common/log';
264
- + import { IRemoteAgentService } from 'vs/ workbench/services/remote/common/remoteAgentService';
231
+ import { CancellationTokenSource } from '../../../ base/common/cancellation.js ';
232
+ import { URI } from '../../../ base/common/uri.js ';
233
+ + import { ProxyChannel } from '../../../ base/parts/ipc/common/ipc.js ';
234
+ import { IExtensionGalleryService } from '../.. /extensionManagement/common/extensionManagement.js ';
235
+ import { IExtensionResourceLoaderService } from '../.. /extensionResourceLoader/common/extensionResourceLoader.js ';
236
+ - import { ILanguagePackItem, LanguagePackBaseService } from '../ common/languagePacks.js ';
237
+ + import { ILanguagePackItem, ILanguagePackService, LanguagePackBaseService } from '../ common/languagePacks.js ';
238
+ import { ILogService } from '../.. /log/common/log.js ';
239
+ + import { IRemoteAgentService } from '../../../ workbench/services/remote/common/remoteAgentService.js ';
265
240
266
241
export class WebLanguagePacksService extends LanguagePackBaseService {
267
242
+ private readonly languagePackService: ILanguagePackService;
@@ -313,7 +288,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
313
288
===================================================================
314
289
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
315
290
+++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
316
- @@ -411 ,9 +411 ,6 @@ export class InstallAction extends Exten
291
+ @@ -433 ,9 +433 ,6 @@ export class InstallAction extends Exten
317
292
if (this.extension.isBuiltin) {
318
293
return;
319
294
}
@@ -323,7 +298,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
323
298
if (this.extension.state !== ExtensionState.Uninstalled) {
324
299
return;
325
300
}
326
- @@ -695 ,7 +692 ,7 @@ export abstract class InstallInOtherServ
301
+ @@ -740 ,7 +737 ,7 @@ export abstract class InstallInOtherServ
327
302
}
328
303
329
304
if (isLanguagePackExtension(this.extension.local.manifest)) {
@@ -332,7 +307,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
332
307
}
333
308
334
309
// Prefers to run on UI
335
- @@ -1951 ,17 +1948 ,6 @@ export class SetLanguageAction extends E
310
+ @@ -2001 ,17 +1998 ,6 @@ export class SetLanguageAction extends E
336
311
update(): void {
337
312
this.enabled = false;
338
313
this.class = SetLanguageAction.DisabledClass;
@@ -350,15 +325,15 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
350
325
}
351
326
352
327
override async run(): Promise<any> {
353
- @@ -1978 ,7 +1964 ,6 @@ export class ClearLanguageAction extends
328
+ @@ -2028 ,7 +2014 ,6 @@ export class ClearLanguageAction extends
354
329
private static readonly DisabledClass = `${this.EnabledClass} disabled`;
355
330
356
331
constructor(
357
332
- @IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
358
333
@ILocaleService private readonly localeService: ILocaleService,
359
334
) {
360
335
super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false);
361
- @@ -1988 ,17 +1973 ,6 @@ export class ClearLanguageAction extends
336
+ @@ -2038 ,17 +2023 ,6 @@ export class ClearLanguageAction extends
362
337
update(): void {
363
338
this.enabled = false;
364
339
this.class = ClearLanguageAction.DisabledClass;
0 commit comments