Skip to content

Commit 58aedd0

Browse files
authored
Update Code to 1.119.0 (#7787)
1 parent 7056332 commit 58aedd0

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

lib/vscode

Submodule vscode updated 934 files

patches/copilot.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Index: code-server/lib/vscode/build/gulpfile.extensions.ts
22
===================================================================
33
--- code-server.orig/lib/vscode/build/gulpfile.extensions.ts
44
+++ code-server/lib/vscode/build/gulpfile.extensions.ts
5-
@@ -293,6 +293,29 @@ export const compileCopilotExtensionBuil
5+
@@ -294,6 +294,29 @@ export const compileCopilotExtensionBuil
66
gulp.task(compileCopilotExtensionBuildTask);
77

88
/**
@@ -44,7 +44,7 @@ Index: code-server/lib/vscode/build/lib/extensions.ts
4444
import vzip from 'gulp-vinyl-zip';
4545

4646
import { createRequire } from 'module';
47-
@@ -482,6 +483,116 @@ export function packageCopilotExtensionS
47+
@@ -487,6 +488,116 @@ export function packageCopilotExtensionS
4848
).pipe(util2.setExecutableBit(['**/*.sh']));
4949
}
5050

@@ -61,7 +61,7 @@ Index: code-server/lib/vscode/build/lib/extensions.ts
6161
+ return es.readArray([]);
6262
+ }
6363
+
64-
+ const esbuildConfigFileName = '.esbuild.ts';
64+
+ const esbuildConfigFileName = '.esbuild.mts';
6565
+ const esbuildScript = path.join(extensionPath, esbuildConfigFileName);
6666
+ if (!fs.existsSync(esbuildScript)) {
6767
+ throw new Error(`Copilot esbuild script not found at ${esbuildScript}`);

patches/display-language.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/common/environmentServ
3232
===================================================================
3333
--- code-server.orig/lib/vscode/src/vs/platform/environment/common/environmentService.ts
3434
+++ code-server/lib/vscode/src/vs/platform/environment/common/environmentService.ts
35-
@@ -98,7 +98,7 @@ export abstract class AbstractNativeEnvi
35+
@@ -112,7 +112,7 @@ export abstract class AbstractNativeEnvi
3636
return URI.file(join(vscodePortable, 'argv.json'));
3737
}
3838

patches/external-file-actions.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions
166166
import { AutoSaveAfterShortDelayContext } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
167167
import { WorkbenchListDoubleSelection } from '../../../../platform/list/browser/listService.js';
168168
import { Schemas } from '../../../../base/common/network.js';
169-
-import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js';
170-
+import { IsEnabledFileDownloads, IsEnabledFileUploads, DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js';
169+
-import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsSessionsWindowContext, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js';
170+
+import { IsEnabledFileDownloads, IsEnabledFileUploads, DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsSessionsWindowContext, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js';
171171
import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
172172
import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
173173
import { ThemeIcon } from '../../../../base/common/themables.js';

patches/store-socket.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostExtensionService.
3131
import { ExtHostDiskFileSystemProvider } from './extHostDiskFileSystemProvider.js';
3232
import nodeModule from 'node:module';
3333
import { assertType } from '../../../base/common/types.js';
34-
@@ -226,6 +228,52 @@ export class ExtHostExtensionService ext
34+
@@ -175,6 +177,52 @@ export class ExtHostExtensionService ext
3535

3636
performance.mark('code/extHost/didInitAPI');
3737

0 commit comments

Comments
 (0)