Skip to content

Commit 57d0606

Browse files
committed
fixup!: refresh patches
1 parent dc6369d commit 57d0606

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

patches/display-language.diff

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
66
===================================================================
77
--- code-server.orig/lib/vscode/src/vs/server/node/serverServices.ts
88
+++ code-server/lib/vscode/src/vs/server/node/serverServices.ts
9-
@@ -198,6 +198,9 @@ export async function setupServerService
9+
@@ -188,6 +188,9 @@ export async function setupServerService
1010
const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority));
1111
socketServer.registerChannel('extensions', channel);
1212

@@ -20,7 +20,7 @@ Index: code-server/lib/vscode/src/vs/base/common/platform.ts
2020
===================================================================
2121
--- code-server.orig/lib/vscode/src/vs/base/common/platform.ts
2222
+++ code-server/lib/vscode/src/vs/base/common/platform.ts
23-
@@ -83,6 +83,17 @@ if (typeof navigator === 'object' && !is
23+
@@ -84,6 +84,17 @@ if (typeof navigator === 'object' && !is
2424
_isWeb = true;
2525
_locale = navigator.language;
2626
_language = _locale;
@@ -185,7 +185,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
185185
const data = (await util.promisify(fs.readFile)(filePath)).toString()
186186
.replace('{{WORKBENCH_WEB_CONFIGURATION}}', escapeAttribute(JSON.stringify({
187187
remoteAuthority,
188-
@@ -301,7 +304,8 @@ export class WebClientServer {
188+
@@ -302,7 +305,8 @@ export class WebClientServer {
189189
})))
190190
.replace('{{WORKBENCH_AUTH_SESSION}}', () => authSessionInfo ? escapeAttribute(JSON.stringify(authSessionInfo)) : '')
191191
.replace(/{{BASE}}/g, base)
@@ -252,7 +252,7 @@ Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
252252
===================================================================
253253
--- code-server.orig/lib/vscode/src/vs/workbench/workbench.web.main.ts
254254
+++ code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
255-
@@ -109,6 +109,10 @@ registerSingleton(ICustomEndpointTelemet
255+
@@ -111,6 +111,10 @@ registerSingleton(IDiagnosticsService, N
256256

257257
//#region --- workbench contributions
258258

patches/proposed-api.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/common/abstra
99
===================================================================
1010
--- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
1111
+++ code-server/lib/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
12-
@@ -1134,7 +1134,7 @@ class ProposedApiController {
12+
@@ -1163,7 +1163,7 @@ class ProposedApiController {
1313

1414
this._envEnabledExtensions = new Set((_environmentService.extensionEnabledProposedApi ?? []).map(id => ExtensionIdentifier.toKey(id)));
1515

@@ -22,7 +22,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/common/extens
2222
===================================================================
2323
--- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/common/extensions.ts
2424
+++ code-server/lib/vscode/src/vs/workbench/services/extensions/common/extensions.ts
25-
@@ -135,10 +135,7 @@ export interface IExtensionHost {
25+
@@ -134,10 +134,7 @@ export interface IExtensionHost {
2626
}
2727

2828
export function isProposedApiEnabled(extension: IExtensionDescription, proposal: ApiProposalName): boolean {

0 commit comments

Comments
 (0)