summaryrefslogtreecommitdiff
path: root/editors/vscode/files
diff options
context:
space:
mode:
Diffstat (limited to 'editors/vscode/files')
-rw-r--r--editors/vscode/files/patch-build_checker_layersChecker.ts (renamed from editors/vscode/files/patch-build_lib_layersChecker.ts)6
-rw-r--r--editors/vscode/files/patch-build_lib_electron.ts13
-rw-r--r--editors/vscode/files/patch-node__modules__at_vscode_gulp-electron_src_download.js10
-rw-r--r--editors/vscode/files/patch-package.json14
-rw-r--r--editors/vscode/files/patch-src_vs_base_common_platform.ts4
-rw-r--r--editors/vscode/files/patch-src_vs_platform_extensionManagement_node_extensionSignatureVerificationService.ts47
-rw-r--r--editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts4
-rw-r--r--editors/vscode/files/patch-test_automation_src_electron.ts6
-rw-r--r--editors/vscode/files/patch-test_smoke_src_areas_terminal_terminal.test.ts5
9 files changed, 96 insertions, 13 deletions
diff --git a/editors/vscode/files/patch-build_lib_layersChecker.ts b/editors/vscode/files/patch-build_checker_layersChecker.ts
index 5f572328ac0a..96e2a0540fc3 100644
--- a/editors/vscode/files/patch-build_lib_layersChecker.ts
+++ b/editors/vscode/files/patch-build_checker_layersChecker.ts
@@ -1,6 +1,6 @@
---- build/lib/layersChecker.ts.orig 2025-06-11 13:47:56 UTC
-+++ build/lib/layersChecker.ts
-@@ -363,7 +363,7 @@ function createProgram(tsconfigPath: string): ts.Progr
+--- build/checker/layersChecker.ts.orig 2025-07-12 04:56:20 UTC
++++ build/checker/layersChecker.ts
+@@ -136,7 +136,7 @@ function createProgram(tsconfigPath: string): ts.Progr
function createProgram(tsconfigPath: string): ts.Program {
const tsConfig = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
diff --git a/editors/vscode/files/patch-build_lib_electron.ts b/editors/vscode/files/patch-build_lib_electron.ts
new file mode 100644
index 000000000000..c89cd63f67f6
--- /dev/null
+++ b/editors/vscode/files/patch-build_lib_electron.ts
@@ -0,0 +1,13 @@
+--- build/lib/electron.ts.orig 2025-07-09 22:00:36 UTC
++++ build/lib/electron.ts
+@@ -199,8 +199,9 @@ export const config = {
+ winIcon: 'resources/win32/code.ico',
+ token: process.env['GITHUB_TOKEN'],
+ repo: product.electronRepository || undefined,
+- validateChecksum: true,
++ validateChecksum: false,
+ checksumFile: path.join(root, 'build', 'checksums', 'electron.txt'),
++ unsafelyDisableChecksums: true,
+ };
+
+ function getElectron(arch: string): () => NodeJS.ReadWriteStream {
diff --git a/editors/vscode/files/patch-node__modules__at_vscode_gulp-electron_src_download.js b/editors/vscode/files/patch-node__modules__at_vscode_gulp-electron_src_download.js
new file mode 100644
index 000000000000..dc29d0c61156
--- /dev/null
+++ b/editors/vscode/files/patch-node__modules__at_vscode_gulp-electron_src_download.js
@@ -0,0 +1,10 @@
+--- node_modules/@vscode/gulp-electron/src/download.js.orig 2025-07-12 11:54:58 UTC
++++ node_modules/@vscode/gulp-electron/src/download.js
+@@ -103,6 +103,7 @@ async function download(opts) {
+ artifactName: opts.artifactName,
+ artifactSuffix: opts.artifactSuffix,
+ token: opts.token,
++ unsafelyDisableChecksums: opts.unsafelyDisableChecksums,
+ downloadOptions: {
+ getProgressCallback: (progress) => {
+ if (bar) bar.update(progress.percent);
diff --git a/editors/vscode/files/patch-package.json b/editors/vscode/files/patch-package.json
new file mode 100644
index 000000000000..c40a6ad34f03
--- /dev/null
+++ b/editors/vscode/files/patch-package.json
@@ -0,0 +1,14 @@
+https://github.com/eclipse/openvsx/issues/543
+https://github.com/termux/termux-packages/issues/24739
+https://github.com/termux/termux-packages/pull/24757
+
+--- package.json.orig 2025-08-20 15:13:53 UTC
++++ package.json
+@@ -105,6 +105,7 @@
+ "native-is-elevated": "0.7.0",
+ "native-keymap": "^3.3.5",
+ "native-watchdog": "^1.4.1",
++ "node-ovsx-sign": "^1.2.0",
+ "node-pty": "^1.1.0-beta33",
+ "open": "^10.1.2",
+ "tas-client-umd": "0.2.0",
diff --git a/editors/vscode/files/patch-src_vs_base_common_platform.ts b/editors/vscode/files/patch-src_vs_base_common_platform.ts
index 69cd665fa3a2..e032caf7dbf1 100644
--- a/editors/vscode/files/patch-src_vs_base_common_platform.ts
+++ b/editors/vscode/files/patch-src_vs_base_common_platform.ts
@@ -1,4 +1,4 @@
---- src/vs/base/common/platform.ts.orig 2024-09-04 12:53:09 UTC
+--- src/vs/base/common/platform.ts.orig 2025-08-06 20:09:28 UTC
+++ src/vs/base/common/platform.ts
@@ -74,7 +74,7 @@ if (typeof nodeProcess === 'object') {
if (typeof nodeProcess === 'object') {
@@ -8,7 +8,7 @@
+ _isLinux = (nodeProcess.platform === 'linux' || nodeProcess.platform === 'freebsd');
_isLinuxSnap = _isLinux && !!nodeProcess.env['SNAP'] && !!nodeProcess.env['SNAP_REVISION'];
_isElectron = isElectronProcess;
- _isCI = !!nodeProcess.env['CI'] || !!nodeProcess.env['BUILD_ARTIFACTSTAGINGDIRECTORY'];
+ _isCI = !!nodeProcess.env['CI'] || !!nodeProcess.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] || !!nodeProcess.env['GITHUB_WORKSPACE'];
@@ -100,7 +100,7 @@ else if (typeof navigator === 'object' && !isElectronR
_isWindows = _userAgent.indexOf('Windows') >= 0;
_isMacintosh = _userAgent.indexOf('Macintosh') >= 0;
diff --git a/editors/vscode/files/patch-src_vs_platform_extensionManagement_node_extensionSignatureVerificationService.ts b/editors/vscode/files/patch-src_vs_platform_extensionManagement_node_extensionSignatureVerificationService.ts
new file mode 100644
index 000000000000..b10a1adb8f06
--- /dev/null
+++ b/editors/vscode/files/patch-src_vs_platform_extensionManagement_node_extensionSignatureVerificationService.ts
@@ -0,0 +1,47 @@
+https://github.com/eclipse/openvsx/issues/543
+https://github.com/termux/termux-packages/issues/24739
+https://github.com/termux/termux-packages/pull/24757
+
+--- src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts.orig 2025-08-20 15:13:53 UTC
++++ src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts
+@@ -35,7 +35,7 @@ declare module vsceSign {
+ }
+
+ declare module vsceSign {
+- export function verify(vsixFilePath: string, signatureArchiveFilePath: string, verbose: boolean): Promise<ExtensionSignatureVerificationResult>;
++ export function verify(vsixFilePath: string, signatureArchiveFilePath: string, verbose: boolean): Promise<boolean>;
+ }
+
+ /**
+@@ -67,7 +67,7 @@ export class ExtensionSignatureVerificationService imp
+ }
+
+ private async resolveVsceSign(): Promise<typeof vsceSign> {
+- const mod = '@vscode/vsce-sign';
++ const mod = 'node-ovsx-sign';
+ return import(mod);
+ }
+
+@@ -87,7 +87,21 @@ export class ExtensionSignatureVerificationService imp
+
+ try {
+ this.logService.trace(`Verifying extension signature for ${extensionId}...`);
+- result = await module.verify(vsixFilePath, signatureArchiveFilePath, this.logService.getLevel() === LogLevel.Trace);
++ let isSignatureValid =
++ await module.verify(vsixFilePath, signatureArchiveFilePath, this.logService.getLevel() === LogLevel.Trace);
++ if (isSignatureValid) {
++ result = {
++ code: ExtensionSignatureVerificationCode.Success,
++ didExecute: true,
++ output: "The extension signature is valid."
++ };
++ } else {
++ result = {
++ code: ExtensionSignatureVerificationCode.SignatureIsNotValid,
++ didExecute: true,
++ output: "The extension signature is invalid."
++ };
++ }
+ } catch (e) {
+ result = {
+ code: ExtensionSignatureVerificationCode.UnknownError,
diff --git a/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts b/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts
index 7f52910c6fbe..d31d73e874d3 100644
--- a/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts
+++ b/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts
@@ -1,6 +1,6 @@
---- src/vs/workbench/services/actions/common/menusExtensionPoint.ts.orig 2025-06-11 13:47:56 UTC
+--- src/vs/workbench/services/actions/common/menusExtensionPoint.ts.orig 2025-08-06 20:09:28 UTC
+++ src/vs/workbench/services/actions/common/menusExtensionPoint.ts
-@@ -1153,7 +1153,10 @@ class CommandsTableRenderer extends Disposable impleme
+@@ -1172,7 +1172,10 @@ class CommandsTableRenderer extends Disposable impleme
switch (platform) {
case 'win32': key = rawKeyBinding.win; break;
diff --git a/editors/vscode/files/patch-test_automation_src_electron.ts b/editors/vscode/files/patch-test_automation_src_electron.ts
index 5952d2a91663..e3e4afbe21d0 100644
--- a/editors/vscode/files/patch-test_automation_src_electron.ts
+++ b/editors/vscode/files/patch-test_automation_src_electron.ts
@@ -1,6 +1,6 @@
---- test/automation/src/electron.ts.orig 2025-06-11 13:47:56 UTC
+--- test/automation/src/electron.ts.orig 2025-08-06 20:09:28 UTC
+++ test/automation/src/electron.ts
-@@ -85,6 +85,7 @@ export function getDevElectronPath(): string {
+@@ -86,6 +86,7 @@ export function getDevElectronPath(): string {
case 'darwin':
return join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron');
case 'linux':
@@ -8,7 +8,7 @@
return join(buildPath, 'electron', `${product.applicationName}`);
case 'win32':
return join(buildPath, 'electron', `${product.nameShort}.exe`);
-@@ -97,7 +98,8 @@ export function getBuildElectronPath(root: string): st
+@@ -98,7 +99,8 @@ export function getBuildElectronPath(root: string): st
switch (process.platform) {
case 'darwin':
return join(root, 'Contents', 'MacOS', 'Electron');
diff --git a/editors/vscode/files/patch-test_smoke_src_areas_terminal_terminal.test.ts b/editors/vscode/files/patch-test_smoke_src_areas_terminal_terminal.test.ts
index 806c996a9a00..82233b967353 100644
--- a/editors/vscode/files/patch-test_smoke_src_areas_terminal_terminal.test.ts
+++ b/editors/vscode/files/patch-test_smoke_src_areas_terminal_terminal.test.ts
@@ -1,4 +1,4 @@
---- test/smoke/src/areas/terminal/terminal.test.ts.orig 2025-04-11 12:34:55 UTC
+--- test/smoke/src/areas/terminal/terminal.test.ts.orig 2025-07-09 22:00:36 UTC
+++ test/smoke/src/areas/terminal/terminal.test.ts
@@ -39,15 +39,15 @@ export function setup(logger: Logger) {
// https://github.com/microsoft/vscode/issues/216564
@@ -10,14 +10,13 @@
- setupTerminalProfileTests({ skipSuite: process.platform === 'linux' });
- setupTerminalTabsTests({ skipSuite: process.platform === 'linux' });
- setupTerminalShellIntegrationTests({ skipSuite: process.platform === 'linux' });
-- setupTerminalStickyScrollTests({ skipSuite: process.platform === 'linux' });
+ setupTerminalEditorsTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') });
+ setupTerminalInputTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') });
+ setupTerminalPersistenceTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') });
+ setupTerminalProfileTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') });
+ setupTerminalTabsTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') });
+ setupTerminalShellIntegrationTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') });
-+ setupTerminalStickyScrollTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') });
+ setupTerminalStickyScrollTests({ skipSuite: true });
// https://github.com/microsoft/vscode/pull/141974
// Windows is skipped here as well as it was never enabled from the start
- setupTerminalSplitCwdTests({ skipSuite: process.platform === 'linux' || process.platform === 'win32' });
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-10 16:13:54 +0000