Skip to content

Commit 8856e4f

Browse files
benz0libenz0li
committed
Update Code to 1.88.0
1 parent 45e96ec commit 8856e4f

17 files changed

+80
-84
lines changed

‎lib/vscode

Submodule vscode updated 1316 files

‎patches/base-path.diff

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Index: code-server/lib/vscode/src/vs/base/common/network.ts
1010
===================================================================
1111
--- code-server.orig/lib/vscode/src/vs/base/common/network.ts
1212
+++ code-server/lib/vscode/src/vs/base/common/network.ts
13-
@@ -194,7 +194,9 @@ class RemoteAuthoritiesImpl {
13+
@@ -198,7 +198,9 @@ class RemoteAuthoritiesImpl {
1414
return URI.from({
1515
scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource,
1616
authority: `${host}:${port}`,
@@ -111,7 +111,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
111111
===================================================================
112112
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
113113
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
114-
@@ -269,16 +269,15 @@ export class WebClientServer {
114+
@@ -270,16 +270,15 @@ export class WebClientServer {
115115
return void res.end();
116116
}
117117

@@ -133,7 +133,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
133133
);
134134
if (!remoteAuthority) {
135135
return serveError(req, res, 400, `Bad request.`);
136-
@@ -305,8 +304,12 @@ export class WebClientServer {
136+
@@ -306,8 +305,12 @@ export class WebClientServer {
137137
scopes: [['user:email'], ['repo']]
138138
} : undefined;
139139

@@ -146,7 +146,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
146146
embedderIdentifier: 'server-distro',
147147
extensionsGallery: this._webExtensionResourceUrlTemplate ? {
148148
...this._productService.extensionsGallery,
149-
@@ -341,8 +344,10 @@ export class WebClientServer {
149+
@@ -343,8 +346,10 @@ export class WebClientServer {
150150
const values: { [key: string]: string } = {
151151
WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration),
152152
WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '',
@@ -159,7 +159,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
159159
};
160160

161161
if (useTestResolver) {
162-
@@ -369,7 +374,7 @@ export class WebClientServer {
162+
@@ -371,7 +376,7 @@ export class WebClientServer {
163163
'default-src \'self\';',
164164
'img-src \'self\' https: data: blob:;',
165165
'media-src \'self\';',
@@ -168,7 +168,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
168168
'child-src \'self\';',
169169
`frame-src 'self' https://*.vscode-cdn.net data:;`,
170170
'worker-src \'self\' data: blob:;',
171-
@@ -442,3 +447,70 @@ export class WebClientServer {
171+
@@ -444,3 +449,70 @@ export class WebClientServer {
172172
return void res.end(data);
173173
}
174174
}
@@ -303,10 +303,10 @@ Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/ext
303303
import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
304304
import { getTelemetryLevel, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
305305
-import { RemoteAuthorities } from 'vs/base/common/network';
306-
import { getRemoteServerRootPath } from 'vs/platform/remote/common/remoteHosts';
307306
import { TargetPlatform } from 'vs/platform/extensions/common/extensions';
308307

309-
@@ -102,7 +101,7 @@ export abstract class AbstractExtensionR
308+
const WEB_EXTENSION_RESOURCE_END_POINT_SEGMENT = '/web-extension-resource/';
309+
@@ -99,7 +98,7 @@ export abstract class AbstractExtensionR
310310
: version,
311311
path: 'extension'
312312
}));

‎patches/cli-window-open.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTe
1717
===================================================================
1818
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
1919
+++ code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
20-
@@ -104,10 +104,14 @@ class RemoteTerminalBackend extends Base
20+
@@ -106,10 +106,14 @@ class RemoteTerminalBackend extends Base
2121
}
2222
const reqId = e.reqId;
2323
const commandId = e.commandId;

‎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-
@@ -248,6 +248,10 @@ export class Extension implements IExten
10+
@@ -283,6 +283,10 @@ export class Extension implements IExten
1111
if (this.type === ExtensionType.System && this.productService.quality === 'stable') {
1212
return false;
1313
}

‎patches/display-language.diff

+12-12
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Index: code-server/lib/vscode/src/vs/base/common/platform.ts
5353
export const LANGUAGE_DEFAULT = 'en';
5454

5555
let _isWindows = false;
56-
@@ -111,17 +109,21 @@ else if (typeof navigator === 'object' &
56+
@@ -112,17 +110,21 @@ else if (typeof navigator === 'object' &
5757
_isMobile = _userAgent?.indexOf('Mobi') >= 0;
5858
_isWeb = true;
5959

@@ -218,9 +218,9 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
218218
import { isString } from 'vs/base/common/types';
219219
+import { getLocaleFromConfig, getNLSConfiguration } from 'vs/server/node/remoteLanguagePacks';
220220
import { CharCode } from 'vs/base/common/charCode';
221-
import { getRemoteServerRootPath } from 'vs/platform/remote/common/remoteHosts';
222221
import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
223-
@@ -345,6 +346,8 @@ export class WebClientServer {
222+
223+
@@ -347,6 +348,8 @@ export class WebClientServer {
224224
callbackRoute: this._callbackRoute
225225
};
226226

@@ -229,7 +229,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
229229
const nlsBaseUrl = this._productService.extensionsGallery?.nlsBaseUrl;
230230
const values: { [key: string]: string } = {
231231
WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration),
232-
@@ -353,6 +356,7 @@ export class WebClientServer {
232+
@@ -355,6 +358,7 @@ export class WebClientServer {
233233
WORKBENCH_NLS_BASE_URL: vscodeBase + (nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : ''),
234234
BASE: base,
235235
VS_BASE: vscodeBase,
@@ -249,7 +249,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
249249

250250
/* ----- server setup ----- */
251251

252-
@@ -102,6 +103,7 @@ export interface ServerParsedArgs {
252+
@@ -103,6 +104,7 @@ export interface ServerParsedArgs {
253253
'auth'?: string
254254
'disable-file-downloads'?: boolean;
255255
'disable-file-uploads'?: boolean;
@@ -261,7 +261,7 @@ Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
261261
===================================================================
262262
--- code-server.orig/lib/vscode/src/vs/workbench/workbench.web.main.ts
263263
+++ code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
264-
@@ -50,7 +50,7 @@ import 'vs/workbench/services/dialogs/br
264+
@@ -52,7 +52,7 @@ import 'vs/workbench/services/dialogs/br
265265
import 'vs/workbench/services/host/browser/browserHostService';
266266
import 'vs/workbench/services/lifecycle/browser/lifecycleService';
267267
import 'vs/workbench/services/clipboard/browser/clipboardService';
@@ -270,7 +270,7 @@ Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
270270
import 'vs/workbench/services/path/browser/pathService';
271271
import 'vs/workbench/services/themes/browser/browserHostColorSchemeService';
272272
import 'vs/workbench/services/encryption/browser/encryptionService';
273-
@@ -116,8 +116,9 @@ registerSingleton(ILanguagePackService,
273+
@@ -118,8 +118,9 @@ registerSingleton(ILanguagePackService,
274274
// Logs
275275
import 'vs/workbench/contrib/logs/browser/logs.contribution';
276276

@@ -348,7 +348,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
348348
===================================================================
349349
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
350350
+++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
351-
@@ -340,9 +340,6 @@ export class InstallAction extends Exten
351+
@@ -342,9 +342,6 @@ export class InstallAction extends Exten
352352
if (this.extension.isBuiltin) {
353353
return;
354354
}
@@ -358,7 +358,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
358358
if (this.extension.state === ExtensionState.Uninstalled && await this.extensionsWorkbenchService.canInstall(this.extension)) {
359359
this.enabled = this.options.installPreReleaseVersion ? this.extension.hasPreReleaseVersion : this.extension.hasReleaseVersion;
360360
this.updateLabel();
361-
@@ -610,7 +607,7 @@ export abstract class InstallInOtherServ
361+
@@ -615,7 +612,7 @@ export abstract class InstallInOtherServ
362362
}
363363

364364
if (isLanguagePackExtension(this.extension.local.manifest)) {
@@ -367,7 +367,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
367367
}
368368

369369
// Prefers to run on UI
370-
@@ -1782,17 +1779,6 @@ export class SetLanguageAction extends E
370+
@@ -1843,17 +1840,6 @@ export class SetLanguageAction extends E
371371
update(): void {
372372
this.enabled = false;
373373
this.class = SetLanguageAction.DisabledClass;
@@ -385,15 +385,15 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
385385
}
386386

387387
override async run(): Promise<any> {
388-
@@ -1809,7 +1795,6 @@ export class ClearLanguageAction extends
388+
@@ -1870,7 +1856,6 @@ export class ClearLanguageAction extends
389389
private static readonly DisabledClass = `${ClearLanguageAction.EnabledClass} disabled`;
390390

391391
constructor(
392392
- @IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
393393
@ILocaleService private readonly localeService: ILocaleService,
394394
) {
395395
super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false);
396-
@@ -1819,17 +1804,6 @@ export class ClearLanguageAction extends
396+
@@ -1880,17 +1865,6 @@ export class ClearLanguageAction extends
397397
update(): void {
398398
this.enabled = false;
399399
this.class = ClearLanguageAction.DisabledClass;

0 commit comments

Comments
 (0)