Skip to content

Commit f72e3f8

Browse files
committed
Update Code to 1.94.0
- Fixes coder#7018
1 parent 13d4cd6 commit f72e3f8

16 files changed

+179
-218
lines changed

.node-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.15.1
1+
20.16.0

lib/vscode

Submodule vscode updated 4622 files

patches/clipboard.diff

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ Index: code-server/lib/vscode/src/vs/workbench/api/browser/mainThreadCLICommands
22
===================================================================
33
--- code-server.orig/lib/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.ts
44
+++ code-server/lib/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.ts
5-
@@ -8,6 +8,7 @@ import { isWeb } from 'vs/base/common/pl
6-
import { isString } from 'vs/base/common/types';
7-
import { URI, UriComponents } from 'vs/base/common/uri';
8-
import { localize } from 'vs/nls';
9-
+import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
10-
import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
11-
import { IExtensionGalleryService, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
12-
import { ExtensionManagementCLI } from 'vs/platform/extensionManagement/common/extensionManagementCLI';
5+
@@ -8,6 +8,7 @@ import { isWeb } from '../../../base/com
6+
import { isString } from '../../../base/common/types.js';
7+
import { URI, UriComponents } from '../../../base/common/uri.js';
8+
import { localize } from '../../../nls.js';
9+
+import { IClipboardService } from '../../../platform/clipboard/common/clipboardService.js';
10+
import { CommandsRegistry, ICommandService } from '../../../platform/commands/common/commands.js';
11+
import { IExtensionGalleryService, IExtensionManagementService } from '../../../platform/extensionManagement/common/extensionManagement.js';
12+
import { ExtensionManagementCLI } from '../../../platform/extensionManagement/common/extensionManagementCLI.js';
1313
@@ -89,6 +90,11 @@ CommandsRegistry.registerCommand('_remot
1414
return lines.join('\n');
1515
});

patches/disable-builtin-ext-update.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
77
===================================================================
88
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
99
+++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
10-
@@ -314,6 +314,10 @@ export class Extension implements IExten
10+
@@ -315,6 +315,10 @@ export class Extension implements IExten
1111
if (this.type === ExtensionType.System && this.productService.quality === 'stable') {
1212
return false;
1313
}

patches/display-language.diff

+34-59
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
99
===================================================================
1010
--- code-server.orig/lib/vscode/src/vs/server/node/serverServices.ts
1111
+++ 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';
2121
@@ -243,6 +243,9 @@ export async function setupServerService
2222
const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority));
2323
socketServer.registerChannel('extensions', channel);
@@ -51,9 +51,9 @@ Index: code-server/lib/vscode/src/vs/server/node/remoteLanguagePacks.ts
5151

5252
+import { promises as fs } from 'fs';
5353
+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';
5757
@@ -33,7 +35,94 @@ export async function getNLSConfiguratio
5858
if (!result) {
5959
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
153153
===================================================================
154154
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
155155
+++ 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';
164164
@@ -99,6 +100,7 @@ export class WebClientServer {
165165
private readonly _webExtensionResourceUrlTemplate: URI | undefined;
166166

@@ -222,46 +222,21 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
222222

223223
/* ----- server setup ----- */
224224

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';
250225
Index: code-server/lib/vscode/src/vs/platform/languagePacks/browser/languagePacks.ts
251226
===================================================================
252227
--- code-server.orig/lib/vscode/src/vs/platform/languagePacks/browser/languagePacks.ts
253228
+++ code-server/lib/vscode/src/vs/platform/languagePacks/browser/languagePacks.ts
254229
@@ -5,18 +5,24 @@
255230

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';
265240

266241
export class WebLanguagePacksService extends LanguagePackBaseService {
267242
+ private readonly languagePackService: ILanguagePackService;
@@ -313,7 +288,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
313288
===================================================================
314289
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
315290
+++ 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
317292
if (this.extension.isBuiltin) {
318293
return;
319294
}
@@ -323,7 +298,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
323298
if (this.extension.state !== ExtensionState.Uninstalled) {
324299
return;
325300
}
326-
@@ -695,7 +692,7 @@ export abstract class InstallInOtherServ
301+
@@ -740,7 +737,7 @@ export abstract class InstallInOtherServ
327302
}
328303

329304
if (isLanguagePackExtension(this.extension.local.manifest)) {
@@ -332,7 +307,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
332307
}
333308

334309
// 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
336311
update(): void {
337312
this.enabled = false;
338313
this.class = SetLanguageAction.DisabledClass;
@@ -350,15 +325,15 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
350325
}
351326

352327
override async run(): Promise<any> {
353-
@@ -1978,7 +1964,6 @@ export class ClearLanguageAction extends
328+
@@ -2028,7 +2014,6 @@ export class ClearLanguageAction extends
354329
private static readonly DisabledClass = `${this.EnabledClass} disabled`;
355330

356331
constructor(
357332
- @IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
358333
@ILocaleService private readonly localeService: ILocaleService,
359334
) {
360335
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
362337
update(): void {
363338
this.enabled = false;
364339
this.class = ClearLanguageAction.DisabledClass;

0 commit comments

Comments
 (0)