Skip to content

Commit 71ff747

Browse files
code-ashercode-asher
authored
Update Code to 1.75.0 (#6004)
* 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. * Remove workspace trust test Something in how/when Code displays the trust dialog appears to have changed, failing the test. I am not sure it makes sense for us to be testing upstream code anyway. * Use regular Node for watch Since we spawn the watch script with ts-node it was using ts-node for the web server spawn as well. With latest Code there are for some reason type errors (it cannot find @types/node) but this is already compiled code which already passed type checks; any type errors here are useless. To fix spawn with regular Node. * Fix some workers not loading
1 parent e5a2537 commit 71ff747

14 files changed

+60
-77
lines changed

‎ci/dev/watch.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { spawn, fork, ChildProcess } from "child_process"
1+
import { spawn, ChildProcess } from "child_process"
22
import * as path from "path"
33
import { onLine, OnLineCallback } from "../../src/node/util"
44

@@ -30,7 +30,7 @@ class Watcher {
3030

3131
// Pass CLI args, save for `node` and the initial script name.
3232
const args = process.argv.slice(2)
33-
this.webServer = fork(path.join(this.rootPath, "out/node/entry.js"), args)
33+
this.webServer = spawn("node", [path.join(this.rootPath, "out/node/entry.js"), ...args])
3434
const { pid } = this.webServer
3535

3636
this.webServer.on("exit", () => console.log("[Code Server]", `Web process ${pid} exited`))

‎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

0 commit comments

Comments
 (0)