Skip to content

Commit 339c392

Browse files
authored
Update Code to 1.106.0 (#7569)
1 parent 897b5f1 commit 339c392

File tree

10 files changed

+22
-22
lines changed

10 files changed

+22
-22
lines changed

.node-version

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

lib/vscode

Submodule vscode updated 2536 files

patches/base-path.diff

Lines changed: 5 additions & 5 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-
@@ -232,7 +232,9 @@ class RemoteAuthoritiesImpl {
13+
@@ -237,7 +237,9 @@ class RemoteAuthoritiesImpl {
1414
return URI.from({
1515
scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource,
1616
authority: `${host}:${port}`,
@@ -99,7 +99,7 @@ Index: code-server/lib/vscode/src/vs/platform/remote/browser/browserSocketFactor
9999
===================================================================
100100
--- code-server.orig/lib/vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
101101
+++ code-server/lib/vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
102-
@@ -281,6 +281,7 @@ export class BrowserSocketFactory implem
102+
@@ -282,6 +282,7 @@ export class BrowserSocketFactory implem
103103
connect({ host, port }: WebSocketRemoteConnection, path: string, query: string, debugLabel: string): Promise<ISocket> {
104104
return new Promise<ISocket>((resolve, reject) => {
105105
const webSocketSchema = (/^https:/.test(mainWindow.location.href) ? 'wss' : 'ws');
@@ -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-
@@ -338,7 +338,8 @@ class LocalStorageURLCallbackProvider ex
256+
@@ -339,7 +339,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-
@@ -583,17 +584,6 @@ class WorkspaceProvider implements IWork
266+
@@ -584,17 +585,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-
@@ -602,8 +592,8 @@ function readCookie(name: string): strin
284+
@@ -604,8 +594,8 @@ function readCookie(name: string): strin
285285
if (!configElement || !configElementAttribute) {
286286
throw new Error('Missing web configuration element');
287287
}

patches/clipboard.diff

Lines changed: 1 addition & 1 deletion
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-
@@ -136,6 +136,7 @@ export interface NativeParsedArgs {
81+
@@ -137,6 +137,7 @@ export interface NativeParsedArgs {
8282
'disable-chromium-sandbox'?: boolean;
8383
sandbox?: boolean;
8484
'enable-coi'?: boolean;

patches/external-file-actions.diff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ Index: code-server/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFi
239239
@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService,
240240
@IPathService protected readonly pathService: IPathService,
241241
@IKeybindingService private readonly keybindingService: IKeybindingService,
242-
@@ -310,20 +310,22 @@ export class SimpleFileDialog extends Di
243-
this.filePickBox.ignoreFocusOut = true;
242+
@@ -311,20 +311,22 @@ export class SimpleFileDialog extends Di
243+
this.filePickBox.placeholder = nls.localize('remoteFileDialog.placeholder', "Folder path");
244244
this.filePickBox.ok = true;
245245
this.filePickBox.okLabel = typeof this.options.openLabel === 'string' ? this.options.openLabel : this.options.openLabel?.withoutMnemonic;
246246
- if ((this.scheme !== Schemas.file) && this.options && this.options.availableFileSystems && (this.options.availableFileSystems.length > 1) && (this.options.availableFileSystems.indexOf(Schemas.file) > -1)) {
@@ -288,7 +288,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explo
288288
import { WorkbenchCompressibleAsyncDataTree } from '../../../../../platform/list/browser/listService.js';
289289
import { ISearchService, QueryType, getExcludes, ISearchConfiguration, ISearchComplete, IFileQuery } from '../../../../services/search/common/search.js';
290290
import { CancellationToken } from '../../../../../base/common/cancellation.js';
291-
@@ -1601,7 +1602,8 @@ export class FileDragAndDrop implements
291+
@@ -1594,7 +1595,8 @@ export class FileDragAndDrop implements
292292
@IConfigurationService private configurationService: IConfigurationService,
293293
@IInstantiationService private instantiationService: IInstantiationService,
294294
@IWorkspaceEditingService private workspaceEditingService: IWorkspaceEditingService,
@@ -298,7 +298,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explo
298298
) {
299299
const updateDropEnablement = (e: IConfigurationChangeEvent | undefined) => {
300300
if (!e || e.affectsConfiguration('explorer.enableDragAndDrop')) {
301-
@@ -1826,15 +1828,17 @@ export class FileDragAndDrop implements
301+
@@ -1819,15 +1821,17 @@ export class FileDragAndDrop implements
302302

303303
// External file DND (Import/Upload file)
304304
if (data instanceof NativeDragAndDropData) {

patches/getting-started.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
1919
import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
2020
import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
2121
import { Button } from '../../../../base/browser/ui/button/button.js';
22-
@@ -54,7 +54,7 @@ import { IRecentFolder, IRecentWorkspace
22+
@@ -53,7 +53,7 @@ import { IRecentFolder, IRecentWorkspace
2323
import { OpenRecentAction } from '../../../browser/actions/windowActions.js';
2424
import { OpenFileFolderAction, OpenFolderAction, OpenFolderViaWorkspaceAction } from '../../../browser/actions/workspaceActions.js';
2525
import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
@@ -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-
@@ -872,6 +872,72 @@ export class GettingStartedPage extends
31+
@@ -902,6 +902,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-
@@ -907,6 +973,9 @@ export class GettingStartedPage extends
104+
@@ -937,6 +1003,9 @@ export class GettingStartedPage extends
105105
recentList.setLimit(5);
106106
reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
107107
}

patches/integration.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ Index: code-server/lib/vscode/src/server-main.ts
265265
+++ code-server/lib/vscode/src/server-main.ts
266266
@@ -22,6 +22,9 @@ import { IServerAPI } from './vs/server/
267267
perf.mark('code/server/start');
268-
(globalThis as any).vscodeServerStartTime = performance.now();
268+
(globalThis as { vscodeServerStartTime?: number }).vscodeServerStartTime = performance.now();
269269

270270
+// This is not indented to make the diff less noisy. We need to move this out
271271
+// of the top-level so it will not run immediately and we can control the start.
@@ -279,7 +279,7 @@ Index: code-server/lib/vscode/src/server-main.ts
279279
}
280280
+}
281281

282-
function sanitizeStringArg(val: any): string | undefined {
282+
function sanitizeStringArg(val: unknown): string | undefined {
283283
if (Array.isArray(val)) { // if an argument is passed multiple times, minimist creates an array
284284
@@ -283,3 +287,22 @@ function prompt(question: string): Promi
285285
});

patches/local-storage.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
3232
+++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
3333
@@ -298,6 +298,11 @@ export interface IWorkbenchConstructionO
3434
*/
35-
readonly configurationDefaults?: Record<string, any>;
35+
readonly configurationDefaults?: Record<string, unknown>;
3636

3737
+ /**
3838
+ * Path to the user data directory.
@@ -79,7 +79,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/configuration/browser/co
7979
});
8080
}));
8181

82-
@@ -555,6 +557,12 @@ export class WorkspaceService extends Di
82+
@@ -556,6 +558,12 @@ export class WorkspaceService extends Di
8383
previousFolders = this.workspace.folders;
8484
this.workspace.update(workspace);
8585
} else {

patches/proxy-uri.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalE
8383
===================================================================
8484
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
8585
+++ code-server/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
86-
@@ -291,7 +291,7 @@ export async function createTerminalEnvi
86+
@@ -292,7 +292,7 @@ export async function createTerminalEnvi
8787

8888
// Sanitize the environment, removing any undesirable VS Code and Electron environment
8989
// variables
@@ -104,7 +104,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
104104
import type { IURLCallbackProvider } from '../../../workbench/services/url/browser/urlService.js';
105105
import { create } from '../../../workbench/workbench.web.main.internal.js';
106106

107-
@@ -604,6 +605,39 @@ class WorkspaceProvider implements IWork
107+
@@ -606,6 +607,39 @@ class WorkspaceProvider implements IWork
108108
settingsSyncOptions: config.settingsSyncOptions ? { enabled: config.settingsSyncOptions.enabled, } : undefined,
109109
workspaceProvider: WorkspaceProvider.create(config),
110110
urlCallbackProvider: new LocalStorageURLCallbackProvider(config.callbackRoute),

patches/store-socket.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extensionHostProcess.ts
9696
import minimist from 'minimist';
9797
import * as nativeWatchdog from 'native-watchdog';
9898
import * as net from 'net';
99-
@@ -449,7 +450,28 @@ async function startExtensionHostProcess
99+
@@ -451,7 +452,28 @@ async function startExtensionHostProcess
100100
);
101101

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

0 commit comments

Comments
 (0)