Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f72e3f8

Browse files
benz0libenz0li
committedOct 4, 2024
Update Code to 1.94.0
- Fixes #7018
1 parent 13d4cd6 commit f72e3f8

16 files changed

+179
-218
lines changed
 

‎.node-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.15.1
1+
20.16.0

‎lib/vscode

Submodule vscode updated 4622 files

‎patches/clipboard.diff

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ Index: code-server/lib/vscode/src/vs/workbench/api/browser/mainThreadCLICommands
22
===================================================================
33
--- code-server.orig/lib/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.ts
44
+++ code-server/lib/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.ts
5-
@@ -8,6 +8,7 @@ import { isWeb } from 'vs/base/common/pl
6-
import { isString } from 'vs/base/common/types';
7-
import { URI, UriComponents } from 'vs/base/common/uri';
8-
import { localize } from 'vs/nls';
9-
+import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
10-
import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
11-
import { IExtensionGalleryService, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
12-
import { ExtensionManagementCLI } from 'vs/platform/extensionManagement/common/extensionManagementCLI';
5+
@@ -8,6 +8,7 @@ import { isWeb } from '../../../base/com
6+
import { isString } from '../../../base/common/types.js';
7+
import { URI, UriComponents } from '../../../base/common/uri.js';
8+
import { localize } from '../../../nls.js';
9+
+import { IClipboardService } from '../../../platform/clipboard/common/clipboardService.js';
10+
import { CommandsRegistry, ICommandService } from '../../../platform/commands/common/commands.js';
11+
import { IExtensionGalleryService, IExtensionManagementService } from '../../../platform/extensionManagement/common/extensionManagement.js';
12+
import { ExtensionManagementCLI } from '../../../platform/extensionManagement/common/extensionManagementCLI.js';
1313
@@ -89,6 +90,11 @@ CommandsRegistry.registerCommand('_remot
1414
return lines.join('\n');
1515
});

‎patches/disable-builtin-ext-update.diff

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

‎patches/display-language.diff

+34-59
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
99
===================================================================
1010
--- code-server.orig/lib/vscode/src/vs/server/node/serverServices.ts
1111
+++ code-server/lib/vscode/src/vs/server/node/serverServices.ts
12-
@@ -12,7 +12,7 @@ import * as path from 'vs/base/common/pa
13-
import { IURITransformer } from 'vs/base/common/uriIpc';
14-
import { getMachineId, getSqmMachineId, getdevDeviceId } from 'vs/base/node/id';
15-
import { Promises } from 'vs/base/node/pfs';
16-
-import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, StaticRouter } from 'vs/base/parts/ipc/common/ipc';
17-
+import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, ProxyChannel, StaticRouter } from 'vs/base/parts/ipc/common/ipc';
18-
import { ProtocolConstants } from 'vs/base/parts/ipc/common/ipc.net';
19-
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
20-
import { ConfigurationService } from 'vs/platform/configuration/common/configurationService';
12+
@@ -12,7 +12,7 @@ import * as path from '../../base/common
13+
import { IURITransformer } from '../../base/common/uriIpc.js';
14+
import { getMachineId, getSqmMachineId, getdevDeviceId } from '../../base/node/id.js';
15+
import { Promises } from '../../base/node/pfs.js';
16+
-import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, StaticRouter } from '../../base/parts/ipc/common/ipc.js';
17+
+import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, ProxyChannel, StaticRouter } from '../../base/parts/ipc/common/ipc.js';
18+
import { ProtocolConstants } from '../../base/parts/ipc/common/ipc.net.js';
19+
import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
20+
import { ConfigurationService } from '../../platform/configuration/common/configurationService.js';
2121
@@ -243,6 +243,9 @@ export async function setupServerService
2222
const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority));
2323
socketServer.registerChannel('extensions', channel);
@@ -51,9 +51,9 @@ Index: code-server/lib/vscode/src/vs/server/node/remoteLanguagePacks.ts
5151

5252
+import { promises as fs } from 'fs';
5353
+import * as path from 'path';
54-
import { FileAccess } from 'vs/base/common/network';
55-
import { join } from 'vs/base/common/path';
56-
import type { INLSConfiguration } from 'vs/nls';
54+
import { FileAccess } from '../../base/common/network.js';
55+
import { join } from '../../base/common/path.js';
56+
import type { INLSConfiguration } from '../../nls.js';
5757
@@ -33,7 +35,94 @@ export async function getNLSConfiguratio
5858
if (!result) {
5959
result = resolveNLSConfiguration({ userLocale: language, osLocale: language, commit: product.commit, userDataPath, nlsMetadataPath });
@@ -153,14 +153,14 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
153153
===================================================================
154154
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
155155
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
156-
@@ -26,6 +26,7 @@ import { URI } from 'vs/base/common/uri'
157-
import { streamToBuffer } from 'vs/base/common/buffer';
158-
import { IProductConfiguration } from 'vs/base/common/product';
159-
import { isString } from 'vs/base/common/types';
160-
+import { getLocaleFromConfig, getBrowserNLSConfiguration } from 'vs/server/node/remoteLanguagePacks';
161-
import { CharCode } from 'vs/base/common/charCode';
162-
import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
163-
import { isESM } from 'vs/base/common/amd';
156+
@@ -26,6 +26,7 @@ import { URI } from '../../base/common/u
157+
import { streamToBuffer } from '../../base/common/buffer.js';
158+
import { IProductConfiguration } from '../../base/common/product.js';
159+
import { isString } from '../../base/common/types.js';
160+
+import { getLocaleFromConfig, getBrowserNLSConfiguration } from './remoteLanguagePacks.js';
161+
import { CharCode } from '../../base/common/charCode.js';
162+
import { IExtensionManifest } from '../../platform/extensions/common/extensions.js';
163+
import { isESM } from '../../base/common/amd.js';
164164
@@ -99,6 +100,7 @@ export class WebClientServer {
165165
private readonly _webExtensionResourceUrlTemplate: URI | undefined;
166166

@@ -222,46 +222,21 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
222222

223223
/* ----- server setup ----- */
224224

225-
Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
226-
===================================================================
227-
--- code-server.orig/lib/vscode/src/vs/workbench/workbench.web.main.ts
228-
+++ code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
229-
@@ -52,7 +52,7 @@ import 'vs/workbench/services/dialogs/br
230-
import 'vs/workbench/services/host/browser/browserHostService';
231-
import 'vs/workbench/services/lifecycle/browser/lifecycleService';
232-
import 'vs/workbench/services/clipboard/browser/clipboardService';
233-
-import 'vs/workbench/services/localization/browser/localeService';
234-
+import 'vs/workbench/services/localization/electron-sandbox/localeService';
235-
import 'vs/workbench/services/path/browser/pathService';
236-
import 'vs/workbench/services/themes/browser/browserHostColorSchemeService';
237-
import 'vs/workbench/services/encryption/browser/encryptionService';
238-
@@ -118,8 +118,9 @@ registerSingleton(ILanguagePackService,
239-
// Logs
240-
import 'vs/workbench/contrib/logs/browser/logs.contribution';
241-
242-
-// Localization
243-
-import 'vs/workbench/contrib/localization/browser/localization.contribution';
244-
+// Localization. This does not actually import anything specific to Electron so
245-
+// it should be safe.
246-
+import 'vs/workbench/contrib/localization/electron-sandbox/localization.contribution';
247-
248-
// Performance
249-
import 'vs/workbench/contrib/performance/browser/performance.web.contribution';
250225
Index: code-server/lib/vscode/src/vs/platform/languagePacks/browser/languagePacks.ts
251226
===================================================================
252227
--- code-server.orig/lib/vscode/src/vs/platform/languagePacks/browser/languagePacks.ts
253228
+++ code-server/lib/vscode/src/vs/platform/languagePacks/browser/languagePacks.ts
254229
@@ -5,18 +5,24 @@
255230

256-
import { CancellationTokenSource } from 'vs/base/common/cancellation';
257-
import { URI } from 'vs/base/common/uri';
258-
+import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
259-
import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
260-
import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
261-
-import { ILanguagePackItem, LanguagePackBaseService } from 'vs/platform/languagePacks/common/languagePacks';
262-
+import { ILanguagePackItem, ILanguagePackService, LanguagePackBaseService } from 'vs/platform/languagePacks/common/languagePacks';
263-
import { ILogService } from 'vs/platform/log/common/log';
264-
+import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
231+
import { CancellationTokenSource } from '../../../base/common/cancellation.js';
232+
import { URI } from '../../../base/common/uri.js';
233+
+import { ProxyChannel } from '../../../base/parts/ipc/common/ipc.js';
234+
import { IExtensionGalleryService } from '../../extensionManagement/common/extensionManagement.js';
235+
import { IExtensionResourceLoaderService } from '../../extensionResourceLoader/common/extensionResourceLoader.js';
236+
-import { ILanguagePackItem, LanguagePackBaseService } from '../common/languagePacks.js';
237+
+import { ILanguagePackItem, ILanguagePackService, LanguagePackBaseService } from '../common/languagePacks.js';
238+
import { ILogService } from '../../log/common/log.js';
239+
+import { IRemoteAgentService } from '../../../workbench/services/remote/common/remoteAgentService.js';
265240

266241
export class WebLanguagePacksService extends LanguagePackBaseService {
267242
+ private readonly languagePackService: ILanguagePackService;
@@ -313,7 +288,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
313288
===================================================================
314289
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
315290
+++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
316-
@@ -411,9 +411,6 @@ export class InstallAction extends Exten
291+
@@ -433,9 +433,6 @@ export class InstallAction extends Exten
317292
if (this.extension.isBuiltin) {
318293
return;
319294
}
@@ -323,7 +298,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
323298
if (this.extension.state !== ExtensionState.Uninstalled) {
324299
return;
325300
}
326-
@@ -695,7 +692,7 @@ export abstract class InstallInOtherServ
301+
@@ -740,7 +737,7 @@ export abstract class InstallInOtherServ
327302
}
328303

329304
if (isLanguagePackExtension(this.extension.local.manifest)) {
@@ -332,7 +307,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
332307
}
333308

334309
// Prefers to run on UI
335-
@@ -1951,17 +1948,6 @@ export class SetLanguageAction extends E
310+
@@ -2001,17 +1998,6 @@ export class SetLanguageAction extends E
336311
update(): void {
337312
this.enabled = false;
338313
this.class = SetLanguageAction.DisabledClass;
@@ -350,15 +325,15 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
350325
}
351326

352327
override async run(): Promise<any> {
353-
@@ -1978,7 +1964,6 @@ export class ClearLanguageAction extends
328+
@@ -2028,7 +2014,6 @@ export class ClearLanguageAction extends
354329
private static readonly DisabledClass = `${this.EnabledClass} disabled`;
355330

356331
constructor(
357332
- @IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
358333
@ILocaleService private readonly localeService: ILocaleService,
359334
) {
360335
super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false);
361-
@@ -1988,17 +1973,6 @@ export class ClearLanguageAction extends
336+
@@ -2038,17 +2023,6 @@ export class ClearLanguageAction extends
362337
update(): void {
363338
this.enabled = false;
364339
this.class = ClearLanguageAction.DisabledClass;

‎patches/external-file-actions.diff

+42-42
Large diffs are not rendered by default.

‎patches/getting-started.diff

+24-24
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
1414
* Licensed under the MIT License. See License.txt in the project root for license information.
1515
*--------------------------------------------------------------------------------------------*/
1616

17-
-import { $, Dimension, addDisposableListener, append, clearNode, reset } from 'vs/base/browser/dom';
18-
+import { $, Dimension, addDisposableListener, append, clearNode, reset, prepend } from 'vs/base/browser/dom';
19-
import { renderFormattedText } from 'vs/base/browser/formattedTextRenderer';
20-
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
21-
import { Button } from 'vs/base/browser/ui/button/button';
17+
-import { $, Dimension, addDisposableListener, append, clearNode, reset } from '../../../../base/browser/dom.js';
18+
+import { $, Dimension, addDisposableListener, append, clearNode, reset, prepend } from '../../../../base/browser/dom.js';
19+
import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
20+
import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
21+
import { Button } from '../../../../base/browser/ui/button/button.js';
2222
@@ -54,7 +54,7 @@ import { IRecentFolder, IRecentWorkspace
23-
import { OpenRecentAction } from 'vs/workbench/browser/actions/windowActions';
24-
import { OpenFileFolderAction, OpenFolderAction, OpenFolderViaWorkspaceAction } from 'vs/workbench/browser/actions/workspaceActions';
25-
import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
26-
-import { WorkbenchStateContext } from 'vs/workbench/common/contextkeys';
27-
+import { IsEnabledCoderGettingStarted, WorkbenchStateContext } from 'vs/workbench/common/contextkeys';
28-
import { IEditorOpenContext, IEditorSerializer } from 'vs/workbench/common/editor';
29-
import { IWebviewElement, IWebviewService } from 'vs/workbench/contrib/webview/browser/webview';
30-
import 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedColors';
31-
@@ -804,6 +804,72 @@ export class GettingStartedPage extends
23+
import { OpenRecentAction } from '../../../browser/actions/windowActions.js';
24+
import { OpenFileFolderAction, OpenFolderAction, OpenFolderViaWorkspaceAction } from '../../../browser/actions/workspaceActions.js';
25+
import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
26+
-import { WorkbenchStateContext } from '../../../common/contextkeys.js';
27+
+import { IsEnabledCoderGettingStarted, WorkbenchStateContext } from '../../../common/contextkeys.js';
28+
import { IEditorOpenContext, IEditorSerializer } from '../../../common/editor.js';
29+
import { IWebviewElement, IWebviewService } from '../../webview/browser/webview.js';
30+
import './gettingStartedColors.js';
31+
@@ -820,6 +820,72 @@ export class GettingStartedPage extends
3232
$('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved"))
3333
);
3434

@@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
101101
const leftColumn = $('.categories-column.categories-column-left', {},);
102102
const rightColumn = $('.categories-column.categories-column-right', {},);
103103

104-
@@ -839,6 +905,9 @@ export class GettingStartedPage extends
104+
@@ -855,6 +921,9 @@ export class GettingStartedPage extends
105105
recentList.setLimit(5);
106106
reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
107107
}
@@ -213,15 +213,15 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
213213
===================================================================
214214
--- code-server.orig/lib/vscode/src/vs/workbench/browser/contextkeys.ts
215215
+++ code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
216-
@@ -7,7 +7,7 @@ import { Event } from 'vs/base/common/ev
217-
import { Disposable } from 'vs/base/common/lifecycle';
218-
import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from 'vs/platform/contextkey/common/contextkey';
219-
import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from 'vs/platform/contextkey/common/contextkeys';
220-
-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, IsEnabledFileDownloads, IsEnabledFileUploads } from 'vs/workbench/common/contextkeys';
221-
+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, IsEnabledFileDownloads, IsEnabledFileUploads, IsEnabledCoderGettingStarted, } from 'vs/workbench/common/contextkeys';
222-
import { trackFocus, addDisposableListener, EventType, onDidRegisterWindow, getActiveWindow } from 'vs/base/browser/dom';
223-
import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
224-
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
216+
@@ -7,7 +7,7 @@ import { Event } from '../../base/common
217+
import { Disposable } from '../../base/common/lifecycle.js';
218+
import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from '../../platform/contextkey/common/contextkey.js';
219+
import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from '../../platform/contextkey/common/contextkeys.js';
220+
-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, IsEnabledFileDownloads, IsEnabledFileUploads } from '../common/contextkeys.js';
221+
+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, IsEnabledFileDownloads, IsEnabledFileUploads, IsEnabledCoderGettingStarted, } from '../common/contextkeys.js';
222+
import { trackFocus, addDisposableListener, EventType, onDidRegisterWindow, getActiveWindow, isEditableElement } from '../../base/browser/dom.js';
223+
import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from '../services/editor/common/editorGroupsService.js';
224+
import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
225225
@@ -200,6 +200,7 @@ export class WorkbenchContextKeysHandler
226226
// code-server
227227
IsEnabledFileDownloads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileDownloads ?? true)

‎patches/integration.diff

+14-14
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ Index: code-server/lib/vscode/src/vs/server/node/server.main.ts
1414
--- code-server.orig/lib/vscode/src/vs/server/node/server.main.ts
1515
+++ code-server/lib/vscode/src/vs/server/node/server.main.ts
1616
@@ -12,7 +12,7 @@ import { createServer as doCreateServer,
17-
import { parseArgs, ErrorReporter } from 'vs/platform/environment/node/argv';
18-
import { join, dirname } from 'vs/base/common/path';
17+
import { parseArgs, ErrorReporter } from '../../platform/environment/node/argv.js';
18+
import { join, dirname } from '../../base/common/path.js';
1919
import { performance } from 'perf_hooks';
20-
-import { serverOptions } from 'vs/server/node/serverEnvironmentService';
21-
+import { serverOptions, ServerParsedArgs } from 'vs/server/node/serverEnvironmentService';
22-
import product from 'vs/platform/product/common/product';
23-
import * as perf from 'vs/base/common/performance';
20+
-import { serverOptions } from './serverEnvironmentService.js';
21+
+import { serverOptions, ServerParsedArgs } from './serverEnvironmentService.js';
22+
import product from '../../platform/product/common/product.js';
23+
import * as perf from '../../base/common/performance.js';
2424

2525
@@ -34,38 +34,43 @@ const errorReporter: ErrorReporter = {
2626
}
@@ -176,14 +176,14 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
176176
===================================================================
177177
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.main.ts
178178
+++ code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
179-
@@ -64,6 +64,7 @@ import { IOpenerService } from 'vs/platf
180-
import { mixin, safeStringify } from 'vs/base/common/objects';
181-
import { IndexedDB } from 'vs/base/browser/indexedDB';
182-
import { WebFileSystemAccess } from 'vs/platform/files/browser/webFileSystemAccess';
183-
+import { CodeServerClient } from 'vs/workbench/browser/client';
184-
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
185-
import { IProgressService } from 'vs/platform/progress/common/progress';
186-
import { DelayedLogChannel } from 'vs/workbench/services/output/common/delayedLogChannel';
179+
@@ -64,6 +64,7 @@ import { IOpenerService } from '../../pl
180+
import { mixin, safeStringify } from '../../base/common/objects.js';
181+
import { IndexedDB } from '../../base/browser/indexedDB.js';
182+
import { WebFileSystemAccess } from '../../platform/files/browser/webFileSystemAccess.js';
183+
+import { CodeServerClient } from '../../workbench/browser/client.js';
184+
import { ITelemetryService } from '../../platform/telemetry/common/telemetry.js';
185+
import { IProgressService } from '../../platform/progress/common/progress.js';
186+
import { DelayedLogChannel } from '../services/output/common/delayedLogChannel.js';
187187
@@ -131,6 +132,9 @@ export class BrowserMain extends Disposa
188188
// Startup
189189
const instantiationService = workbench.startup();

‎patches/logout.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
2020
===================================================================
2121
--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
2222
+++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
23-
@@ -15,6 +15,7 @@ import { URI } from 'vs/base/common/uri'
23+
@@ -15,6 +15,7 @@ import { URI } from '../../base/common/u
2424
export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
2525
/* ----- code-server ----- */
2626
'disable-update-check': { type: 'boolean' },

‎patches/marketplace.diff

+6-21
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/ext
6969
===================================================================
7070
--- code-server.orig/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
7171
+++ code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
72-
@@ -15,7 +15,6 @@ import { getServiceMachineId } from 'vs/
73-
import { IStorageService } from 'vs/platform/storage/common/storage';
74-
import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
75-
import { getTelemetryLevel, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
76-
-import { RemoteAuthorities } from 'vs/base/common/network';
77-
import { TargetPlatform } from 'vs/platform/extensions/common/extensions';
72+
@@ -15,7 +15,6 @@ import { getServiceMachineId } from '../
73+
import { IStorageService } from '../../storage/common/storage.js';
74+
import { TelemetryLevel } from '../../telemetry/common/telemetry.js';
75+
import { getTelemetryLevel, supportsTelemetry } from '../../telemetry/common/telemetryUtils.js';
76+
-import { RemoteAuthorities } from '../../../base/common/network.js';
77+
import { TargetPlatform } from '../../extensions/common/extensions.js';
7878

7979
const WEB_EXTENSION_RESOURCE_END_POINT_SEGMENT = '/web-extension-resource/';
8080
@@ -140,9 +139,9 @@ export abstract class AbstractExtensionR
@@ -90,18 +90,3 @@ Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/ext
9090
}
9191

9292
}
93-
Index: code-server/lib/vscode/src/vs/platform/extensionManagement/node/extensionDownloader.ts
94-
===================================================================
95-
--- code-server.orig/lib/vscode/src/vs/platform/extensionManagement/node/extensionDownloader.ts
96-
+++ code-server/lib/vscode/src/vs/platform/extensionManagement/node/extensionDownloader.ts
97-
@@ -114,7 +114,10 @@ export class ExtensionsDownloader extend
98-
return false;
99-
}
100-
101-
+ return false
102-
+ // @ts-expect-error
103-
const value = this.configurationService.getValue('extensions.verifySignature');
104-
+ // @ts-expect-error
105-
return isBoolean(value) ? value : true;
106-
}
107-

‎patches/proxy-uri.diff

+12-10
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
9797
--- code-server.orig/lib/vscode/src/vs/code/browser/workbench/workbench.ts
9898
+++ code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
9999
@@ -19,6 +19,7 @@ import { ISecretStorageProvider } from '
100-
import { isFolderToOpen, isWorkspaceToOpen } from 'vs/platform/window/common/window';
101-
import type { IWorkbenchConstructionOptions, IWorkspace, IWorkspaceProvider } from 'vs/workbench/browser/web.api';
102-
import { AuthenticationSessionInfo } from 'vs/workbench/services/authentication/browser/authenticationService';
103-
+import { extractLocalHostUriMetaDataForPortMapping, TunnelOptions, TunnelCreationOptions } from 'vs/platform/tunnel/common/tunnel';
104-
import type { IURLCallbackProvider } from 'vs/workbench/services/url/browser/urlService';
105-
import { create } from 'vs/workbench/workbench.web.main';
100+
import { isFolderToOpen, isWorkspaceToOpen } from '../../../platform/window/common/window.js';
101+
import type { IWorkbenchConstructionOptions, IWorkspace, IWorkspaceProvider } from '../../../workbench/browser/web.api.js';
102+
import { AuthenticationSessionInfo } from '../../../workbench/services/authentication/browser/authenticationService.js';
103+
+import { extractLocalHostUriMetaDataForPortMapping, TunnelOptions, TunnelCreationOptions } from '../../../platform/tunnel/common/tunnel.js';
104+
import type { IURLCallbackProvider } from '../../../workbench/services/url/browser/urlService.js';
105+
import { create } from '../../../workbench/workbench.web.main.internal.js';
106106

107107
@@ -571,6 +572,39 @@ class WorkspaceProvider implements IWork
108108
settingsSyncOptions: config.settingsSyncOptions ? { enabled: config.settingsSyncOptions.enabled, } : undefined,
@@ -148,12 +148,14 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/remote/browser/remoteExpl
148148
===================================================================
149149
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
150150
+++ code-server/lib/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
151-
@@ -77,7 +77,7 @@ export class ForwardedPortsView extends
152-
private async enableForwardedPortsView() {
151+
@@ -77,8 +77,8 @@ export class ForwardedPortsView extends
152+
private async enableForwardedPortsFeatures() {
153153
this.contextKeyListener.clear();
154154

155+
- const featuresEnabled: boolean = !!forwardedPortsFeaturesEnabled.getValue(this.contextKeyService);
155156
- const viewEnabled: boolean = !!forwardedPortsViewEnabled.getValue(this.contextKeyService);
157+
+ const featuresEnabled: boolean = true;
156158
+ const viewEnabled: boolean = true;
157159

158-
if (viewEnabled) {
159-
const viewContainer = await this.getViewContainer();
160+
if (featuresEnabled || viewEnabled) {
161+
// Also enable the view if it isn't already.

‎patches/sourcemaps.diff

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js
1010
===================================================================
1111
--- code-server.orig/lib/vscode/build/gulpfile.reh.js
1212
+++ code-server/lib/vscode/build/gulpfile.reh.js
13-
@@ -288,8 +288,7 @@ function packageTask(type, platform, arc
13+
@@ -289,8 +289,7 @@ function packageTask(type, platform, arc
1414

1515
const src = gulp.src(sourceFolderName + '/**', { base: '.' })
1616
.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + sourceFolderName), 'out'); }))
@@ -20,7 +20,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js
2020

2121
const workspaceExtensionPoints = ['debuggers', 'jsonValidation'];
2222
const isUIExtension = (manifest) => {
23-
@@ -328,9 +327,9 @@ function packageTask(type, platform, arc
23+
@@ -329,9 +328,9 @@ function packageTask(type, platform, arc
2424
.map(name => `.build/extensions/${name}/**`);
2525

2626
const extensions = gulp.src(extensionPaths, { base: '.build', dot: true });
@@ -32,7 +32,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js
3232

3333
let version = packageJson.version;
3434
const quality = product.quality;
35-
@@ -504,7 +503,7 @@ function tweakProductForServerWeb(produc
35+
@@ -505,7 +504,7 @@ function tweakProductForServerWeb(produc
3636
const minifyTask = task.define(`minify-vscode-${type}`, task.series(
3737
optimizeTask,
3838
util.rimraf(`out-vscode-${type}-min`),

‎patches/store-socket.diff

+15-16
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,23 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostExtensionService.
1515
===================================================================
1616
--- code-server.orig/lib/vscode/src/vs/workbench/api/node/extHostExtensionService.ts
1717
+++ code-server/lib/vscode/src/vs/workbench/api/node/extHostExtensionService.ts
18-
@@ -2,7 +2,7 @@
19-
* Copyright (c) Microsoft Corporation. All rights reserved.
18+
@@ -3,6 +3,7 @@
2019
* Licensed under the MIT License. See License.txt in the project root for license information.
2120
*--------------------------------------------------------------------------------------------*/
22-
-
21+
2322
+import * as _http from 'http';
24-
import * as performance from 'vs/base/common/performance';
25-
import { createApiFactoryAndRegisterActors } from 'vs/workbench/api/common/extHost.api.impl';
26-
import { RequireInterceptor } from 'vs/workbench/api/common/extHostRequireInterceptor';
27-
@@ -17,6 +17,7 @@ import { ExtensionRuntime } from 'vs/wor
28-
import { CLIServer } from 'vs/workbench/api/node/extHostCLIServer';
29-
import { realpathSync } from 'vs/base/node/extpath';
30-
import { ExtHostConsoleForwarder } from 'vs/workbench/api/node/extHostConsoleForwarder';
31-
+import { IExtHostWorkspace } from '../common/extHostWorkspace';
32-
import { ExtHostDiskFileSystemProvider } from 'vs/workbench/api/node/extHostDiskFileSystemProvider';
23+
import * as performance from '../../../base/common/performance.js';
24+
import { createApiFactoryAndRegisterActors } from '../common/extHost.api.impl.js';
25+
import { RequireInterceptor } from '../common/extHostRequireInterceptor.js';
26+
@@ -17,6 +18,7 @@ import { ExtensionRuntime } from '../com
27+
import { CLIServer } from './extHostCLIServer.js';
28+
import { realpathSync } from '../../../base/node/extpath.js';
29+
import { ExtHostConsoleForwarder } from './extHostConsoleForwarder.js';
30+
+import { IExtHostWorkspace } from '../common/extHostWorkspace.js';
31+
import { ExtHostDiskFileSystemProvider } from './extHostDiskFileSystemProvider.js';
3332
// ESM-uncomment-begin
34-
// import { createRequire } from 'node:module';
35-
@@ -87,6 +88,52 @@ export class ExtHostExtensionService ext
33+
import { createRequire } from 'node:module';
34+
@@ -101,6 +103,52 @@ export class ExtHostExtensionService ext
3635
await interceptor.install();
3736
performance.mark('code/extHost/didInitAPI');
3837

@@ -84,7 +83,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostExtensionService.
8483
+
8584
// Do this when extension service exists, but extensions are not being activated yet.
8685
const configProvider = await this._extHostConfiguration.getConfigProvider();
87-
await connectProxyResolver(this._extHostWorkspace, configProvider, this, this._logService, this._mainThreadTelemetryProxy, this._initData);
86+
await connectProxyResolver(this._extHostWorkspace, configProvider, this, this._logService, this._mainThreadTelemetryProxy, this._initData, this._store);
8887
Index: code-server/lib/vscode/src/vs/workbench/api/node/extensionHostProcess.ts
8988
===================================================================
9089
--- code-server.orig/lib/vscode/src/vs/workbench/api/node/extensionHostProcess.ts
@@ -97,7 +96,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extensionHostProcess.ts
9796
import minimist from 'minimist';
9897
import * as nativeWatchdog from 'native-watchdog';
9998
import * as net from 'net';
100-
@@ -421,7 +422,28 @@ async function startExtensionHostProcess
99+
@@ -424,7 +425,28 @@ async function startExtensionHostProcess
101100
);
102101

103102
// rewrite onTerminate-function to be a proper shutdown

‎patches/telemetry.diff

+11-11
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
1717

1818
import { hostname, release } from 'os';
1919
+import { promises as fs } from 'fs';
20-
import { Emitter, Event } from 'vs/base/common/event';
21-
import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
22-
import { Schemas } from 'vs/base/common/network';
20+
import { Emitter, Event } from '../../base/common/event.js';
21+
import { DisposableStore, toDisposable } from '../../base/common/lifecycle.js';
22+
import { Schemas } from '../../base/common/network.js';
2323
@@ -65,6 +66,7 @@ import { IExtensionsScannerService } fro
24-
import { ExtensionsScannerService } from 'vs/server/node/extensionsScannerService';
25-
import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
26-
import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
27-
+import { TelemetryClient } from 'vs/server/node/telemetryClient';
28-
import { NullPolicyService } from 'vs/platform/policy/common/policy';
29-
import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
30-
import { LoggerService } from 'vs/platform/log/node/loggerService';
24+
import { ExtensionsScannerService } from './extensionsScannerService.js';
25+
import { IExtensionsProfileScannerService } from '../../platform/extensionManagement/common/extensionsProfileScannerService.js';
26+
import { IUserDataProfilesService } from '../../platform/userDataProfile/common/userDataProfile.js';
27+
+import { TelemetryClient } from './telemetryClient.js';
28+
import { NullPolicyService } from '../../platform/policy/common/policy.js';
29+
import { OneDataSystemAppender } from '../../platform/telemetry/node/1dsAppender.js';
30+
import { LoggerService } from '../../platform/log/node/loggerService.js';
3131
@@ -151,11 +153,23 @@ export async function setupServerService
32-
const requestService = new RequestService(configurationService, environmentService, logService, loggerService);
32+
const requestService = new RequestService(configurationService, environmentService, logService);
3333
services.set(IRequestService, requestService);
3434

3535
+ let isContainer = undefined;

‎patches/unique-db.diff

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ Index: code-server/lib/vscode/src/vs/workbench/services/storage/browser/storageS
1414
--- code-server.orig/lib/vscode/src/vs/workbench/services/storage/browser/storageService.ts
1515
+++ code-server/lib/vscode/src/vs/workbench/services/storage/browser/storageService.ts
1616
@@ -18,6 +18,7 @@ import { AbstractStorageService, isProfi
17-
import { isUserDataProfile, IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
18-
import { IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
19-
import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
20-
+import { hash } from 'vs/base/common/hash';
17+
import { isUserDataProfile, IUserDataProfile } from '../../../../platform/userDataProfile/common/userDataProfile.js';
18+
import { IAnyWorkspaceIdentifier } from '../../../../platform/workspace/common/workspace.js';
19+
import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
20+
+import { hash } from '../../../../base/common/hash.js';
2121

2222
export class BrowserStorageService extends AbstractStorageService {
2323

‎patches/update-check.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
117117
===================================================================
118118
--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
119119
+++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
120-
@@ -13,6 +13,8 @@ import { memoize } from 'vs/base/common/
121-
import { URI } from 'vs/base/common/uri';
120+
@@ -13,6 +13,8 @@ import { memoize } from '../../base/comm
121+
import { URI } from '../../base/common/uri.js';
122122

123123
export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
124124
+ /* ----- code-server ----- */

0 commit comments

Comments
 (0)
Please sign in to comment.