Skip to content

Commit 45694d3

Browse files
benz0libenz0li
authored
Update Code to 1.85.0 (#6573)
1 parent d9fe46a commit 45694d3

13 files changed

+88
-118
lines changed

‎lib/vscode

Submodule vscode updated 1238 files

‎patches/base-path.diff

+11-11
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-
@@ -168,7 +168,9 @@ class RemoteAuthoritiesImpl {
13+
@@ -181,7 +181,9 @@ class RemoteAuthoritiesImpl {
1414
return URI.from({
1515
scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource,
1616
authority: `${host}:${port}`,
@@ -99,11 +99,11 @@ Index: code-server/lib/vscode/src/vs/platform/remote/browser/browserSocketFactor
9999
===================================================================
100100
--- code-server.orig/lib/vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
101101
+++ code-server/lib/vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
102-
@@ -280,6 +280,7 @@ export class BrowserSocketFactory implem
102+
@@ -281,6 +281,7 @@ export class BrowserSocketFactory implem
103103
connect({ host, port }: WebSocketRemoteConnection, path: string, query: string, debugLabel: string): Promise<ISocket> {
104104
return new Promise<ISocket>((resolve, reject) => {
105-
const webSocketSchema = (/^https:/.test(window.location.href) ? 'wss' : 'ws');
106-
+ path = (window.location.pathname + "/" + path).replace(/\/\/+/g, "/")
105+
const webSocketSchema = (/^https:/.test(mainWindow.location.href) ? 'wss' : 'ws');
106+
+ path = (mainWindow.location.pathname + "/" + path).replace(/\/\/+/g, "/")
107107
const socket = this._webSocketFactory.create(`${webSocketSchema}://${(/:/.test(host) && !/\[/.test(host)) ? `[${host}]` : host}:${port}${path}?${query}&skipWebSocketFrames=false`, debugLabel);
108108
const errorListener = socket.onError(reject);
109109
socket.onOpen(() => {
@@ -159,16 +159,16 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
159159
};
160160

161161
if (useTestResolver) {
162-
@@ -367,7 +372,7 @@ export class WebClientServer {
162+
@@ -369,7 +374,7 @@ export class WebClientServer {
163163
'default-src \'self\';',
164164
'img-src \'self\' https: data: blob:;',
165165
'media-src \'self\';',
166-
- `script-src 'self' 'unsafe-eval' ${this._getScriptCspHashes(data).join(' ')} 'sha256-fh3TwPMflhsEIpR8g1OYTIMVWhXTLcjQ9kh2tIpmv54=' ${useTestResolver ? '' : `http://${remoteAuthority}`};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
167-
+ `script-src 'self' 'unsafe-eval' ${this._getScriptCspHashes(data).join(' ')} 'sha256-fh3TwPMflhsEIpR8g1OYTIMVWhXTLcjQ9kh2tIpmv54=' ${useTestResolver ? '' : ''};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
166+
- `script-src 'self' 'unsafe-eval' ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' ${useTestResolver ? '' : `http://${remoteAuthority}`};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
167+
+ `script-src 'self' 'unsafe-eval' ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' ${useTestResolver ? '' : ''};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
168168
'child-src \'self\';',
169169
`frame-src 'self' https://*.vscode-cdn.net data:;`,
170170
'worker-src \'self\' data: blob:;',
171-
@@ -440,3 +445,70 @@ export class WebClientServer {
171+
@@ -442,3 +447,70 @@ export class WebClientServer {
172172
return void res.end(data);
173173
}
174174
}
@@ -259,9 +259,9 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
259259
this.startListening();
260260
}
261261

262-
- return URI.parse(window.location.href).with({ path: this._callbackRoute, query: queryParams.join('&') });
263-
+ const path = (window.location.pathname + "/" + this._callbackRoute).replace(/\/\/+/g, "/");
264-
+ return URI.parse(window.location.href).with({ path: path, query: queryParams.join('&') });
262+
- return URI.parse(mainWindow.location.href).with({ path: this._callbackRoute, query: queryParams.join('&') });
263+
+ const path = (mainWindow.location.pathname + "/" + this._callbackRoute).replace(/\/\/+/g, "/");
264+
+ return URI.parse(mainWindow.location.href).with({ path: path, query: queryParams.join('&') });
265265
}
266266

267267
private startListening(): void {

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

‎patches/display-language.diff

+11-15
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-
@@ -90,17 +88,21 @@ if (typeof navigator === 'object' && !is
56+
@@ -85,17 +83,21 @@ if (typeof navigator === 'object' && !is
5757
_isMobile = _userAgent?.indexOf('Mobi') >= 0;
5858
_isWeb = true;
5959

@@ -98,10 +98,10 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.html
9898
<!-- Workbench Icon/Manifest/CSS -->
9999
<link rel="icon" href="{{BASE}}/_static/src/browser/media/favicon-dark-support.svg" />
100100
<link rel="alternate icon" href="{{BASE}}/_static/src/browser/media/favicon.ico" type="image/x-icon" />
101-
@@ -48,15 +51,26 @@
101+
@@ -48,15 +51,27 @@
102102
// Normalize locale to lowercase because translationServiceUrl is case-sensitive.
103103
// ref: https://github.com/microsoft/vscode/issues/187795
104-
const locale = window.localStorage.getItem('vscode.nls.locale') || navigator.language.toLowerCase();
104+
const locale = localStorage.getItem('vscode.nls.locale') || navigator.language.toLowerCase();
105105
- if (!locale.startsWith('en')) {
106106
- nlsConfig['vs/nls'] = {
107107
- availableLanguages: {
@@ -110,7 +110,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.html
110110
- translationServiceUrl: '{{WORKBENCH_NLS_BASE_URL}}'
111111
- };
112112
- }
113-
-
113+
114114
+ try {
115115
+ nlsConfig['vs/nls'] = JSON.parse(document.getElementById("vscode-remote-nls-configuration").getAttribute("data-settings"))
116116
+ if (nlsConfig['vs/nls']._resolvedLanguagePackCoreLocation) {
@@ -241,26 +241,22 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
241241
===================================================================
242242
--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
243243
+++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
244-
@@ -17,8 +17,9 @@ export const serverOptions: OptionDescri
245-
'disable-update-check': { type: 'boolean' },
244+
@@ -18,6 +18,7 @@ export const serverOptions: OptionDescri
246245
'auth': { type: 'string' },
247246
'disable-file-downloads': { type: 'boolean' },
248-
'disable-file-uploads': { type: 'boolean' },
247+
'disable-file-uploads': { type: 'boolean' },
249248
+ 'locale': { type: 'string' },
250249

251250
/* ----- server setup ----- */
252251

253-
'host': { type: 'string', cat: 'o', args: 'ip-address', description: nls.localize('host', "The host name or IP address the server should listen to. If not set, defaults to 'localhost'.") },
254-
@@ -100,8 +100,9 @@ export interface ServerParsedArgs {
255-
'disable-update-check'?: boolean;
252+
@@ -101,6 +102,7 @@ export interface ServerParsedArgs {
256253
'auth'?: string
257254
'disable-file-downloads'?: boolean;
258-
'disable-file-uploads'?: boolean;
255+
'disable-file-uploads'?: boolean;
259256
+ 'locale'?: string
260257

261258
/* ----- server setup ----- */
262259

263-
host?: string;
264260
Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
265261
===================================================================
266262
--- code-server.orig/lib/vscode/src/vs/workbench/workbench.web.main.ts
@@ -371,7 +367,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
371367
}
372368

373369
// Prefers to run on UI
374-
@@ -1684,17 +1681,6 @@ export class SetLanguageAction extends E
370+
@@ -1751,17 +1748,6 @@ export class SetLanguageAction extends E
375371
update(): void {
376372
this.enabled = false;
377373
this.class = SetLanguageAction.DisabledClass;
@@ -389,15 +385,15 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
389385
}
390386

391387
override async run(): Promise<any> {
392-
@@ -1711,7 +1697,6 @@ export class ClearLanguageAction extends
388+
@@ -1778,7 +1764,6 @@ export class ClearLanguageAction extends
393389
private static readonly DisabledClass = `${ClearLanguageAction.EnabledClass} disabled`;
394390

395391
constructor(
396392
- @IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
397393
@ILocaleService private readonly localeService: ILocaleService,
398394
) {
399395
super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false);
400-
@@ -1721,17 +1706,6 @@ export class ClearLanguageAction extends
396+
@@ -1788,17 +1773,6 @@ export class ClearLanguageAction extends
401397
update(): void {
402398
this.enabled = false;
403399
this.class = ClearLanguageAction.DisabledClass;

0 commit comments

Comments
 (0)