Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b49c021

Browse files
code-ashercode-asher
committedFeb 7, 2023
Update Code to 1.75.0
- getting-started.diff: The way to get an icon's class changed - proxy-uri.diff: The product service is passed in so we can get the proxy URI from that now instead of passing it in separately.
1 parent e5a2537 commit b49c021

12 files changed

+49
-62
lines changed
 

‎lib/vscode

Submodule vscode updated 1824 files

‎patches/base-path.diff

Lines changed: 1 addition & 1 deletion
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-
@@ -162,7 +162,9 @@ class RemoteAuthoritiesImpl {
13+
@@ -166,7 +166,9 @@ class RemoteAuthoritiesImpl {
1414
return URI.from({
1515
scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource,
1616
authority: `${host}:${port}`,

‎patches/disable-builtin-ext-update.diff

Lines changed: 1 addition & 1 deletion
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-
@@ -237,6 +237,10 @@ export class Extension implements IExten
10+
@@ -243,6 +243,10 @@ export class Extension implements IExten
1111
if (this.type === ExtensionType.System && this.productService.quality === 'stable') {
1212
return false;
1313
}

‎patches/disable-downloads.diff

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
1212
===================================================================
1313
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
1414
+++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
15-
@@ -264,6 +264,11 @@ export interface IWorkbenchConstructionO
15+
@@ -266,6 +266,11 @@ export interface IWorkbenchConstructionO
1616
*/
1717
readonly userDataPath?: string
1818

@@ -23,7 +23,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
2323
+
2424
//#endregion
2525

26-
26+
//#region Profile options
2727
Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
2828
===================================================================
2929
--- code-server.orig/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
@@ -40,7 +40,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
4040
}
4141

4242
export class BrowserWorkbenchEnvironmentService implements IBrowserWorkbenchEnvironmentService {
43-
@@ -87,6 +92,13 @@ export class BrowserWorkbenchEnvironment
43+
@@ -104,6 +109,13 @@ export class BrowserWorkbenchEnvironment
4444
return this.options.userDataPath;
4545
}
4646

@@ -143,8 +143,8 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions
143143
+import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, IsEnabledFileDownloads } from 'vs/workbench/common/contextkeys';
144144
import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
145145
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
146-
import { ThemeIcon } from 'vs/platform/theme/common/themeService';
147-
@@ -483,13 +483,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo
146+
import { ThemeIcon } from 'vs/base/common/themables';
147+
@@ -484,13 +484,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo
148148
id: DOWNLOAD_COMMAND_ID,
149149
title: DOWNLOAD_LABEL
150150
},

‎patches/display-language.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
1919
===================================================================
2020
--- code-server.orig/lib/vscode/src/vs/server/node/serverServices.ts
2121
+++ code-server/lib/vscode/src/vs/server/node/serverServices.ts
22-
@@ -216,6 +216,9 @@ export async function setupServerService
22+
@@ -220,6 +220,9 @@ export async function setupServerService
2323
const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority));
2424
socketServer.registerChannel('extensions', channel);
2525

‎patches/getting-started.diff

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
1010
===================================================================
1111
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
1212
+++ code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
13-
@@ -59,7 +59,7 @@ import { GettingStartedIndexList } from
13+
@@ -60,7 +60,7 @@ import { GettingStartedIndexList } from
1414
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
1515
import { KeyCode } from 'vs/base/common/keyCodes';
1616
import { getTelemetryLevel } from 'vs/platform/telemetry/common/telemetryUtils';
@@ -19,7 +19,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
1919
import { OpenFolderViaWorkspaceAction } from 'vs/workbench/browser/actions/workspaceActions';
2020
import { OpenRecentAction } from 'vs/workbench/browser/actions/windowActions';
2121
import { Toggle } from 'vs/base/browser/ui/toggle/toggle';
22-
@@ -756,6 +756,72 @@ export class GettingStartedPage extends
22+
@@ -759,6 +759,72 @@ export class GettingStartedPage extends
2323
$('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved"))
2424
);
2525

@@ -72,7 +72,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
7272
+ 'align-items: center',
7373
+ ].join(';'),
7474
+ }, 'Get started ', $('span', {
75-
+ class: Codicon.arrowRight.classNames,
75+
+ class: ThemeIcon.asClassName(Codicon.arrowRight),
7676
+ style: [
7777
+ 'color: white',
7878
+ 'margin-left: 8px',
@@ -92,7 +92,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
9292

9393
const leftColumn = $('.categories-column.categories-column-left', {},);
9494
const rightColumn = $('.categories-column.categories-column-right', {},);
95-
@@ -773,13 +839,23 @@ export class GettingStartedPage extends
95+
@@ -776,13 +842,23 @@ export class GettingStartedPage extends
9696
const layoutLists = () => {
9797
if (gettingStartedList.itemCount) {
9898
this.container.classList.remove('noWalkthroughs');
@@ -143,7 +143,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
143143
===================================================================
144144
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
145145
+++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
146-
@@ -269,6 +269,11 @@ export interface IWorkbenchConstructionO
146+
@@ -271,6 +271,11 @@ export interface IWorkbenchConstructionO
147147
*/
148148
readonly isEnabledFileDownloads?: boolean
149149

@@ -154,7 +154,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
154154
+
155155
//#endregion
156156

157-
157+
//#region Profile options
158158
Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
159159
===================================================================
160160
--- code-server.orig/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
@@ -171,7 +171,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
171171
}
172172

173173
export class BrowserWorkbenchEnvironmentService implements IBrowserWorkbenchEnvironmentService {
174-
@@ -99,6 +104,13 @@ export class BrowserWorkbenchEnvironment
174+
@@ -116,6 +121,13 @@ export class BrowserWorkbenchEnvironment
175175
return this.options.isEnabledFileDownloads;
176176
}
177177

‎patches/integration.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Index: code-server/lib/vscode/src/vs/base/common/processes.ts
9595
--- code-server.orig/lib/vscode/src/vs/base/common/processes.ts
9696
+++ code-server/lib/vscode/src/vs/base/common/processes.ts
9797
@@ -111,6 +111,8 @@ export function sanitizeProcessEnvironme
98-
/^VSCODE_(?!SHELL_LOGIN).+$/,
98+
/^VSCODE_(?!(PORTABLE|SHELL_LOGIN)).+$/,
9999
/^SNAP(|_.*)$/,
100100
/^GDK_PIXBUF_.+$/,
101101
+ /^CODE_SERVER_.+$/,
@@ -184,7 +184,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
184184
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
185185
import { IProgressService } from 'vs/platform/progress/common/progress';
186186
import { DelayedLogChannel } from 'vs/workbench/services/output/common/delayedLogChannel';
187-
@@ -118,6 +119,9 @@ export class BrowserMain extends Disposa
187+
@@ -119,6 +120,9 @@ export class BrowserMain extends Disposa
188188
// Startup
189189
const instantiationService = workbench.startup();
190190

‎patches/local-storage.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
3232
===================================================================
3333
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
3434
+++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
35-
@@ -259,6 +259,11 @@ export interface IWorkbenchConstructionO
35+
@@ -261,6 +261,11 @@ export interface IWorkbenchConstructionO
3636
*/
3737
readonly configurationDefaults?: Record<string, any>;
3838

@@ -43,12 +43,12 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
4343
+
4444
//#endregion
4545

46-
46+
//#region Profile options
4747
Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
4848
===================================================================
4949
--- code-server.orig/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
5050
+++ code-server/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
51-
@@ -78,7 +78,14 @@ export class BrowserWorkbenchEnvironment
51+
@@ -95,7 +95,14 @@ export class BrowserWorkbenchEnvironment
5252
get logFile(): URI { return joinPath(this.windowLogsPath, 'window.log'); }
5353

5454
@memoize

‎patches/proposed-api.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/common/abstra
1010
===================================================================
1111
--- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
1212
+++ code-server/lib/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
13-
@@ -1482,7 +1482,7 @@ class ProposedApiController {
13+
@@ -1486,7 +1486,7 @@ class ProposedApiController {
1414

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

‎patches/proxy-uri.diff

Lines changed: 19 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -42,31 +42,31 @@ Index: code-server/lib/vscode/src/vs/platform/remote/browser/remoteAuthorityReso
4242
===================================================================
4343
--- code-server.orig/lib/vscode/src/vs/platform/remote/browser/remoteAuthorityResolverService.ts
4444
+++ code-server/lib/vscode/src/vs/platform/remote/browser/remoteAuthorityResolverService.ts
45-
@@ -8,7 +8,7 @@ import { Disposable } from 'vs/base/comm
46-
import { RemoteAuthorities } from 'vs/base/common/network';
45+
@@ -11,7 +11,7 @@ import { StopWatch } from 'vs/base/commo
4746
import { URI } from 'vs/base/common/uri';
47+
import { ILogService } from 'vs/platform/log/common/log';
4848
import { IProductService } from 'vs/platform/product/common/productService';
49-
-import { IRemoteAuthorityResolverService, IRemoteConnectionData, ResolvedAuthority, ResolverResult } from 'vs/platform/remote/common/remoteAuthorityResolver';
50-
+import { IRemoteAuthorityResolverService, IRemoteConnectionData, ResolvedAuthority, ResolvedOptions, ResolverResult } from 'vs/platform/remote/common/remoteAuthorityResolver';
49+
-import { IRemoteAuthorityResolverService, IRemoteConnectionData, ResolvedAuthority, ResolverResult, getRemoteAuthorityPrefix } from 'vs/platform/remote/common/remoteAuthorityResolver';
50+
+import { IRemoteAuthorityResolverService, IRemoteConnectionData, ResolvedAuthority, ResolvedOptions, ResolverResult, getRemoteAuthorityPrefix } from 'vs/platform/remote/common/remoteAuthorityResolver';
5151
import { getRemoteServerRootPath, parseAuthorityWithOptionalPort } from 'vs/platform/remote/common/remoteHosts';
5252

5353
export class RemoteAuthorityResolverService extends Disposable implements IRemoteAuthorityResolverService {
54-
@@ -23,7 +23,7 @@ export class RemoteAuthorityResolverServ
55-
private readonly _connectionToken: Promise<string> | string | undefined;
56-
private readonly _connectionTokens: Map<string, string>;
57-
58-
- constructor(@IProductService productService: IProductService, connectionToken: Promise<string> | string | undefined, resourceUriProvider: ((uri: URI) => URI) | undefined) {
59-
+ constructor(@IProductService productService: IProductService, connectionToken: Promise<string> | string | undefined, resourceUriProvider: ((uri: URI) => URI) | undefined, private readonly proxyEndpointTemplate?: string) {
54+
@@ -29,7 +29,7 @@ export class RemoteAuthorityResolverServ
55+
constructor(
56+
connectionToken: Promise<string> | string | undefined,
57+
resourceUriProvider: ((uri: URI) => URI) | undefined,
58+
- @IProductService productService: IProductService,
59+
+ @IProductService private readonly productService: IProductService,
60+
@ILogService private readonly _logService: ILogService,
61+
) {
6062
super();
61-
this._connectionToken = connectionToken;
62-
this._connectionTokens = new Map<string, string>();
63-
@@ -61,9 +61,14 @@ export class RemoteAuthorityResolverServ
64-
65-
private async _doResolveAuthority(authority: string): Promise<ResolverResult> {
63+
@@ -75,9 +75,14 @@ export class RemoteAuthorityResolverServ
6664
const connectionToken = await Promise.resolve(this._connectionTokens.get(authority) || this._connectionToken);
65+
performance.mark(`code/didResolveConnectionToken/${authorityPrefix}`);
66+
this._logService.info(`Resolved connection token (${authorityPrefix}) after ${sw.elapsed()} ms`);
6767
+ let options: ResolvedOptions | undefined;
68-
+ if (this.proxyEndpointTemplate) {
69-
+ const proxyUrl = new URL(this.proxyEndpointTemplate, window.location.href);
68+
+ if (this.productService.proxyEndpointTemplate) {
69+
+ const proxyUrl = new URL(this.productService.proxyEndpointTemplate, window.location.href);
7070
+ options = { extensionHostEnv: { VSCODE_PROXY_URI: decodeURIComponent(proxyUrl.toString()) }}
7171
+ }
7272
const defaultPort = (/^https:/.test(window.location.href) ? 443 : 80);
@@ -88,24 +88,11 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
8888
embedderIdentifier: 'server-distro',
8989
extensionsGallery: this._productService.extensionsGallery,
9090
},
91-
Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
92-
===================================================================
93-
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.main.ts
94-
+++ code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
95-
@@ -247,7 +247,7 @@ export class BrowserMain extends Disposa
96-
97-
// Remote
98-
const connectionToken = environmentService.options.connectionToken || getCookieValue(connectionTokenCookieName);
99-
- const remoteAuthorityResolverService = new RemoteAuthorityResolverService(productService, connectionToken, this.configuration.resourceUriProvider);
100-
+ const remoteAuthorityResolverService = new RemoteAuthorityResolverService(productService, connectionToken, this.configuration.resourceUriProvider, this.configuration.productConfiguration?.proxyEndpointTemplate);
101-
serviceCollection.set(IRemoteAuthorityResolverService, remoteAuthorityResolverService);
102-
103-
// Signing
10491
Index: code-server/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
10592
===================================================================
10693
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
10794
+++ code-server/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
108-
@@ -381,7 +381,7 @@ export async function createTerminalEnvi
95+
@@ -383,7 +383,7 @@ export async function createTerminalEnvi
10996

11097
// Sanitize the environment, removing any undesirable VS Code and Electron environment
11198
// variables
@@ -170,7 +157,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/remote/browser/remoteExpl
170157
===================================================================
171158
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
172159
+++ code-server/lib/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
173-
@@ -73,7 +73,7 @@ export class ForwardedPortsView extends
160+
@@ -73,7 +73,7 @@ export class ForwardedPortsView extends
174161
this.contextKeyListener = undefined;
175162
}
176163

‎patches/telemetry.diff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
1212
===================================================================
1313
--- code-server.orig/lib/vscode/src/vs/server/node/serverServices.ts
1414
+++ code-server/lib/vscode/src/vs/server/node/serverServices.ts
15-
@@ -71,6 +71,7 @@ import { IExtensionsScannerService } fro
15+
@@ -70,6 +70,7 @@ import { IExtensionsScannerService } fro
1616
import { ExtensionsScannerService } from 'vs/server/node/extensionsScannerService';
17-
import { ExtensionsProfileScannerService, IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
18-
import { IUserDataProfilesService, UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
17+
import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
18+
import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
1919
+import { TelemetryClient } from "vs/server/node/telemetryClient";
2020
import { NullPolicyService } from 'vs/platform/policy/common/policy';
2121
import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
2222
import { LoggerService } from 'vs/platform/log/node/loggerService';
23-
@@ -139,10 +140,13 @@ export async function setupServerService
23+
@@ -142,10 +143,13 @@ export async function setupServerService
2424
const machineId = await getMachineId();
2525
const isInternal = isInternalTelemetry(productService, configurationService);
2626
if (supportsTelemetry(productService, environmentService)) {

‎patches/webview.diff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
4141
===================================================================
4242
--- code-server.orig/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
4343
+++ code-server/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
44-
@@ -207,7 +207,7 @@ export class BrowserWorkbenchEnvironment
44+
@@ -224,7 +224,7 @@ export class BrowserWorkbenchEnvironment
4545

4646
@memoize
4747
get webviewExternalEndpoint(): string {
@@ -70,8 +70,8 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index
7070
<meta charset="UTF-8">
7171

7272
<meta http-equiv="Content-Security-Policy"
73-
- content="default-src 'none'; script-src 'sha256-6s2fEapj0jmA7ZDjzz23Uv4xLlM7KX3p9DYidJX7Zmk=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
74-
+ content="default-src 'none'; script-src 'sha256-6/HBKMr5Cr24xXtQ+U/BxvVfCvBLYE55u8Jq3j/nzcI=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
73+
- content="default-src 'none'; script-src 'sha256-RaCvj6SRgHm+2C3LKzSAamDwa3Bp4u4iQ1Y2Sm+97tE=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
74+
+ content="default-src 'none'; script-src 'sha256-mi72idjvdhsPSBMKFqU82FG/kZVJjKR0TfHLE13gB+w=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
7575

7676
<!-- Disable pinch zooming -->
7777
<meta name="viewport"
@@ -92,7 +92,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index
9292
===================================================================
9393
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
9494
+++ code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
95-
@@ -318,6 +318,12 @@
95+
@@ -322,6 +322,12 @@
9696

9797
const hostname = location.hostname;
9898

0 commit comments

Comments
 (0)
Please sign in to comment.