From 8bdc40e3d512fafd792458a7826f2ee03ca68214 Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Thu, 7 May 2026 06:14:18 +0200 Subject: [PATCH 1/3] Update Code to 1.119.0 --- lib/vscode | 2 +- patches/copilot.diff | 4 ++-- patches/display-language.diff | 2 +- patches/external-file-actions.diff | 11 +++++------ patches/store-socket.diff | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/vscode b/lib/vscode index 034f571df509..8b640eef5a6c 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 034f571df509819cc10b0c8129f66ef77a542f0e +Subproject commit 8b640eef5a6c6089c029249d48efa5c99adf7d51 diff --git a/patches/copilot.diff b/patches/copilot.diff index d30f43d7301a..f9898bb00387 100644 --- a/patches/copilot.diff +++ b/patches/copilot.diff @@ -2,7 +2,7 @@ Index: code-server/lib/vscode/build/gulpfile.extensions.ts =================================================================== --- code-server.orig/lib/vscode/build/gulpfile.extensions.ts +++ code-server/lib/vscode/build/gulpfile.extensions.ts -@@ -293,6 +293,29 @@ export const compileCopilotExtensionBuil +@@ -294,6 +294,29 @@ export const compileCopilotExtensionBuil gulp.task(compileCopilotExtensionBuildTask); /** @@ -44,7 +44,7 @@ Index: code-server/lib/vscode/build/lib/extensions.ts import vzip from 'gulp-vinyl-zip'; import { createRequire } from 'module'; -@@ -482,6 +483,116 @@ export function packageCopilotExtensionS +@@ -487,6 +488,116 @@ export function packageCopilotExtensionS ).pipe(util2.setExecutableBit(['**/*.sh'])); } diff --git a/patches/display-language.diff b/patches/display-language.diff index e22e954ee575..db433fd9933e 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 -@@ -98,7 +98,7 @@ export abstract class AbstractNativeEnvi +@@ -112,7 +112,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 6bc6ec39d65d..9ab300851a43 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -162,16 +162,15 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts -@@ -20,7 +20,7 @@ import { CLOSE_SAVED_EDITORS_COMMAND_ID, - import { AutoSaveAfterShortDelayContext } from '../../../services/filesConfiguration/common/filesConfigurationService.js'; +@@ -21,6 +21,7 @@ import { AutoSaveAfterShortDelayContext import { WorkbenchListDoubleSelection } from '../../../../platform/list/browser/listService.js'; import { Schemas } from '../../../../base/common/network.js'; --import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js'; -+import { IsEnabledFileDownloads, IsEnabledFileUploads, DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js'; + import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsSessionsWindowContext, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js'; ++import { IsEnabledFileDownloads, IsEnabledFileUploads, DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsSessionsWindowContext, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js'; import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js'; import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js'; import { ThemeIcon } from '../../../../base/common/themables.js'; -@@ -571,13 +571,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo +@@ -571,13 +572,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo id: DOWNLOAD_COMMAND_ID, title: DOWNLOAD_LABEL }, @@ -195,7 +194,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions ) })); -@@ -589,6 +592,7 @@ MenuRegistry.appendMenuItem(MenuId.Explo +@@ -589,6 +593,7 @@ MenuRegistry.appendMenuItem(MenuId.Explo title: UPLOAD_LABEL, }, when: ContextKeyExpr.and( diff --git a/patches/store-socket.diff b/patches/store-socket.diff index c2bca06c907f..ffbd9d15d37f 100644 --- a/patches/store-socket.diff +++ b/patches/store-socket.diff @@ -31,7 +31,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostExtensionService. import { ExtHostDiskFileSystemProvider } from './extHostDiskFileSystemProvider.js'; import nodeModule from 'node:module'; import { assertType } from '../../../base/common/types.js'; -@@ -226,6 +228,52 @@ export class ExtHostExtensionService ext +@@ -175,6 +177,52 @@ export class ExtHostExtensionService ext performance.mark('code/extHost/didInitAPI'); From af9bb33adc27404c55738dd4b12bc43b6c809f77 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 7 May 2026 09:43:08 -0800 Subject: [PATCH 2/3] Update copilot patch --- patches/copilot.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/copilot.diff b/patches/copilot.diff index f9898bb00387..8db68a1b7a23 100644 --- a/patches/copilot.diff +++ b/patches/copilot.diff @@ -61,7 +61,7 @@ Index: code-server/lib/vscode/build/lib/extensions.ts + return es.readArray([]); + } + -+ const esbuildConfigFileName = '.esbuild.ts'; ++ const esbuildConfigFileName = '.esbuild.mts'; + const esbuildScript = path.join(extensionPath, esbuildConfigFileName); + if (!fs.existsSync(esbuildScript)) { + throw new Error(`Copilot esbuild script not found at ${esbuildScript}`); From 2a1b53f1ecf79d0a354026aa20857664c286e23e Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 7 May 2026 09:52:50 -0800 Subject: [PATCH 3/3] Fix dupe import --- patches/external-file-actions.diff | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index 9ab300851a43..40d7b4c6d5fb 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -162,15 +162,16 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts -@@ -21,6 +21,7 @@ import { AutoSaveAfterShortDelayContext +@@ -20,7 +20,7 @@ import { CLOSE_SAVED_EDITORS_COMMAND_ID, + import { AutoSaveAfterShortDelayContext } from '../../../services/filesConfiguration/common/filesConfigurationService.js'; import { WorkbenchListDoubleSelection } from '../../../../platform/list/browser/listService.js'; import { Schemas } from '../../../../base/common/network.js'; - import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsSessionsWindowContext, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js'; +-import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsSessionsWindowContext, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js'; +import { IsEnabledFileDownloads, IsEnabledFileUploads, DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsSessionsWindowContext, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js'; import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js'; import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js'; import { ThemeIcon } from '../../../../base/common/themables.js'; -@@ -571,13 +572,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo +@@ -571,13 +571,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo id: DOWNLOAD_COMMAND_ID, title: DOWNLOAD_LABEL }, @@ -194,7 +195,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions ) })); -@@ -589,6 +593,7 @@ MenuRegistry.appendMenuItem(MenuId.Explo +@@ -589,6 +592,7 @@ MenuRegistry.appendMenuItem(MenuId.Explo title: UPLOAD_LABEL, }, when: ContextKeyExpr.and(