Skip to content

Commit 5fe286e

Browse files
benz0libenz0li
authored
Update Code to 1.114.0 (#7735)
1 parent 82fe3a7 commit 5fe286e

16 files changed

+28
-28
lines changed

‎lib/vscode‎

Submodule vscode updated 641 files

‎patches/base-path.diff‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -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-
@@ -246,7 +246,9 @@ export class WebClientServer {
114+
@@ -265,7 +265,9 @@ export class WebClientServer {
115115
};
116116

117117
// Prefix routes with basePath for clients
@@ -122,7 +122,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
122122

123123
const queryConnectionToken = parsedUrl.query[connectionTokenQueryName];
124124
if (typeof queryConnectionToken === 'string') {
125-
@@ -285,10 +287,14 @@ export class WebClientServer {
125+
@@ -304,10 +306,14 @@ export class WebClientServer {
126126
};
127127

128128
const useTestResolver = (!this._environmentService.isBuilt && this._environmentService.args['use-test-resolver']);
@@ -138,15 +138,15 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
138138
);
139139
if (!remoteAuthority) {
140140
return serveError(req, res, 400, `Bad request.`);
141-
@@ -335,6 +341,7 @@ export class WebClientServer {
141+
@@ -354,6 +360,7 @@ export class WebClientServer {
142142

143143
const productConfiguration: Partial<Mutable<IProductConfiguration>> = {
144144
codeServerVersion: this._productService.codeServerVersion,
145145
+ rootEndpoint: rootBase,
146146
embedderIdentifier: 'server-distro',
147147
extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? {
148148
...this._productService.extensionsGallery,
149-
@@ -388,7 +395,9 @@ export class WebClientServer {
149+
@@ -407,7 +414,9 @@ export class WebClientServer {
150150
WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '',
151151
WORKBENCH_WEB_BASE_URL: staticRoute,
152152
WORKBENCH_NLS_URL,
@@ -157,7 +157,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
157157
};
158158

159159
// DEV ---------------------------------------------------------------------------------------
160-
@@ -425,7 +434,7 @@ export class WebClientServer {
160+
@@ -444,7 +453,7 @@ export class WebClientServer {
161161
'default-src \'self\';',
162162
'img-src \'self\' https: data: blob:;',
163163
'media-src \'self\';',
@@ -166,7 +166,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
166166
'child-src \'self\';',
167167
`frame-src 'self' https://*.vscode-cdn.net data:;`,
168168
'worker-src \'self\' data: blob:;',
169-
@@ -498,3 +507,70 @@ export class WebClientServer {
169+
@@ -517,3 +526,70 @@ export class WebClientServer {
170170
return void res.end(data);
171171
}
172172
}

‎patches/clipboard.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/common/argv.ts
7878
===================================================================
7979
--- code-server.orig/lib/vscode/src/vs/platform/environment/common/argv.ts
8080
+++ code-server/lib/vscode/src/vs/platform/environment/common/argv.ts
81-
@@ -143,6 +143,7 @@ export interface NativeParsedArgs {
81+
@@ -144,6 +144,7 @@ export interface NativeParsedArgs {
8282
'disable-chromium-sandbox'?: boolean;
8383
sandbox?: boolean;
8484
'enable-coi'?: boolean;

‎patches/display-language.diff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
1818
import { ProtocolConstants } from '../../base/parts/ipc/common/ipc.net.js';
1919
import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
2020
import { ConfigurationService } from '../../platform/configuration/common/configurationService.js';
21-
@@ -297,6 +297,9 @@ export async function setupServerService
21+
@@ -301,6 +301,9 @@ export async function setupServerService
2222

2323
socketServer.registerChannel('mcpManagement', new McpManagementChannel(mcpManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)));
2424

@@ -161,7 +161,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
161161
import { CharCode } from '../../base/common/charCode.js';
162162
import { IExtensionManifest } from '../../platform/extensions/common/extensions.js';
163163
import { ICSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js';
164-
@@ -386,14 +387,22 @@ export class WebClientServer {
164+
@@ -405,14 +406,22 @@ export class WebClientServer {
165165
};
166166

167167
const cookies = cookie.parse(req.headers.cookie || '');

‎patches/external-file-actions.diff‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
112112
===================================================================
113113
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
114114
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
115-
@@ -370,6 +370,8 @@ export class WebClientServer {
115+
@@ -389,6 +389,8 @@ export class WebClientServer {
116116
serverBasePath: basePath,
117117
webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
118118
userDataPath: this._environmentService.userDataPath,
@@ -230,7 +230,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFi
230230
import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
231231
import { IContextKeyService, IContextKey, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
232232
import { equalsIgnoreCase, format, startsWithIgnoreCase } from '../../../../base/common/strings.js';
233-
@@ -152,7 +152,7 @@ export class SimpleFileDialog extends Di
233+
@@ -161,7 +161,7 @@ export class SimpleFileDialog extends Di
234234
@IFileDialogService private readonly fileDialogService: IFileDialogService,
235235
@IModelService private readonly modelService: IModelService,
236236
@ILanguageService private readonly languageService: ILanguageService,
@@ -239,7 +239,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFi
239239
@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService,
240240
@IPathService protected readonly pathService: IPathService,
241241
@IKeybindingService private readonly keybindingService: IKeybindingService,
242-
@@ -362,21 +362,23 @@ export class SimpleFileDialog extends Di
242+
@@ -392,21 +392,23 @@ export class SimpleFileDialog extends Di
243243
this.filePickBox.placeholder = nls.localize('remoteFileDialog.placeholder', "Folder path");
244244
this.filePickBox.ok = true;
245245
this.filePickBox.okLabel = typeof this.options.openLabel === 'string' ? this.options.openLabel : this.options.openLabel?.withoutMnemonic;

‎patches/getting-started.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
201201
===================================================================
202202
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
203203
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
204-
@@ -374,6 +374,7 @@ export class WebClientServer {
204+
@@ -393,6 +393,7 @@ export class WebClientServer {
205205
userDataPath: this._environmentService.userDataPath,
206206
isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'],
207207
isEnabledFileUploads: !this._environmentService.args['disable-file-uploads'],

‎patches/integration.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
251251
===================================================================
252252
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
253253
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
254-
@@ -334,6 +334,7 @@ export class WebClientServer {
254+
@@ -353,6 +353,7 @@ export class WebClientServer {
255255
} : undefined;
256256

257257
const productConfiguration: Partial<Mutable<IProductConfiguration>> = {

‎patches/local-storage.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
1818
===================================================================
1919
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
2020
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
21-
@@ -365,6 +365,7 @@ export class WebClientServer {
21+
@@ -384,6 +384,7 @@ export class WebClientServer {
2222
remoteAuthority,
2323
serverBasePath: basePath,
2424
webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',

‎patches/logout.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
4040
===================================================================
4141
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
4242
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
43-
@@ -342,6 +342,7 @@ export class WebClientServer {
43+
@@ -361,6 +361,7 @@ export class WebClientServer {
4444
codeServerVersion: this._productService.codeServerVersion,
4545
rootEndpoint: rootBase,
4646
updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined,

‎patches/marketplace.diff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
4141
===================================================================
4242
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
4343
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
44-
@@ -327,7 +327,6 @@ export class WebClientServer {
44+
@@ -346,7 +346,6 @@ export class WebClientServer {
4545

4646
const staticRoute = posix.join(basePath, this._productPath, STATIC_PATH);
4747
const callbackRoute = posix.join(basePath, this._productPath, CALLBACK_PATH);
4848
- const webExtensionRoute = posix.join(basePath, this._productPath, WEB_EXTENSION_PATH);
4949

5050
const resolveWorkspaceURI = (defaultLocation?: string) => defaultLocation && URI.file(resolve(defaultLocation)).with({ scheme: Schemas.vscodeRemote, authority: remoteAuthority });
5151

52-
@@ -343,14 +342,7 @@ export class WebClientServer {
52+
@@ -362,14 +361,7 @@ export class WebClientServer {
5353
codeServerVersion: this._productService.codeServerVersion,
5454
rootEndpoint: rootBase,
5555
embedderIdentifier: 'server-distro',

0 commit comments

Comments
 (0)