Skip to content

Commit 1af5ce5

Browse files
authored
Update Code to 1.110.0 (#7694)
* Update Code to 1.110.0 * Fix protected field error * Lower mangle workers to 2 to fix oom * Remove build timeouts
1 parent 62afaf2 commit 1af5ce5

17 files changed

+79
-59
lines changed

.github/workflows/build.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ jobs:
6262
prettier:
6363
name: Run prettier check
6464
runs-on: ubuntu-22.04
65-
timeout-minutes: 5
6665
steps:
6766
- uses: actions/checkout@v6
6867
- uses: actions/setup-node@v6
@@ -78,7 +77,6 @@ jobs:
7877
doctoc:
7978
name: Doctoc markdown files
8079
runs-on: ubuntu-22.04
81-
timeout-minutes: 5
8280
needs: changes
8381
if: needs.changes.outputs.docs == 'true'
8482
steps:
@@ -96,7 +94,6 @@ jobs:
9694
lint-helm:
9795
name: Lint Helm chart
9896
runs-on: ubuntu-22.04
99-
timeout-minutes: 5
10097
needs: changes
10198
if: needs.changes.outputs.helm == 'true'
10299
steps:
@@ -110,7 +107,6 @@ jobs:
110107
lint-ts:
111108
name: Lint TypeScript files
112109
runs-on: ubuntu-22.04
113-
timeout-minutes: 5
114110
needs: changes
115111
if: needs.changes.outputs.code == 'true'
116112
steps:
@@ -142,7 +138,6 @@ jobs:
142138
test-unit:
143139
name: Run unit tests
144140
runs-on: ubuntu-22.04
145-
timeout-minutes: 5
146141
needs: changes
147142
if: needs.changes.outputs.code == 'true'
148143
steps:
@@ -164,7 +159,6 @@ jobs:
164159
build:
165160
name: Build code-server
166161
runs-on: ubuntu-22.04
167-
timeout-minutes: 70
168162
env:
169163
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
170164
DISABLE_V8_COMPILE_CACHE: 1
@@ -227,7 +221,6 @@ jobs:
227221
test-e2e:
228222
name: Run e2e tests
229223
runs-on: ubuntu-22.04
230-
timeout-minutes: 25
231224
needs: [changes, build]
232225
if: needs.changes.outputs.code == 'true' || needs.changes.outputs.deps == 'true'
233226
steps:
@@ -261,7 +254,6 @@ jobs:
261254
test-e2e-proxy:
262255
name: Run e2e tests behind proxy
263256
runs-on: ubuntu-22.04
264-
timeout-minutes: 25
265257
needs: [changes, build]
266258
if: needs.changes.outputs.code == 'true' || needs.changes.outputs.deps == 'true'
267259
steps:

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.21.1
1+
22.22.0

lib/vscode

Submodule vscode updated 1946 files

package-lock.json

Lines changed: 0 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

patches/cli-window-open.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTe
1717
===================================================================
1818
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
1919
+++ code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
20-
@@ -107,10 +107,14 @@ class RemoteTerminalBackend extends Base
20+
@@ -108,10 +108,14 @@ class RemoteTerminalBackend extends Base
2121
}
2222
const reqId = e.reqId;
2323
const commandId = e.commandId;

patches/clipboard.diff

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostCLIServer.ts
4040

4141
export interface ICommandsExecuter {
4242
executeCommand<T>(id: string, ...args: any[]): Promise<T>;
43-
@@ -106,6 +111,9 @@ export class CLIServerBase {
43+
@@ -110,6 +115,9 @@ export class CLIServerBase {
4444
case 'extensionManagement':
4545
returnObj = await this.manageExtensions(data);
4646
break;
@@ -50,7 +50,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostCLIServer.ts
5050
default:
5151
sendResponse(404, `Unknown message type: ${data.type}`);
5252
break;
53-
@@ -176,6 +184,10 @@ export class CLIServerBase {
53+
@@ -180,6 +188,10 @@ export class CLIServerBase {
5454
return await this._commands.executeCommand<string | undefined>('_remoteCLI.getSystemStatus');
5555
}
5656

@@ -59,26 +59,26 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostCLIServer.ts
5959
+ }
6060
+
6161
dispose(): void {
62-
this._server.close();
63-
62+
this._disposed = true;
63+
this._server?.close();
6464
Index: code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
6565
===================================================================
6666
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
6767
+++ code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
68-
@@ -98,7 +98,7 @@ class RemoteTerminalBackend extends Base
68+
@@ -99,7 +99,7 @@ class RemoteTerminalBackend extends Base
6969
}
70-
});
70+
}));
7171

7272
- const allowedCommands = ['_remoteCLI.openExternal', '_remoteCLI.windowOpen', '_remoteCLI.getSystemStatus', '_remoteCLI.manageExtensions'];
7373
+ const allowedCommands = ['_remoteCLI.openExternal', '_remoteCLI.windowOpen', '_remoteCLI.getSystemStatus', '_remoteCLI.manageExtensions', '_remoteCLI.setClipboard'];
74-
this._remoteTerminalChannel.onExecuteCommand(async e => {
74+
this._register(this._remoteTerminalChannel.onExecuteCommand(async e => {
7575
// Ensure this request for for this window
7676
const pty = this._ptys.get(e.persistentProcessId);
7777
Index: code-server/lib/vscode/src/vs/platform/environment/common/argv.ts
7878
===================================================================
7979
--- code-server.orig/lib/vscode/src/vs/platform/environment/common/argv.ts
8080
+++ code-server/lib/vscode/src/vs/platform/environment/common/argv.ts
81-
@@ -137,6 +137,7 @@ export interface NativeParsedArgs {
81+
@@ -138,6 +138,7 @@ export interface NativeParsedArgs {
8282
'disable-chromium-sandbox'?: boolean;
8383
sandbox?: boolean;
8484
'enable-coi'?: boolean;
@@ -90,7 +90,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/node/argv.ts
9090
===================================================================
9191
--- code-server.orig/lib/vscode/src/vs/platform/environment/node/argv.ts
9292
+++ code-server/lib/vscode/src/vs/platform/environment/node/argv.ts
93-
@@ -105,6 +105,7 @@ export const OPTIONS: OptionDescriptions
93+
@@ -106,6 +106,7 @@ export const OPTIONS: OptionDescriptions
9494
'user-data-dir': { type: 'string', cat: 'o', args: 'dir', description: localize('userDataDir', "Specifies the directory that user data is kept in. Can be used to open multiple distinct instances of Code.") },
9595
'profile': { type: 'string', 'cat': 'o', args: 'profileName', description: localize('profileName', "Opens the provided folder or workspace with the given profile and associates the profile with the workspace. If the profile does not exist, a new empty one is created.") },
9696
'help': { type: 'boolean', cat: 'o', alias: 'h', description: localize('help', "Print usage.") },

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-
@@ -341,6 +341,10 @@ export class Extension implements IExten
10+
@@ -342,6 +342,10 @@ export class Extension implements IExten
1111
if (this.type === ExtensionType.System && this.productService.quality === 'stable') {
1212
return false;
1313
}

patches/display-language.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
1818
import { ProtocolConstants } from '../../base/parts/ipc/common/ipc.net.js';
1919
import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
2020
import { ConfigurationService } from '../../platform/configuration/common/configurationService.js';
21-
@@ -272,6 +272,9 @@ export async function setupServerService
21+
@@ -277,6 +277,9 @@ export async function setupServerService
2222

2323
socketServer.registerChannel('mcpManagement', new McpManagementChannel(mcpManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)));
2424

@@ -339,8 +339,8 @@ Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
339339
===================================================================
340340
--- code-server.orig/lib/vscode/src/vs/workbench/workbench.web.main.ts
341341
+++ code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
342-
@@ -54,7 +54,7 @@ import './services/dialogs/browser/fileD
343-
import './services/host/browser/browserHostService.js';
342+
@@ -55,7 +55,7 @@ import './services/host/browser/browserH
343+
import '../platform/meteredConnection/browser/meteredConnectionService.js';
344344
import './services/lifecycle/browser/lifecycleService.js';
345345
import './services/clipboard/browser/clipboardService.js';
346346
-import './services/localization/browser/localeService.js';

patches/external-file-actions.diff

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,16 +129,16 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
129129
import { Disposable } from '../../base/common/lifecycle.js';
130130
import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from '../../platform/contextkey/common/contextkey.js';
131131
import { IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from '../../platform/contextkey/common/contextkeys.js';
132-
-import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext, AuxiliaryBarMaximizedContext, InAutomationContext, IsAgentSessionsWorkspaceContext, WorkbenchModeContext } from '../common/contextkeys.js';
133-
+import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext, AuxiliaryBarMaximizedContext, InAutomationContext, IsAgentSessionsWorkspaceContext, WorkbenchModeContext, IsEnabledFileDownloads, IsEnabledFileUploads } from '../common/contextkeys.js';
132+
-import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext, AuxiliaryBarMaximizedContext, InAutomationContext, IsSessionsWindowContext } from '../common/contextkeys.js';
133+
+import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext, AuxiliaryBarMaximizedContext, InAutomationContext, IsSessionsWindowContext, IsEnabledFileDownloads, IsEnabledFileUploads } from '../common/contextkeys.js';
134134
import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from '../services/editor/common/editorGroupsService.js';
135135
import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
136136
-import { IWorkbenchEnvironmentService } from '../services/environment/common/environmentService.js';
137137
+import { IBrowserWorkbenchEnvironmentService } from '../services/environment/browser/environmentService.js';
138138
import { WorkbenchState, IWorkspaceContextService, isTemporaryWorkspace } from '../../platform/workspace/common/workspace.js';
139139
import { IWorkbenchLayoutService, Parts, positionToString } from '../services/layout/browser/layoutService.js';
140140
import { getRemoteName } from '../../platform/remote/common/remoteHosts.js';
141-
@@ -72,7 +72,7 @@ export class WorkbenchContextKeysHandler
141+
@@ -69,7 +69,7 @@ export class WorkbenchContextKeysHandler
142142
@IContextKeyService private readonly contextKeyService: IContextKeyService,
143143
@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
144144
@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -147,7 +147,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
147147
@IProductService private readonly productService: IProductService,
148148
@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
149149
@IEditorService private readonly editorService: IEditorService,
150-
@@ -207,6 +207,10 @@ export class WorkbenchContextKeysHandler
150+
@@ -201,6 +201,10 @@ export class WorkbenchContextKeysHandler
151151
this.auxiliaryBarMaximizedContext = AuxiliaryBarMaximizedContext.bindTo(this.contextKeyService);
152152
this.auxiliaryBarMaximizedContext.set(this.layoutService.isAuxiliaryBarMaximized());
153153

@@ -207,7 +207,7 @@ Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
207207
===================================================================
208208
--- code-server.orig/lib/vscode/src/vs/workbench/common/contextkeys.ts
209209
+++ code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
210-
@@ -43,6 +43,9 @@ export const EmbedderIdentifierContext =
210+
@@ -41,6 +41,9 @@ export const EmbedderIdentifierContext =
211211

212212
export const InAutomationContext = new RawContextKey<boolean>('inAutomation', false, localize('inAutomation', "Whether VS Code is running under automation/smoke test"));
213213

@@ -290,7 +290,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explo
290290
import { WorkbenchCompressibleAsyncDataTree } from '../../../../../platform/list/browser/listService.js';
291291
import { ISearchService, QueryType, getExcludes, ISearchConfiguration, ISearchComplete, IFileQuery } from '../../../../services/search/common/search.js';
292292
import { CancellationToken } from '../../../../../base/common/cancellation.js';
293-
@@ -1586,7 +1587,8 @@ export class FileDragAndDrop implements
293+
@@ -1587,7 +1588,8 @@ export class FileDragAndDrop implements
294294
@IConfigurationService private configurationService: IConfigurationService,
295295
@IInstantiationService private instantiationService: IInstantiationService,
296296
@IWorkspaceEditingService private workspaceEditingService: IWorkspaceEditingService,
@@ -300,7 +300,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explo
300300
) {
301301
const updateDropEnablement = (e: IConfigurationChangeEvent | undefined) => {
302302
if (!e || e.affectsConfiguration('explorer.enableDragAndDrop')) {
303-
@@ -1811,15 +1813,17 @@ export class FileDragAndDrop implements
303+
@@ -1812,15 +1814,17 @@ export class FileDragAndDrop implements
304304

305305
// External file DND (Import/Upload file)
306306
if (data instanceof NativeDragAndDropData) {

0 commit comments

Comments
 (0)