From 0250e232a6a18f4ba683aa0d6a6d07de9a0ffc11 Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Thu, 14 May 2026 15:32:27 +0200 Subject: [PATCH] Update Code to 1.120.0 --- lib/vscode | 2 +- patches/clipboard.diff | 2 +- patches/copilot.diff | 2 +- patches/display-language.diff | 2 +- patches/external-file-actions.diff | 2 +- patches/getting-started.diff | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/vscode b/lib/vscode index 8b640eef5a6c..0958016b2af9 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 8b640eef5a6c6089c029249d48efa5c99adf7d51 +Subproject commit 0958016b2af9f09bb4257e0df4a95e2f90590f9f diff --git a/patches/clipboard.diff b/patches/clipboard.diff index d479070d68f8..7f64d1709aaa 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 -@@ -149,6 +149,7 @@ export interface NativeParsedArgs { +@@ -148,6 +148,7 @@ export interface NativeParsedArgs { 'disable-chromium-sandbox'?: boolean; sandbox?: boolean; 'enable-coi'?: boolean; diff --git a/patches/copilot.diff b/patches/copilot.diff index 8db68a1b7a23..3a847cef05bc 100644 --- a/patches/copilot.diff +++ b/patches/copilot.diff @@ -44,7 +44,7 @@ Index: code-server/lib/vscode/build/lib/extensions.ts import vzip from 'gulp-vinyl-zip'; import { createRequire } from 'module'; -@@ -487,6 +488,116 @@ export function packageCopilotExtensionS +@@ -492,6 +493,116 @@ export function packageCopilotExtensionS ).pipe(util2.setExecutableBit(['**/*.sh'])); } diff --git a/patches/display-language.diff b/patches/display-language.diff index db433fd9933e..e22e954ee575 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -32,7 +32,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/common/environmentServ =================================================================== --- code-server.orig/lib/vscode/src/vs/platform/environment/common/environmentService.ts +++ code-server/lib/vscode/src/vs/platform/environment/common/environmentService.ts -@@ -112,7 +112,7 @@ export abstract class AbstractNativeEnvi +@@ -98,7 +98,7 @@ export abstract class AbstractNativeEnvi return URI.file(join(vscodePortable, 'argv.json')); } diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index 40d7b4c6d5fb..fcfc0b84e628 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -207,7 +207,7 @@ Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/common/contextkeys.ts +++ code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts -@@ -41,6 +41,9 @@ export const EmbedderIdentifierContext = +@@ -40,6 +40,9 @@ export const EmbedderIdentifierContext = export const InAutomationContext = new RawContextKey('inAutomation', false, localize('inAutomation', "Whether VS Code is running under automation/smoke test")); diff --git a/patches/getting-started.diff b/patches/getting-started.diff index 205bbbaea3a7..73f4188d4a60 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'; -@@ -925,6 +925,72 @@ export class GettingStartedPage extends +@@ -927,6 +927,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', {},); -@@ -974,6 +1040,9 @@ export class GettingStartedPage extends +@@ -976,6 +1042,9 @@ export class GettingStartedPage extends recentList.setLimit(5); reset(leftColumn, startList.getDomElement(), recentList.getDomElement()); } @@ -234,7 +234,7 @@ Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/common/contextkeys.ts +++ code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts -@@ -43,6 +43,7 @@ export const InAutomationContext = new R +@@ -42,6 +42,7 @@ export const InAutomationContext = new R export const IsEnabledFileDownloads = new RawContextKey('isEnabledFileDownloads', true, true); export const IsEnabledFileUploads = new RawContextKey('isEnabledFileUploads', true, true);