Skip to content

Commit 954ceae

Browse files
benz0libenz0li
authored
Update Code to 1.109.0 (#7661)
1 parent e90504b commit 954ceae

File tree

11 files changed

+25
-25
lines changed

11 files changed

+25
-25
lines changed

‎lib/vscode‎

Submodule vscode updated 1391 files

‎patches/base-path.diff‎

Lines changed: 1 addition & 1 deletion
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-
@@ -237,7 +237,9 @@ class RemoteAuthoritiesImpl {
13+
@@ -242,7 +242,9 @@ class RemoteAuthoritiesImpl {
1414
return URI.from({
1515
scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource,
1616
authority: `${host}:${port}`,

‎patches/clipboard.diff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/browser/mainThreadCLICommands
1010
import { CommandsRegistry, ICommandService } from '../../../platform/commands/common/commands.js';
1111
import { IExtensionGalleryService, IExtensionManagementService } from '../../../platform/extensionManagement/common/extensionManagement.js';
1212
import { ExtensionManagementCLI } from '../../../platform/extensionManagement/common/extensionManagementCLI.js';
13-
@@ -95,6 +96,11 @@ CommandsRegistry.registerCommand('_remot
13+
@@ -96,6 +97,11 @@ CommandsRegistry.registerCommand('_remot
1414

1515
});
1616

@@ -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-
@@ -173,6 +181,10 @@ export class CLIServerBase {
53+
@@ -176,6 +184,10 @@ export class CLIServerBase {
5454
return await this._commands.executeCommand<string | undefined>('_remoteCLI.getSystemStatus');
5555
}
5656

‎patches/display-language.diff‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,10 +335,10 @@ 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/src/vs/workbench/workbench.web.main.internal.ts
338+
Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
339339
===================================================================
340-
--- code-server.orig/lib/vscode/src/vs/workbench/workbench.web.main.internal.ts
341-
+++ code-server/lib/vscode/src/vs/workbench/workbench.web.main.internal.ts
340+
--- code-server.orig/lib/vscode/src/vs/workbench/workbench.web.main.ts
341+
+++ code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
342342
@@ -54,7 +54,7 @@ import './services/dialogs/browser/fileD
343343
import './services/host/browser/browserHostService.js';
344344
import './services/lifecycle/browser/lifecycleService.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 } 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, 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, 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';
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-
@@ -69,7 +69,7 @@ export class WorkbenchContextKeysHandler
141+
@@ -72,7 +72,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-
@@ -199,6 +199,10 @@ export class WorkbenchContextKeysHandler
150+
@@ -207,6 +207,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-
@@ -39,6 +39,9 @@ export const EmbedderIdentifierContext =
210+
@@ -43,6 +43,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-
@@ -1597,7 +1598,8 @@ export class FileDragAndDrop implements
293+
@@ -1586,7 +1587,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-
@@ -1822,15 +1824,17 @@ export class FileDragAndDrop implements
303+
@@ -1811,15 +1813,17 @@ export class FileDragAndDrop implements
304304

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

‎patches/getting-started.diff‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
2828
import { IEditorOpenContext, IEditorSerializer } from '../../../common/editor.js';
2929
import { IWebviewElement, IWebviewService } from '../../webview/browser/webview.js';
3030
import './gettingStartedColors.js';
31-
@@ -920,6 +920,72 @@ export class GettingStartedPage extends
31+
@@ -925,6 +925,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-
@@ -955,6 +1021,9 @@ export class GettingStartedPage extends
104+
@@ -960,6 +1026,9 @@ export class GettingStartedPage extends
105105
recentList.setLimit(5);
106106
reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
107107
}
@@ -217,12 +217,12 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
217217
import { Disposable } from '../../base/common/lifecycle.js';
218218
import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from '../../platform/contextkey/common/contextkey.js';
219219
import { 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, AuxiliaryBarMaximizedContext, InAutomationContext, 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, AuxiliaryBarMaximizedContext, InAutomationContext, IsEnabledFileDownloads, IsEnabledFileUploads, IsEnabledCoderGettingStarted, } from '../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, AuxiliaryBarMaximizedContext, InAutomationContext, IsAgentSessionsWorkspaceContext, WorkbenchModeContext, 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, AuxiliaryBarMaximizedContext, InAutomationContext, IsAgentSessionsWorkspaceContext, WorkbenchModeContext, IsEnabledFileDownloads, IsEnabledFileUploads, IsEnabledCoderGettingStarted, } from '../common/contextkeys.js';
222222
import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from '../services/editor/common/editorGroupsService.js';
223223
import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
224224
import { IBrowserWorkbenchEnvironmentService } from '../services/environment/browser/environmentService.js';
225-
@@ -202,6 +202,7 @@ export class WorkbenchContextKeysHandler
225+
@@ -210,6 +210,7 @@ export class WorkbenchContextKeysHandler
226226
// code-server
227227
IsEnabledFileDownloads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileDownloads ?? true)
228228
IsEnabledFileUploads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileUploads ?? true)
@@ -234,7 +234,7 @@ Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
234234
===================================================================
235235
--- code-server.orig/lib/vscode/src/vs/workbench/common/contextkeys.ts
236236
+++ code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
237-
@@ -41,6 +41,7 @@ export const InAutomationContext = new R
237+
@@ -45,6 +45,7 @@ export const InAutomationContext = new R
238238

239239
export const IsEnabledFileDownloads = new RawContextKey<boolean>('isEnabledFileDownloads', true, true);
240240
export const IsEnabledFileUploads = new RawContextKey<boolean>('isEnabledFileUploads', true, true);

‎patches/integration.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
172172
import { IProgressService } from '../../platform/progress/common/progress.js';
173173
import { DelayedLogChannel } from '../services/output/common/delayedLogChannel.js';
174174
import { dirname, joinPath } from '../../base/common/resources.js';
175-
@@ -133,6 +134,9 @@ export class BrowserMain extends Disposa
175+
@@ -135,6 +136,9 @@ export class BrowserMain extends Disposa
176176
// Startup
177177
const instantiationService = workbench.startup();
178178

‎patches/local-storage.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/configuration/browser/co
6666
===================================================================
6767
--- code-server.orig/lib/vscode/src/vs/workbench/services/configuration/browser/configurationService.ts
6868
+++ code-server/lib/vscode/src/vs/workbench/services/configuration/browser/configurationService.ts
69-
@@ -147,8 +147,10 @@ export class WorkspaceService extends Di
69+
@@ -146,8 +146,10 @@ export class WorkspaceService extends Di
7070
this.workspaceConfiguration = this._register(new WorkspaceConfiguration(configurationCache, fileService, uriIdentityService, logService));
7171
this._register(this.workspaceConfiguration.onDidUpdateConfiguration(fromCache => {
7272
this.onWorkspaceConfigurationChanged(fromCache).then(() => {

‎patches/store-socket.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extensionHostProcess.ts
9494

9595
+import * as _http from 'http';
9696
import minimist from 'minimist';
97-
import * as nativeWatchdog from 'native-watchdog';
97+
import * as nativeWatchdog from '@vscode/native-watchdog';
9898
import * as net from 'net';
9999
@@ -469,7 +470,28 @@ async function startExtensionHostProcess
100100
);

‎patches/update-check.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
101101

102102
readonly version: string;
103103
readonly date?: string;
104-
@@ -113,6 +114,7 @@ export interface IProductConfiguration {
104+
@@ -114,6 +115,7 @@ export interface IProductConfiguration {
105105
readonly resourceUrlTemplate: string;
106106
readonly nlsBaseUrl: string;
107107
readonly accessSKUs?: string[];

0 commit comments

Comments
 (0)