Skip to content

Commit cafbdd3

Browse files
benz0libenz0li
committed
Update Code to 1.102.0
1 parent 70be9fe commit cafbdd3

13 files changed

+50
-62
lines changed

‎lib/vscode

Submodule vscode updated 1393 files

‎patches/base-path.diff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Index: code-server/lib/vscode/src/vs/base/common/network.ts
1010
===================================================================
1111
--- code-server.orig/lib/vscode/src/vs/base/common/network.ts
1212
+++ code-server/lib/vscode/src/vs/base/common/network.ts
13-
@@ -220,7 +220,9 @@ class RemoteAuthoritiesImpl {
13+
@@ -223,7 +223,9 @@ class RemoteAuthoritiesImpl {
1414
return URI.from({
1515
scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource,
1616
authority: `${host}:${port}`,
@@ -253,7 +253,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
253253
===================================================================
254254
--- code-server.orig/lib/vscode/src/vs/code/browser/workbench/workbench.ts
255255
+++ code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
256-
@@ -332,7 +332,8 @@ class LocalStorageURLCallbackProvider ex
256+
@@ -333,7 +333,8 @@ class LocalStorageURLCallbackProvider ex
257257
this.startListening();
258258
}
259259

@@ -263,7 +263,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
263263
}
264264

265265
private startListening(): void {
266-
@@ -579,17 +580,6 @@ class WorkspaceProvider implements IWork
266+
@@ -578,17 +579,6 @@ class WorkspaceProvider implements IWork
267267
}
268268
}
269269

@@ -281,7 +281,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
281281
(function () {
282282

283283
// Find config by checking for DOM
284-
@@ -598,8 +588,8 @@ function readCookie(name: string): strin
284+
@@ -597,8 +587,8 @@ function readCookie(name: string): strin
285285
if (!configElement || !configElementAttribute) {
286286
throw new Error('Missing web configuration element');
287287
}

‎patches/clipboard.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ 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-
@@ -122,6 +122,7 @@ export interface NativeParsedArgs {
81+
@@ -134,6 +134,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-
@@ -91,6 +91,7 @@ export const OPTIONS: OptionDescriptions
93+
@@ -104,6 +104,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/display-language.diff

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ 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-
@@ -255,6 +255,9 @@ export async function setupServerService
22-
const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority));
23-
socketServer.registerChannel('extensions', channel);
21+
@@ -267,6 +267,9 @@ export async function setupServerService
22+
23+
socketServer.registerChannel('mcpManagement', new McpManagementChannel(mcpManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)));
2424

2525
+ const languagePackChannel = ProxyChannel.fromService<RemoteAgentConnectionContext>(accessor.get(ILanguagePackService), disposables);
2626
+ socketServer.registerChannel('languagePacks', languagePackChannel);
@@ -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-
@@ -101,7 +101,7 @@ export abstract class AbstractNativeEnvi
35+
@@ -98,7 +98,7 @@ export abstract class AbstractNativeEnvi
3636
return URI.file(join(vscodePortable, 'argv.json'));
3737
}
3838

@@ -190,15 +190,15 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
190190
===================================================================
191191
--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
192192
+++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
193-
@@ -19,6 +19,7 @@ export const serverOptions: OptionDescri
193+
@@ -21,6 +21,7 @@ export const serverOptions: OptionDescri
194194
'disable-file-downloads': { type: 'boolean' },
195195
'disable-file-uploads': { type: 'boolean' },
196196
'disable-getting-started-override': { type: 'boolean' },
197197
+ 'locale': { type: 'string' },
198198

199199
/* ----- server setup ----- */
200200

201-
@@ -107,6 +108,7 @@ export interface ServerParsedArgs {
201+
@@ -109,6 +110,7 @@ export interface ServerParsedArgs {
202202
'disable-file-downloads'?: boolean;
203203
'disable-file-uploads'?: boolean;
204204
'disable-getting-started-override'?: boolean,
@@ -244,10 +244,10 @@ Index: code-server/lib/vscode/src/vs/platform/languagePacks/browser/languagePack
244244
+ return this.languagePackService.getInstalledLanguages()
245245
}
246246
}
247-
Index: code-server/lib/vscode/src/vs/workbench/services/localization/electron-sandbox/localeService.ts
247+
Index: code-server/lib/vscode/src/vs/workbench/services/localization/electron-browser/localeService.ts
248248
===================================================================
249-
--- code-server.orig/lib/vscode/src/vs/workbench/services/localization/electron-sandbox/localeService.ts
250-
+++ code-server/lib/vscode/src/vs/workbench/services/localization/electron-sandbox/localeService.ts
249+
--- code-server.orig/lib/vscode/src/vs/workbench/services/localization/electron-browser/localeService.ts
250+
+++ code-server/lib/vscode/src/vs/workbench/services/localization/electron-browser/localeService.ts
251251
@@ -51,7 +51,8 @@ class NativeLocaleService implements ILo
252252
@IProductService private readonly productService: IProductService
253253
) { }
@@ -335,18 +335,6 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
335335
}
336336

337337
override async run(): Promise<any> {
338-
Index: code-server/lib/vscode/build/gulpfile.reh.js
339-
===================================================================
340-
--- code-server.orig/lib/vscode/build/gulpfile.reh.js
341-
+++ code-server/lib/vscode/build/gulpfile.reh.js
342-
@@ -58,6 +58,7 @@ const serverResourceIncludes = [
343-
344-
// NLS
345-
'out-build/nls.messages.json',
346-
+ 'out-build/nls.keys.json', // Required to generate translations.
347-
348-
// Process monitor
349-
'out-build/vs/base/node/cpuUsage.sh',
350338
Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.internal.ts
351339
===================================================================
352340
--- code-server.orig/lib/vscode/src/vs/workbench/workbench.web.main.internal.ts
@@ -356,7 +344,7 @@ Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.internal.ts
356344
import './services/lifecycle/browser/lifecycleService.js';
357345
import './services/clipboard/browser/clipboardService.js';
358346
-import './services/localization/browser/localeService.js';
359-
+import './services/localization/electron-sandbox/localeService.js';
347+
+import './services/localization/electron-browser/localeService.js';
360348
import './services/path/browser/pathService.js';
361349
import './services/themes/browser/browserHostColorSchemeService.js';
362350
import './services/encryption/browser/encryptionService.js';

‎patches/external-file-actions.diff

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
9090
===================================================================
9191
--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
9292
+++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
93-
@@ -16,6 +16,8 @@ export const serverOptions: OptionDescri
93+
@@ -18,6 +18,8 @@ export const serverOptions: OptionDescri
9494
/* ----- code-server ----- */
9595
'disable-update-check': { type: 'boolean' },
9696
'auth': { type: 'string' },
@@ -99,7 +99,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
9999

100100
/* ----- server setup ----- */
101101

102-
@@ -101,6 +103,8 @@ export interface ServerParsedArgs {
102+
@@ -103,6 +105,8 @@ export interface ServerParsedArgs {
103103
/* ----- code-server ----- */
104104
'disable-update-check'?: boolean;
105105
'auth'?: string;
@@ -129,8 +129,8 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
129129
import { Disposable, DisposableStore } from '../../base/common/lifecycle.js';
130130
import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from '../../platform/contextkey/common/contextkey.js';
131131
import { InputFocusedContext, 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 } 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, 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 } 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, IsEnabledFileDownloads, IsEnabledFileUploads } from '../common/contextkeys.js';
134134
import { trackFocus, addDisposableListener, EventType, onDidRegisterWindow, getActiveWindow, isEditableElement } from '../../base/browser/dom.js';
135135
import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from '../services/editor/common/editorGroupsService.js';
136136
import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
@@ -139,7 +139,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
139139
import { WorkbenchState, IWorkspaceContextService, isTemporaryWorkspace } from '../../platform/workspace/common/workspace.js';
140140
import { IWorkbenchLayoutService, Parts, positionToString } from '../services/layout/browser/layoutService.js';
141141
import { getRemoteName } from '../../platform/remote/common/remoteHosts.js';
142-
@@ -70,7 +70,7 @@ export class WorkbenchContextKeysHandler
142+
@@ -71,7 +71,7 @@ export class WorkbenchContextKeysHandler
143143
@IContextKeyService private readonly contextKeyService: IContextKeyService,
144144
@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
145145
@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -148,9 +148,9 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
148148
@IProductService private readonly productService: IProductService,
149149
@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
150150
@IEditorService private readonly editorService: IEditorService,
151-
@@ -197,6 +197,10 @@ export class WorkbenchContextKeysHandler
152-
this.auxiliaryBarVisibleContext = AuxiliaryBarVisibleContext.bindTo(this.contextKeyService);
153-
this.auxiliaryBarVisibleContext.set(this.layoutService.isVisible(Parts.AUXILIARYBAR_PART));
151+
@@ -200,6 +200,10 @@ export class WorkbenchContextKeysHandler
152+
this.auxiliaryBarMaximizedContext = AuxiliaryBarMaximizedContext.bindTo(this.contextKeyService);
153+
this.auxiliaryBarMaximizedContext.set(this.layoutService.isAuxiliaryBarMaximized());
154154

155155
+ // code-server
156156
+ IsEnabledFileDownloads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileDownloads ?? true)
@@ -330,23 +330,23 @@ Index: code-server/lib/vscode/src/vs/platform/files/node/diskFileSystemProviderS
330330
===================================================================
331331
--- code-server.orig/lib/vscode/src/vs/platform/files/node/diskFileSystemProviderServer.ts
332332
+++ code-server/lib/vscode/src/vs/platform/files/node/diskFileSystemProviderServer.ts
333-
@@ -92,6 +92,7 @@ export abstract class AbstractDiskFileSy
333+
@@ -99,6 +99,7 @@ export abstract class AbstractDiskFileSy
334334

335335
private async readFile(uriTransformer: IURITransformer, _resource: UriComponents, opts?: IFileAtomicReadOptions): Promise<VSBuffer> {
336336
const resource = this.transformIncoming(uriTransformer, _resource, true);
337337
+ this.logService.trace(`File action: readFile ${resource.path}`);
338338
const buffer = await this.provider.readFile(resource, opts);
339339

340340
return VSBuffer.wrap(buffer);
341-
@@ -110,6 +111,7 @@ export abstract class AbstractDiskFileSy
341+
@@ -117,6 +118,7 @@ export abstract class AbstractDiskFileSy
342342
}
343343
});
344344

345345
+ this.logService.trace(`File action: readFileStream ${resource.path}`);
346346
const fileStream = this.provider.readFileStream(resource, opts, cts.token);
347347
listenStream(fileStream, {
348348
onData: chunk => emitter.fire(VSBuffer.wrap(chunk)),
349-
@@ -130,7 +132,7 @@ export abstract class AbstractDiskFileSy
349+
@@ -137,7 +139,7 @@ export abstract class AbstractDiskFileSy
350350

351351
private writeFile(uriTransformer: IURITransformer, _resource: UriComponents, content: VSBuffer, opts: IFileWriteOptions): Promise<void> {
352352
const resource = this.transformIncoming(uriTransformer, _resource);

0 commit comments

Comments
 (0)