Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 30321ab

Browse files
authored
Update Code to 1.105.0 (#7523)
1 parent cd40509 commit 30321ab

File tree

7 files changed

+18
-19
lines changed

7 files changed

+18
-19
lines changed

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.18.0
1+
22.19.0

‎lib/vscode‎

Submodule vscode updated 922 files

‎patches/base-path.diff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ Index: code-server/lib/vscode/src/vs/platform/remote/browser/browserSocketFactor
105105
const webSocketSchema = (/^https:/.test(mainWindow.location.href) ? 'wss' : 'ws');
106106
+ path = (mainWindow.location.pathname + "/" + path).replace(/\/\/+/g, "/")
107107
const socket = this._webSocketFactory.create(`${webSocketSchema}://${(/:/.test(host) && !/\[/.test(host)) ? `[${host}]` : host}:${port}${path}?${query}&skipWebSocketFrames=false`, debugLabel);
108-
const errorListener = socket.onError(reject);
109-
socket.onOpen(() => {
108+
const disposables = new DisposableStore();
109+
disposables.add(socket.onError(reject));
110110
Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
111111
===================================================================
112112
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts

‎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-
@@ -106,10 +106,14 @@ class RemoteTerminalBackend extends Base
20+
@@ -107,10 +107,14 @@ class RemoteTerminalBackend extends Base
2121
}
2222
const reqId = e.reqId;
2323
const commandId = e.commandId;

‎patches/clipboard.diff‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTe
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-
@@ -97,7 +97,7 @@ class RemoteTerminalBackend extends Base
68+
@@ -98,7 +98,7 @@ class RemoteTerminalBackend extends Base
6969
}
7070
});
7171

@@ -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-
@@ -135,6 +135,7 @@ export interface NativeParsedArgs {
81+
@@ -136,6 +136,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-
@@ -104,6 +104,7 @@ export const OPTIONS: OptionDescriptions
93+
@@ -105,6 +105,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/external-file-actions.diff‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,21 +125,20 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
125125
===================================================================
126126
--- code-server.orig/lib/vscode/src/vs/workbench/browser/contextkeys.ts
127127
+++ code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
128-
@@ -7,11 +7,11 @@ import { Event } from '../../base/common
129-
import { Disposable, DisposableStore, MutableDisposable } from '../../base/common/lifecycle.js';
128+
@@ -6,10 +6,10 @@
129+
import { Disposable } from '../../base/common/lifecycle.js';
130130
import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from '../../platform/contextkey/common/contextkey.js';
131-
import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext, IsSimulationContext } from '../../platform/contextkey/common/contextkeys.js';
131+
import { IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from '../../platform/contextkey/common/contextkeys.js';
132132
-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';
133133
+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';
134-
import { trackFocus, addDisposableListener, EventType, onDidRegisterWindow, getActiveWindow, isEditableElement } from '../../base/browser/dom.js';
135134
import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from '../services/editor/common/editorGroupsService.js';
136135
import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
137136
-import { IWorkbenchEnvironmentService } from '../services/environment/common/environmentService.js';
138137
+import { IBrowserWorkbenchEnvironmentService } from '../services/environment/browser/environmentService.js';
139138
import { WorkbenchState, IWorkspaceContextService, isTemporaryWorkspace } from '../../platform/workspace/common/workspace.js';
140139
import { IWorkbenchLayoutService, Parts, positionToString } from '../services/layout/browser/layoutService.js';
141140
import { getRemoteName } from '../../platform/remote/common/remoteHosts.js';
142-
@@ -72,7 +72,7 @@ export class WorkbenchContextKeysHandler
141+
@@ -69,7 +69,7 @@ export class WorkbenchContextKeysHandler
143142
@IContextKeyService private readonly contextKeyService: IContextKeyService,
144143
@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
145144
@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -148,7 +147,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
148147
@IProductService private readonly productService: IProductService,
149148
@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
150149
@IEditorService private readonly editorService: IEditorService,
151-
@@ -208,6 +208,10 @@ export class WorkbenchContextKeysHandler
150+
@@ -199,6 +199,10 @@ export class WorkbenchContextKeysHandler
152151
this.auxiliaryBarMaximizedContext = AuxiliaryBarMaximizedContext.bindTo(this.contextKeyService);
153152
this.auxiliaryBarMaximizedContext.set(this.layoutService.isAuxiliaryBarMaximized());
154153

‎patches/getting-started.diff‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,16 +213,16 @@ 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 '../../base/common
217-
import { Disposable, DisposableStore, MutableDisposable } from '../../base/common/lifecycle.js';
216+
@@ -6,7 +6,7 @@
217+
import { Disposable } from '../../base/common/lifecycle.js';
218218
import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from '../../platform/contextkey/common/contextkey.js';
219-
import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext, IsSimulationContext } from '../../platform/contextkey/common/contextkeys.js';
219+
import { IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from '../../platform/contextkey/common/contextkeys.js';
220220
-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';
221221
+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';
222-
import { trackFocus, addDisposableListener, EventType, onDidRegisterWindow, getActiveWindow, isEditableElement } from '../../base/browser/dom.js';
223222
import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from '../services/editor/common/editorGroupsService.js';
224223
import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
225-
@@ -211,6 +211,7 @@ export class WorkbenchContextKeysHandler
224+
import { IBrowserWorkbenchEnvironmentService } from '../services/environment/browser/environmentService.js';
225+
@@ -202,6 +202,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)

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /