Skip to content

Commit 022b5c8

Browse files
committed
Rebase patches for all targets
1 parent 7949707 commit 022b5c8

File tree

73 files changed

+1054
-1015
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1054
-1015
lines changed

patches/common/allow-unused-vars.diff

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Index: third-party-src/src/tsconfig.base.json
1+
Index: code-editor-src/src/tsconfig.base.json
22
===================================================================
3-
--- third-party-src.orig/src/tsconfig.base.json
4-
+++ third-party-src/src/tsconfig.base.json
3+
--- code-editor-src.orig/src/tsconfig.base.json
4+
+++ code-editor-src/src/tsconfig.base.json
55
@@ -6,7 +6,7 @@
66
"experimentalDecorators": true,
77
"noImplicitReturns": true,
@@ -11,10 +11,10 @@ Index: third-party-src/src/tsconfig.base.json
1111
"noUncheckedSideEffectImports": true,
1212
"allowUnreachableCode": false,
1313
"strict": true,
14-
Index: third-party-src/src/vs/workbench/contrib/remote/browser/tunnelView.ts
14+
Index: code-editor-src/src/vs/workbench/contrib/remote/browser/tunnelView.ts
1515
===================================================================
16-
--- third-party-src.orig/src/vs/workbench/contrib/remote/browser/tunnelView.ts
17-
+++ third-party-src/src/vs/workbench/contrib/remote/browser/tunnelView.ts
16+
--- code-editor-src.orig/src/vs/workbench/contrib/remote/browser/tunnelView.ts
17+
+++ code-editor-src/src/vs/workbench/contrib/remote/browser/tunnelView.ts
1818
@@ -762,7 +762,7 @@ export class TunnelPanel extends ViewPan
1919
private protocolChangableContextKey: IContextKey<boolean>;
2020
private isEditing: boolean = false;

patches/common/build.diff

Lines changed: 18 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,25 @@
1-
Index: third-party-src/package.json
1+
Index: code-editor-src/package.json
22
===================================================================
3-
--- third-party-src.orig/package.json
4-
+++ third-party-src/package.json
5-
@@ -78,10 +78,10 @@
6-
"@vscode/deviceid": "^0.1.1",
7-
"@vscode/iconv-lite-umd": "0.7.1",
8-
"@vscode/policy-watcher": "^1.3.2",
9-
- "@vscode/proxy-agent": "^0.36.0",
10-
+ "@vscode/proxy-agent": "^0.37.0",
11-
"@vscode/ripgrep": "^1.15.13",
12-
"@vscode/spdlog": "^0.15.2",
13-
- "@vscode/sqlite3": "5.1.10-vscode",
14-
+ "@vscode/sqlite3": "5.1.12-vscode",
15-
"@vscode/sudo-prompt": "9.3.1",
16-
"@vscode/tree-sitter-wasm": "^0.3.0",
17-
"@vscode/vscode-languagedetection": "1.0.21",
18-
@@ -103,7 +103,6 @@
3+
--- code-editor-src.orig/package.json
4+
+++ code-editor-src/package.json
5+
@@ -106,7 +106,6 @@
196
"https-proxy-agent": "^7.0.2",
207
"jschardet": "3.1.4",
218
"katex": "^0.16.22",
229
- "kerberos": "2.1.1",
2310
"minimist": "^1.2.8",
24-
"native-is-elevated": "0.8.0",
11+
"native-is-elevated": "0.9.0",
2512
"native-keymap": "^3.3.5",
26-
@@ -160,7 +159,7 @@
13+
@@ -162,7 +161,7 @@
2714
"css-loader": "^6.9.1",
2815
"debounce": "^1.0.0",
2916
"deemon": "^1.13.6",
30-
- "electron": "39.2.7",
17+
- "electron": "39.3.0",
3118
+ "electron": "40.6.0",
3219
"eslint": "^9.36.0",
3320
"eslint-formatter-compact": "^8.40.0",
3421
"eslint-plugin-header": "3.1.1",
35-
@@ -225,9 +224,19 @@
22+
@@ -226,9 +225,19 @@
3623
},
3724
"overrides": {
3825
"node-gyp-build": "4.8.1",
@@ -55,33 +42,23 @@ Index: third-party-src/package.json
5542
},
5643
"repository": {
5744
"type": "git",
58-
Index: third-party-src/remote/package.json
45+
Index: code-editor-src/remote/package.json
5946
===================================================================
60-
--- third-party-src.orig/remote/package.json
61-
+++ third-party-src/remote/package.json
62-
@@ -7,7 +7,7 @@
63-
"@microsoft/1ds-post-js": "^3.2.13",
64-
"@vscode/deviceid": "^0.1.1",
65-
"@vscode/iconv-lite-umd": "0.7.1",
66-
- "@vscode/proxy-agent": "^0.36.0",
67-
+ "@vscode/proxy-agent": "^0.37.0",
68-
"@vscode/ripgrep": "^1.15.13",
69-
"@vscode/spdlog": "^0.15.2",
70-
"@vscode/tree-sitter-wasm": "^0.3.0",
71-
@@ -30,11 +30,11 @@
47+
--- code-editor-src.orig/remote/package.json
48+
+++ code-editor-src/remote/package.json
49+
@@ -32,10 +32,10 @@
7250
"https-proxy-agent": "^7.0.2",
7351
"jschardet": "3.1.4",
7452
"katex": "^0.16.22",
7553
- "kerberos": "2.1.1",
7654
"minimist": "^1.2.8",
77-
"native-watchdog": "^1.4.1",
78-
"node-pty": "^1.1.0-beta43",
55+
"node-pty": "^1.2.0-beta.10",
7956
"tas-client": "0.3.1",
8057
+ "undici": "^7.18.2",
8158
"vscode-oniguruma": "1.7.0",
8259
"vscode-regexpp": "^3.1.0",
83-
"vscode-textmate": "^9.3.0",
84-
@@ -42,9 +42,6 @@
60+
"vscode-textmate": "^9.3.2",
61+
@@ -43,9 +43,6 @@
8562
"yazl": "^2.4.3"
8663
},
8764
"overrides": {
@@ -92,10 +69,10 @@ Index: third-party-src/remote/package.json
9269
+ "node-gyp-build": "4.8.1"
9370
}
9471
}
95-
Index: third-party-src/build/lib/mangle/index.ts
72+
Index: code-editor-src/build/lib/mangle/index.ts
9673
===================================================================
97-
--- third-party-src.orig/build/lib/mangle/index.ts
98-
+++ third-party-src/build/lib/mangle/index.ts
74+
--- code-editor-src.orig/build/lib/mangle/index.ts
75+
+++ code-editor-src/build/lib/mangle/index.ts
9976
@@ -430,7 +430,7 @@ export class Mangler {
10077
this.config = config;
10178

patches/common/disable-online-services.diff

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Index: third-party-src/src/vs/platform/update/common/update.config.contribution.ts
1+
Index: code-editor-src/src/vs/platform/update/common/update.config.contribution.ts
22
===================================================================
3-
--- third-party-src.orig/src/vs/platform/update/common/update.config.contribution.ts
4-
+++ third-party-src/src/vs/platform/update/common/update.config.contribution.ts
5-
@@ -18,7 +18,7 @@ configurationRegistry.registerConfigurat
3+
--- code-editor-src.orig/src/vs/platform/update/common/update.config.contribution.ts
4+
+++ code-editor-src/src/vs/platform/update/common/update.config.contribution.ts
5+
@@ -19,7 +19,7 @@ configurationRegistry.registerConfigurat
66
'update.mode': {
77
type: 'string',
88
enum: ['none', 'manual', 'start', 'default'],
@@ -11,7 +11,7 @@ Index: third-party-src/src/vs/platform/update/common/update.config.contribution.
1111
scope: ConfigurationScope.APPLICATION,
1212
description: localize('updateMode', "Configure whether you receive automatic updates. Requires a restart after change. The updates are fetched from a Microsoft online service."),
1313
tags: ['usesOnlineServices'],
14-
@@ -42,7 +42,7 @@ configurationRegistry.registerConfigurat
14+
@@ -65,7 +65,7 @@ configurationRegistry.registerConfigurat
1515
},
1616
'update.enableWindowsBackgroundUpdates': {
1717
type: 'boolean',
@@ -20,7 +20,7 @@ Index: third-party-src/src/vs/platform/update/common/update.config.contribution.
2020
scope: ConfigurationScope.APPLICATION,
2121
title: localize('enableWindowsBackgroundUpdatesTitle', "Enable Background Updates on Windows"),
2222
description: localize('enableWindowsBackgroundUpdates', "Enable to download and install new VS Code versions in the background on Windows."),
23-
@@ -50,7 +50,7 @@ configurationRegistry.registerConfigurat
23+
@@ -73,7 +73,7 @@ configurationRegistry.registerConfigurat
2424
},
2525
'update.showReleaseNotes': {
2626
type: 'boolean',
@@ -29,10 +29,10 @@ Index: third-party-src/src/vs/platform/update/common/update.config.contribution.
2929
scope: ConfigurationScope.APPLICATION,
3030
description: localize('showReleaseNotes', "Show Release Notes after an update. The Release Notes are fetched from a Microsoft online service."),
3131
tags: ['usesOnlineServices']
32-
Index: third-party-src/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
32+
Index: code-editor-src/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
3333
===================================================================
34-
--- third-party-src.orig/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
35-
+++ third-party-src/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
34+
--- code-editor-src.orig/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
35+
+++ code-editor-src/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
3636
@@ -111,7 +111,7 @@ registry.registerConfiguration({
3737
'workbench.settings.enableNaturalLanguageSearch': {
3838
'type': 'boolean',
@@ -42,11 +42,11 @@ Index: third-party-src/src/vs/workbench/contrib/preferences/common/preferencesCo
4242
'scope': ConfigurationScope.WINDOW,
4343
'tags': ['usesOnlineServices']
4444
},
45-
Index: third-party-src/src/vs/workbench/services/assignment/common/assignmentService.ts
45+
Index: code-editor-src/src/vs/workbench/services/assignment/common/assignmentService.ts
4646
===================================================================
47-
--- third-party-src.orig/src/vs/workbench/services/assignment/common/assignmentService.ts
48-
+++ third-party-src/src/vs/workbench/services/assignment/common/assignmentService.ts
49-
@@ -146,7 +146,7 @@ registry.registerConfiguration({
47+
--- code-editor-src.orig/src/vs/workbench/services/assignment/common/assignmentService.ts
48+
+++ code-editor-src/src/vs/workbench/services/assignment/common/assignmentService.ts
49+
@@ -324,7 +324,7 @@ registry.registerConfiguration({
5050
'workbench.enableExperiments': {
5151
'type': 'boolean',
5252
'description': localize('workbench.enableExperiments', "Fetches experiments to run from a Microsoft online service."),

patches/common/disable-telemetry-service.diff

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ When pulling a new change from upstream, make sure to replace all .data.microsof
22
Otherwise the OSS will still ping microsoft, even if the telemetry is set to OFF.
33
See: https://github.com/VSCodium/vscodium/issues/26
44

5-
Index: third-party-src/src/vs/platform/telemetry/common/telemetryService.ts
5+
Index: code-editor-src/src/vs/platform/telemetry/common/telemetryService.ts
66
===================================================================
7-
--- third-party-src.orig/src/vs/platform/telemetry/common/telemetryService.ts
8-
+++ third-party-src/src/vs/platform/telemetry/common/telemetryService.ts
7+
--- code-editor-src.orig/src/vs/platform/telemetry/common/telemetryService.ts
8+
+++ code-editor-src/src/vs/platform/telemetry/common/telemetryService.ts
99
@@ -274,7 +274,7 @@ configurationRegistry.registerConfigurat
1010
'properties': {
1111
[TELEMETRY_SETTING_ID]: {
@@ -33,10 +33,10 @@ Index: third-party-src/src/vs/platform/telemetry/common/telemetryService.ts
3333
'restricted': true,
3434
'markdownDeprecationMessage': localize('enableTelemetryDeprecated', "If this setting is false, no telemetry will be sent regardless of the new setting's value. Deprecated in favor of the {0} setting.", `\`#${TELEMETRY_SETTING_ID}#\``),
3535
'scope': ConfigurationScope.APPLICATION,
36-
Index: third-party-src/src/vs/platform/telemetry/common/1dsAppender.ts
36+
Index: code-editor-src/src/vs/platform/telemetry/common/1dsAppender.ts
3737
===================================================================
38-
--- third-party-src.orig/src/vs/platform/telemetry/common/1dsAppender.ts
39-
+++ third-party-src/src/vs/platform/telemetry/common/1dsAppender.ts
38+
--- code-editor-src.orig/src/vs/platform/telemetry/common/1dsAppender.ts
39+
+++ code-editor-src/src/vs/platform/telemetry/common/1dsAppender.ts
4040
@@ -19,8 +19,8 @@ export interface IAppInsightsCore {
4141
unload(isAsync: boolean, unloadComplete: (unloadState: ITelemetryUnloadState) => void): void;
4242
}
@@ -48,10 +48,10 @@ Index: third-party-src/src/vs/platform/telemetry/common/1dsAppender.ts
4848

4949
async function getClient(instrumentationKey: string, addInternalFlag?: boolean, xhrOverride?: IXHROverride): Promise<IAppInsightsCore> {
5050
// eslint-disable-next-line local/code-amd-node-module
51-
Index: third-party-src/src/vs/workbench/electron-browser/desktop.contribution.ts
51+
Index: code-editor-src/src/vs/workbench/electron-browser/desktop.contribution.ts
5252
===================================================================
53-
--- third-party-src.orig/src/vs/workbench/electron-browser/desktop.contribution.ts
54-
+++ third-party-src/src/vs/workbench/electron-browser/desktop.contribution.ts
53+
--- code-editor-src.orig/src/vs/workbench/electron-browser/desktop.contribution.ts
54+
+++ code-editor-src/src/vs/workbench/electron-browser/desktop.contribution.ts
5555
@@ -340,7 +340,7 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL
5656
'telemetry.enableCrashReporter': {
5757
'type': 'boolean',

patches/common/embedded-api.diff

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ received.
3434
src/vscode-dts/vscode.d.ts | 2 ++
3535
6 files changed, 47 insertions(+), 1 deletion(-)
3636

37-
Index: third-party-src/src/vs/workbench/api/browser/mainThreadWindow.ts
37+
Index: code-editor-src/src/vs/workbench/api/browser/mainThreadWindow.ts
3838
===================================================================
39-
--- third-party-src.orig/src/vs/workbench/api/browser/mainThreadWindow.ts
40-
+++ third-party-src/src/vs/workbench/api/browser/mainThreadWindow.ts
39+
--- code-editor-src.orig/src/vs/workbench/api/browser/mainThreadWindow.ts
40+
+++ code-editor-src/src/vs/workbench/api/browser/mainThreadWindow.ts
4141
@@ -3,6 +3,7 @@
4242
* Licensed under the MIT License. See License.txt in the project root for license information.
4343
*--------------------------------------------------------------------------------------------*/
@@ -77,11 +77,11 @@ Index: third-party-src/src/vs/workbench/api/browser/mainThreadWindow.ts
7777
+ mainWindow.parent.postMessage(message, origin);
7878
+ }
7979
}
80-
Index: third-party-src/src/vs/workbench/api/common/extHost.api.impl.ts
80+
Index: code-editor-src/src/vs/workbench/api/common/extHost.api.impl.ts
8181
===================================================================
82-
--- third-party-src.orig/src/vs/workbench/api/common/extHost.api.impl.ts
83-
+++ third-party-src/src/vs/workbench/api/common/extHost.api.impl.ts
84-
@@ -690,6 +690,14 @@ export function createApiFactoryAndRegis
82+
--- code-editor-src.orig/src/vs/workbench/api/common/extHost.api.impl.ts
83+
+++ code-editor-src/src/vs/workbench/api/common/extHost.api.impl.ts
84+
@@ -721,6 +721,14 @@ export function createApiFactoryAndRegis
8585

8686
// namespace: window
8787
const window: typeof vscode.window = {
@@ -96,30 +96,30 @@ Index: third-party-src/src/vs/workbench/api/common/extHost.api.impl.ts
9696
get activeTextEditor() {
9797
return extHostEditors.getActiveTextEditor();
9898
},
99-
Index: third-party-src/src/vs/workbench/api/common/extHost.protocol.ts
99+
Index: code-editor-src/src/vs/workbench/api/common/extHost.protocol.ts
100100
===================================================================
101-
--- third-party-src.orig/src/vs/workbench/api/common/extHost.protocol.ts
102-
+++ third-party-src/src/vs/workbench/api/common/extHost.protocol.ts
103-
@@ -1744,6 +1744,7 @@ export interface MainThreadWindowShape e
101+
--- code-editor-src.orig/src/vs/workbench/api/common/extHost.protocol.ts
102+
+++ code-editor-src/src/vs/workbench/api/common/extHost.protocol.ts
103+
@@ -1889,6 +1889,7 @@ export interface MainThreadWindowShape e
104104
$getInitialState(): Promise<{ isFocused: boolean; isActive: boolean }>;
105105
$openUri(uri: UriComponents, uriString: string | undefined, options: IOpenUriOptions): Promise<boolean>;
106106
$asExternalUri(uri: UriComponents, options: IOpenUriOptions): Promise<UriComponents>;
107107
+ $sendMessage(message: any): void;
108108
}
109109

110110
export enum CandidatePortSource {
111-
@@ -2721,6 +2722,7 @@ export interface ExtHostWindowShape {
111+
@@ -2898,6 +2899,7 @@ export interface ExtHostWindowShape {
112112
$onDidChangeWindowFocus(value: boolean): void;
113113
$onDidChangeWindowActive(value: boolean): void;
114114
$onDidChangeActiveNativeWindowHandle(handle: string | undefined): void;
115115
+ $receiveMessage(message: any): void;
116116
}
117117

118118
export interface ExtHostLogLevelServiceShape {
119-
Index: third-party-src/src/vs/workbench/api/common/extHostWindow.ts
119+
Index: code-editor-src/src/vs/workbench/api/common/extHostWindow.ts
120120
===================================================================
121-
--- third-party-src.orig/src/vs/workbench/api/common/extHostWindow.ts
122-
+++ third-party-src/src/vs/workbench/api/common/extHostWindow.ts
121+
--- code-editor-src.orig/src/vs/workbench/api/common/extHostWindow.ts
122+
+++ code-editor-src/src/vs/workbench/api/common/extHostWindow.ts
123123
@@ -26,6 +26,7 @@ export class ExtHostWindow implements Ex
124124
private _proxy: MainThreadWindowShape;
125125

@@ -155,10 +155,10 @@ Index: third-party-src/src/vs/workbench/api/common/extHostWindow.ts
155155
}
156156

157157
export const IExtHostWindow = createDecorator<IExtHostWindow>('IExtHostWindow');
158-
Index: third-party-src/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
158+
Index: code-editor-src/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
159159
===================================================================
160-
--- third-party-src.orig/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
161-
+++ third-party-src/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
160+
--- code-editor-src.orig/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
161+
+++ code-editor-src/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
162162
@@ -44,7 +44,7 @@ export class ExtensionsProposedApi {
163163
for (const [k, value] of Object.entries(productService.extensionEnabledApiProposals)) {
164164
const key = ExtensionIdentifier.toKey(k);
@@ -168,11 +168,11 @@ Index: third-party-src/src/vs/workbench/services/extensions/common/extensionsPro
168168
_logService.warn(`Via 'product.json#extensionEnabledApiProposals' extension '${key}' wants API proposal '${name}' but that proposal DOES NOT EXIST. Likely, the proposal has been finalized (check 'vscode.d.ts') or was abandoned.`);
169169
return false;
170170
}
171-
Index: third-party-src/src/vscode-dts/vscode.d.ts
171+
Index: code-editor-src/src/vscode-dts/vscode.d.ts
172172
===================================================================
173-
--- third-party-src.orig/src/vscode-dts/vscode.d.ts
174-
+++ third-party-src/src/vscode-dts/vscode.d.ts
175-
@@ -11000,6 +11000,8 @@ declare module 'vscode' {
173+
--- code-editor-src.orig/src/vscode-dts/vscode.d.ts
174+
+++ code-editor-src/src/vscode-dts/vscode.d.ts
175+
@@ -11042,6 +11042,8 @@ declare module 'vscode' {
176176
* asking for user input.
177177
*/
178178
export namespace window {

patches/common/fix-terminal-autoreplies.diff

Lines changed: 0 additions & 16 deletions
This file was deleted.

patches/common/fix-ts-rootdir-webpack.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Index: third-party-src/extensions/shared.webpack.config.mjs
1+
Index: code-editor-src/extensions/shared.webpack.config.mjs
22
===================================================================
3-
--- third-party-src.orig/extensions/shared.webpack.config.mjs
4-
+++ third-party-src/extensions/shared.webpack.config.mjs
3+
--- code-editor-src.orig/extensions/shared.webpack.config.mjs
4+
+++ code-editor-src/extensions/shared.webpack.config.mjs
55
@@ -17,6 +17,7 @@ const require = createRequire(import.met
66
const tsLoaderOptions = {
77
compilerOptions: {

patches/common/heartbeat.diff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Index: third-party-src/src/vs/server/node/remoteExtensionHostAgentServer.ts
1+
Index: code-editor-src/src/vs/server/node/remoteExtensionHostAgentServer.ts
22
===================================================================
3-
--- third-party-src.orig/src/vs/server/node/remoteExtensionHostAgentServer.ts
4-
+++ third-party-src/src/vs/server/node/remoteExtensionHostAgentServer.ts
5-
@@ -130,6 +130,13 @@ class RemoteExtensionHostAgentServer ext
3+
--- code-editor-src.orig/src/vs/server/node/remoteExtensionHostAgentServer.ts
4+
+++ code-editor-src/src/vs/server/node/remoteExtensionHostAgentServer.ts
5+
@@ -131,6 +131,13 @@ class RemoteExtensionHostAgentServer ext
66
pathname = pathname.substring(this._serverProductPath.length);
77
}
88

0 commit comments

Comments
 (0)