From 174b7757a53f5e8102564da28ac1deb7cb0bf477 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Thu, 21 May 2026 04:20:27 +1000 Subject: [PATCH] Update VS Code to 1.121.0 (#7805) --- CHANGELOG.md | 6 ++++++ ci/build/update-vscode.sh | 2 +- lib/vscode | 2 +- patches/clipboard.diff | 2 +- patches/display-language.diff | 4 ++-- patches/external-file-actions.diff | 2 +- patches/getting-started.diff | 6 +++--- patches/logout.diff | 2 +- patches/telemetry.diff | 2 +- patches/trusted-domains.diff | 2 +- patches/update-check.diff | 2 +- 11 files changed, 19 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71ea8cbfc..c13b11fb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.121.0 + +### Changed + +- Update to Code 1.121.0 + ## [4.119.0](https://github.com/coder/code-server/releases/tag/v4.119.0) - 2026-05-07 Code v1.119.0 diff --git a/ci/build/update-vscode.sh b/ci/build/update-vscode.sh index 542a5a497..d31b15979 100755 --- a/ci/build/update-vscode.sh +++ b/ci/build/update-vscode.sh @@ -19,7 +19,7 @@ function update_vscode() { pushd lib/vscode if ! git checkout 2>&1 "$target_vscode_version" ; then echo "$target_vscode_version does not exist locally, fetching..." - git fetch --all --prune + git fetch --all --prune --tags echo "Checking out $target_vscode_version again..." git checkout "$target_vscode_version" fi diff --git a/lib/vscode b/lib/vscode index 0958016b2..987c95975 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 0958016b2af9f09bb4257e0df4a95e2f90590f9f +Subproject commit 987c9597516278c9fcf10d963a0592ce1384ab93 diff --git a/patches/clipboard.diff b/patches/clipboard.diff index 7f64d1709..d4658b231 100644 --- a/patches/clipboard.diff +++ b/patches/clipboard.diff @@ -78,7 +78,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/common/argv.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/platform/environment/common/argv.ts +++ code-server/lib/vscode/src/vs/platform/environment/common/argv.ts -@@ -148,6 +148,7 @@ export interface NativeParsedArgs { +@@ -146,6 +146,7 @@ export interface NativeParsedArgs { 'disable-chromium-sandbox'?: boolean; sandbox?: boolean; 'enable-coi'?: boolean; diff --git a/patches/display-language.diff b/patches/display-language.diff index e22e954ee..1517e8eb4 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts import { ProtocolConstants } from '../../base/parts/ipc/common/ipc.net.js'; import { IConfigurationService } from '../../platform/configuration/common/configuration.js'; import { ConfigurationService } from '../../platform/configuration/common/configurationService.js'; -@@ -301,6 +301,9 @@ export async function setupServerService +@@ -358,6 +358,9 @@ export async function setupServerService socketServer.registerChannel('mcpManagement', new McpManagementChannel(mcpManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority))); @@ -198,7 +198,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ -@@ -116,6 +117,7 @@ export interface ServerParsedArgs { +@@ -120,6 +121,7 @@ export interface ServerParsedArgs { 'disable-file-downloads'?: boolean; 'disable-file-uploads'?: boolean; 'disable-getting-started-override'?: boolean, diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index fcfc0b84e..582384af6 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -99,7 +99,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ -@@ -110,6 +112,8 @@ export interface ServerParsedArgs { +@@ -114,6 +116,8 @@ export interface ServerParsedArgs { /* ----- code-server ----- */ 'disable-update-check'?: boolean; 'auth'?: string; diff --git a/patches/getting-started.diff b/patches/getting-started.diff index 73f4188d4..7135955f6 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro import { IEditorOpenContext, IEditorSerializer } from '../../../common/editor.js'; import { IWebviewElement, IWebviewService } from '../../webview/browser/webview.js'; import './gettingStartedColors.js'; -@@ -927,6 +927,72 @@ export class GettingStartedPage extends +@@ -928,6 +928,72 @@ export class GettingStartedPage extends $('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved")) ); @@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro const leftColumn = $('.categories-column.categories-column-left', {},); const rightColumn = $('.categories-column.categories-column-right', {},); -@@ -976,6 +1042,9 @@ export class GettingStartedPage extends +@@ -977,6 +1043,9 @@ export class GettingStartedPage extends recentList.setLimit(5); reset(leftColumn, startList.getDomElement(), recentList.getDomElement()); } @@ -189,7 +189,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ -@@ -114,6 +115,7 @@ export interface ServerParsedArgs { +@@ -118,6 +119,7 @@ export interface ServerParsedArgs { 'auth'?: string; 'disable-file-downloads'?: boolean; 'disable-file-uploads'?: boolean; diff --git a/patches/logout.diff b/patches/logout.diff index 0c1f281a2..c21be0de9 100644 --- a/patches/logout.diff +++ b/patches/logout.diff @@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ -@@ -108,6 +109,7 @@ export const serverOptions: OptionDescri +@@ -112,6 +113,7 @@ export const serverOptions: OptionDescri export interface ServerParsedArgs { /* ----- code-server ----- */ 'disable-update-check'?: boolean; diff --git a/patches/telemetry.diff b/patches/telemetry.diff index c830e09b0..462d3ce01 100644 --- a/patches/telemetry.diff +++ b/patches/telemetry.diff @@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts import { NullPolicyService } from '../../platform/policy/common/policy.js'; import { OneDataSystemAppender } from '../../platform/telemetry/node/1dsAppender.js'; import { LoggerService } from '../../platform/log/node/loggerService.js'; -@@ -174,11 +176,23 @@ export async function setupServerService +@@ -176,11 +178,23 @@ export async function setupServerService const requestService = new RequestService('remote', configurationService, environmentService, logService); services.set(IRequestService, requestService); diff --git a/patches/trusted-domains.diff b/patches/trusted-domains.diff index 0444cada7..9d42246bd 100644 --- a/patches/trusted-domains.diff +++ b/patches/trusted-domains.diff @@ -12,7 +12,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ -@@ -118,6 +119,7 @@ export interface ServerParsedArgs { +@@ -122,6 +123,7 @@ export interface ServerParsedArgs { 'disable-file-uploads'?: boolean; 'disable-getting-started-override'?: boolean, 'locale'?: string diff --git a/patches/update-check.diff b/patches/update-check.diff index dbbb7e31a..d668e4254 100644 --- a/patches/update-check.diff +++ b/patches/update-check.diff @@ -134,7 +134,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ -@@ -104,6 +106,8 @@ export const serverOptions: OptionDescri +@@ -108,6 +110,8 @@ export const serverOptions: OptionDescri }; export interface ServerParsedArgs {