Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 13ca0e4

Browse filesBrowse files
benz0libenz0li
authored
Update Code to 1.112.0 (coder#7711)
1 parent b7c7a62 commit 13ca0e4
Copy full SHA for 13ca0e4

18 files changed

+34-34Lines changed: 34 additions & 34 deletions
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎lib/vscode‎

Copy file name to clipboard
Submodule vscode updated 1022 files
Collapse file

‎patches/base-path.diff‎

Copy file name to clipboardExpand all lines: patches/base-path.diff
+7-7Lines changed: 7 additions & 7 deletions
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-
@@ -242,7 +242,9 @@ class RemoteAuthoritiesImpl {
13+
@@ -245,7 +245,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-
@@ -245,7 +245,9 @@ export class WebClientServer {
114+
@@ -246,7 +246,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-
@@ -284,10 +286,14 @@ export class WebClientServer {
125+
@@ -285,10 +287,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-
@@ -334,6 +340,7 @@ export class WebClientServer {
141+
@@ -335,6 +341,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-
@@ -387,7 +394,9 @@ export class WebClientServer {
149+
@@ -388,7 +395,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-
@@ -424,7 +433,7 @@ export class WebClientServer {
160+
@@ -425,7 +434,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-
@@ -497,3 +506,70 @@ export class WebClientServer {
169+
@@ -498,3 +507,70 @@ export class WebClientServer {
170170
return void res.end(data);
171171
}
172172
}
Collapse file

‎patches/clipboard.diff‎

Copy file name to clipboardExpand all lines: patches/clipboard.diff
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostCLIServer.ts
3939
+export type PipeCommand = OpenCommandPipeArgs | StatusPipeArgs | OpenExternalCommandPipeArgs | ExtensionManagementPipeArgs | ClipboardPipeArgs;
4040

4141
export interface ICommandsExecuter {
42-
executeCommand<T>(id: string, ...args: any[]): Promise<T>;
42+
executeCommand<T>(id: string, ...args: unknown[]): Promise<T>;
4343
@@ -110,6 +115,9 @@ export class CLIServerBase {
4444
case 'extensionManagement':
4545
returnObj = await this.manageExtensions(data);
@@ -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-
@@ -138,6 +138,7 @@ export interface NativeParsedArgs {
81+
@@ -139,6 +139,7 @@ export interface NativeParsedArgs {
8282
'disable-chromium-sandbox'?: boolean;
8383
sandbox?: boolean;
8484
'enable-coi'?: boolean;
Collapse file

‎patches/display-language.diff‎

Copy file name to clipboardExpand all lines: patches/display-language.diff
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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-
@@ -385,14 +386,22 @@ export class WebClientServer {
164+
@@ -386,14 +387,22 @@ export class WebClientServer {
165165
};
166166

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

‎patches/external-file-actions.diff‎

Copy file name to clipboardExpand all lines: patches/external-file-actions.diff
+2-2Lines changed: 2 additions & 2 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-
@@ -369,6 +369,8 @@ export class WebClientServer {
115+
@@ -370,6 +370,8 @@ export class WebClientServer {
116116
serverBasePath: basePath,
117117
webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
118118
userDataPath: this._environmentService.userDataPath,
@@ -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-
@@ -311,21 +311,23 @@ export class SimpleFileDialog extends Di
242+
@@ -322,21 +322,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;
Collapse file

‎patches/fix-build.diff‎

Copy file name to clipboardExpand all lines: patches/fix-build.diff
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/ch
1414
===================================================================
1515
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEditor.ts
1616
+++ code-server/lib/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEditor.ts
17-
@@ -303,7 +303,7 @@ export class ChatDebugEditor extends Edi
17+
@@ -299,7 +299,7 @@ export class ChatDebugEditor extends Edi
1818
}
1919
}
2020

Collapse file

‎patches/getting-started.diff‎

Copy file name to clipboardExpand all lines: patches/getting-started.diff
+1-1Lines 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-
@@ -373,6 +373,7 @@ export class WebClientServer {
204+
@@ -374,6 +374,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'],
Collapse file

‎patches/integration.diff‎

Copy file name to clipboardExpand all lines: patches/integration.diff
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,15 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
164164
===================================================================
165165
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.main.ts
166166
+++ code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
167-
@@ -64,6 +64,7 @@ import { IOpenerService } from '../../pl
167+
@@ -65,6 +65,7 @@ import { IOpenerService } from '../../pl
168168
import { mixin, safeStringify } from '../../base/common/objects.js';
169169
import { IndexedDB } from '../../base/browser/indexedDB.js';
170170
import { WebFileSystemAccess } from '../../platform/files/browser/webFileSystemAccess.js';
171171
+import { CodeServerClient } from '../../workbench/browser/client.js';
172172
import { IProgressService } from '../../platform/progress/common/progress.js';
173173
import { DelayedLogChannel } from '../services/output/common/delayedLogChannel.js';
174174
import { dirname, joinPath } from '../../base/common/resources.js';
175-
@@ -133,6 +134,9 @@ export class BrowserMain extends Disposa
175+
@@ -140,6 +141,9 @@ export class BrowserMain extends Disposa
176176
// Startup
177177
const instantiationService = workbench.startup();
178178

@@ -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-
@@ -333,6 +333,7 @@ export class WebClientServer {
254+
@@ -334,6 +334,7 @@ export class WebClientServer {
255255
} : undefined;
256256

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

‎patches/local-storage.diff‎

Copy file name to clipboardExpand all lines: patches/local-storage.diff
+3-3Lines changed: 3 additions & 3 deletions
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-
@@ -364,6 +364,7 @@ export class WebClientServer {
21+
@@ -365,6 +365,7 @@ export class WebClientServer {
2222
remoteAuthority,
2323
serverBasePath: basePath,
2424
webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
@@ -66,7 +66,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/configuration/browser/co
6666
===================================================================
6767
--- code-server.orig/lib/vscode/src/vs/workbench/services/configuration/browser/configurationService.ts
6868
+++ code-server/lib/vscode/src/vs/workbench/services/configuration/browser/configurationService.ts
69-
@@ -146,8 +146,10 @@ export class WorkspaceService extends Di
69+
@@ -148,8 +148,10 @@ export class WorkspaceService extends Di
7070
this.workspaceConfiguration = this._register(new WorkspaceConfiguration(configurationCache, fileService, uriIdentityService, logService));
7171
this._register(this.workspaceConfiguration.onDidUpdateConfiguration(fromCache => {
7272
this.onWorkspaceConfigurationChanged(fromCache).then(() => {
@@ -79,7 +79,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/configuration/browser/co
7979
});
8080
}));
8181

82-
@@ -559,6 +561,12 @@ export class WorkspaceService extends Di
82+
@@ -561,6 +563,12 @@ export class WorkspaceService extends Di
8383
previousFolders = this.workspace.folders;
8484
this.workspace.update(workspace);
8585
} else {
Collapse file

‎patches/logout.diff‎

Copy file name to clipboardExpand all lines: patches/logout.diff
+1-1Lines 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-
@@ -341,6 +341,7 @@ export class WebClientServer {
43+
@@ -342,6 +342,7 @@ export class WebClientServer {
4444
codeServerVersion: this._productService.codeServerVersion,
4545
rootEndpoint: rootBase,
4646
updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined,

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.