git: 2da94eec4585 - main - editors/vscode: Update to 1.138.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Hiroki Tagato <tagattie_at_FreeBSD.org>
Date: Fri, 18 Sep 2026 02:35:41 UTC
The branch main has been updated by tagattie:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2da94eec45856881d332a74303fa25859f9ff9f8

commit 2da94eec45856881d332a74303fa25859f9ff9f8
Author:     Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2026-09-18 02:33:55 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2026-09-18 02:35:20 +0000

    editors/vscode: Update to 1.138.0
    
    Changelog: https://code.visualstudio.com/updates/v1_138
    
    Reported by:    GitHub (watch releases)
---
 editors/vscode/Makefile                            |  1 -
 editors/vscode/Makefile.reh                        |  2 +-
 editors/vscode/Makefile.version                    |  4 +--
 editors/vscode/distinfo                            | 14 +++++------
 .../files/patch-src_vs_base_common_platform.ts     |  8 +++---
 .../files/patch-src_vs_code_electron-main_app.ts   |  4 +--
 ...t_node_codex_codexProviderConfiguration.test.ts | 29 ++++++++++++++++++++++
 editors/vscode/pkg-plist                           |  3 ---
 8 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index fa9b76f89a91..a01b6b178543 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	vscode
 DISTVERSION=	${VSCODE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:node_modules \
 		https://registry.npmjs.org/@github/copilot-linux-${ELECTRON_ARCH}/-/:copilot_cli \
diff --git a/editors/vscode/Makefile.reh b/editors/vscode/Makefile.reh
index 1495bb42b6d1..c1ec65f1f928 100644
--- a/editors/vscode/Makefile.reh
+++ b/editors/vscode/Makefile.reh
@@ -187,7 +187,7 @@ do-build:
 	while true; do \
 		${SETENV} ${MAKE_ENV} $${npm_env} \
 			npm --userconfig=${WRKSRC}/remote/.npmrc run \
-				gulp vscode-reh-linux-${NODEJS_ARCH}-min && break; \
+				gulp vscode-reh-linux-${NODEJS_ARCH} && break; \
 		count=$$((count + 1)); \
 		if [ $${count} -ge $${max_tries} ]; then \
 			${ECHO_MSG} "Failed to build after $${max_tries} attempts."; \
diff --git a/editors/vscode/Makefile.version b/editors/vscode/Makefile.version
index af9f839a9ca3..42b9353bd152 100644
--- a/editors/vscode/Makefile.version
+++ b/editors/vscode/Makefile.version
@@ -1,5 +1,5 @@
-VSCODE_VERSION=		1.137.0
-SOURCE_COMMIT_HASH=	645f29cc3176500b4b5762ba887cf2a7f0ffdf2c
+VSCODE_VERSION=		1.138.0
+SOURCE_COMMIT_HASH=	7debcd0e2acdea1c52de81bf9ee1620444407dda
 # See ${WRKSRC}/build/rspack/node_modules/@rspack/binding/package.json for rspack version
 RSPACK_VERSION=		2.1.2
 # See ${WRKSRC}/extensions/copilot/node_modules/@github/copilot/package.json for copilot cli version
diff --git a/editors/vscode/distinfo b/editors/vscode/distinfo
index 9292a3e92284..eaac7820511e 100644
--- a/editors/vscode/distinfo
+++ b/editors/vscode/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1789072771
-SHA256 (vscode/vscode-node-modules-1.137.0.tar.gz) = 26e13cca08f356ad7b70973f9d8fd68e6a9a32cbc7a2f10de2ab0187b7d0ee90
-SIZE (vscode/vscode-node-modules-1.137.0.tar.gz) = 927577318
-SHA256 (vscode/vscode-marketplace-exts-1.137.0.tar.gz) = 1ebcd704f2c546e32c33a6a8c6ba5f480df0862990d8292b85d0cdcb5185733b
-SIZE (vscode/vscode-marketplace-exts-1.137.0.tar.gz) = 1687489
+TIMESTAMP = 1789644796
+SHA256 (vscode/vscode-node-modules-1.138.0.tar.gz) = ea5da292227e0dd08785f521cef0d169bacecfa7039f81f58901ebbae628abc0
+SIZE (vscode/vscode-node-modules-1.138.0.tar.gz) = 926350734
+SHA256 (vscode/vscode-marketplace-exts-1.138.0.tar.gz) = 841503482ad645399be52636a790af81557c28e59f68acbd549c40c495f18b0c
+SIZE (vscode/vscode-marketplace-exts-1.138.0.tar.gz) = 1687482
 SHA256 (vscode/copilot-linux-x64-1.0.73.tgz) = 1d776f6c436b321e5a7d32e8081586daf1f0d399131b7f4ebb61d9722643c8d0
 SIZE (vscode/copilot-linux-x64-1.0.73.tgz) = 165866800
 SHA256 (vscode/os-proxy-resolver-linux-x64-gnu-0.4.0.tgz) = a1709eac86f836a20b4c3f4d97960943591f214fecf3296c6e36441aafd43428
@@ -1527,8 +1527,8 @@ SHA256 (vscode/rust/crates/zlib-rs-0.5.2.crate) = 2f06ae92f42f5e5c42443fd094f245
 SIZE (vscode/rust/crates/zlib-rs-0.5.2.crate) = 194342
 SHA256 (vscode/rust/crates/zmij-1.0.5.crate) = e3280a1b827474fcd5dbef4b35a674deb52ba5c312363aef9135317df179d81b
 SIZE (vscode/rust/crates/zmij-1.0.5.crate) = 36375
-SHA256 (vscode/microsoft-vscode-1.137.0_GH0.tar.gz) = bb9479618827a746f9daa65c2fc702e5b0a45bfb4047afa42ad376d89e7c2fd6
-SIZE (vscode/microsoft-vscode-1.137.0_GH0.tar.gz) = 53630344
+SHA256 (vscode/microsoft-vscode-1.138.0_GH0.tar.gz) = d7875d5d325dffb672903281a2a1961be525819e6a712b94b921826747b698e0
+SIZE (vscode/microsoft-vscode-1.138.0_GH0.tar.gz) = 54254740
 SHA256 (vscode/web-infra-dev-rspack-v2.1.2_GH0.tar.gz) = 43c2caa3f8d966f41d372bf394e4da9aaf4c4edcd903b20e2175aa7223405acd
 SIZE (vscode/web-infra-dev-rspack-v2.1.2_GH0.tar.gz) = 14371132
 SHA256 (vscode/microsoft-os-proxy-resolver-v0.4.0_GH0.tar.gz) = a25166b8669dca698d78b3f6147cfc9c658ea7b0ceca1c471c85fc88edc8a803
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 443fdb64ad27..e0c3f7706ed7 100644
--- a/editors/vscode/files/patch-src_vs_base_common_platform.ts
+++ b/editors/vscode/files/patch-src_vs_base_common_platform.ts
@@ -1,6 +1,6 @@
---- src/vs/base/common/platform.ts.orig	2026-05-12 20:17:22 UTC
+--- src/vs/base/common/platform.ts.orig	2026-09-15 07:24:32 UTC
 +++ src/vs/base/common/platform.ts
-@@ -74,7 +74,7 @@ if (typeof nodeProcess === 'object') {
+@@ -75,7 +75,7 @@ if (typeof nodeProcess === 'object') {
  if (typeof nodeProcess === 'object') {
  	_isWindows = (nodeProcess.platform === 'win32');
  	_isMacintosh = (nodeProcess.platform === 'darwin');
@@ -9,12 +9,12 @@
  	_isLinuxSnap = _isLinux && !!nodeProcess.env['SNAP'] && !!nodeProcess.env['SNAP_REVISION'];
  	_isElectron = isElectronProcess;
  	_isCI = !!nodeProcess.env['CI'] || !!nodeProcess.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] || !!nodeProcess.env['GITHUB_WORKSPACE'];
-@@ -100,7 +100,7 @@ else if (typeof navigator === 'object' && !isElectronR
+@@ -101,7 +101,7 @@ else if (typeof navigator === 'object' && !isElectronR
  	_isWindows = _userAgent.indexOf('Windows') >= 0;
  	_isMacintosh = _userAgent.indexOf('Macintosh') >= 0;
  	_isIOS = (_userAgent.indexOf('Macintosh') >= 0 || _userAgent.indexOf('iPad') >= 0 || _userAgent.indexOf('iPhone') >= 0) && !!navigator.maxTouchPoints && navigator.maxTouchPoints > 0;
 -	_isLinux = _userAgent.indexOf('Linux') >= 0;
 +	_isLinux = (_userAgent.indexOf('Linux') >= 0 || _userAgent.indexOf('FreeBSD') >= 0);
+ 	_isChromeOS = _userAgent.indexOf('CrOS') >= 0;
  	_isMobile = _userAgent?.indexOf('Mobi') >= 0;
  	_isWeb = true;
- 	_language = nls.getNLSLanguage() || LANGUAGE_DEFAULT;
diff --git a/editors/vscode/files/patch-src_vs_code_electron-main_app.ts b/editors/vscode/files/patch-src_vs_code_electron-main_app.ts
index 23e97eedbf73..2997ed3f0dfc 100644
--- a/editors/vscode/files/patch-src_vs_code_electron-main_app.ts
+++ b/editors/vscode/files/patch-src_vs_code_electron-main_app.ts
@@ -1,6 +1,6 @@
---- src/vs/code/electron-main/app.ts.orig	2026-09-03 05:06:41 UTC
+--- src/vs/code/electron-main/app.ts.orig	2026-09-15 07:24:32 UTC
 +++ src/vs/code/electron-main/app.ts
-@@ -1186,6 +1186,7 @@ export class CodeApplication extends Disposable {
+@@ -1178,6 +1178,7 @@ export class CodeApplication extends Disposable {
  				break;
  
  			case 'linux':
diff --git a/editors/vscode/files/patch-src_vs_platform_agentHost_test_node_codex_codexProviderConfiguration.test.ts b/editors/vscode/files/patch-src_vs_platform_agentHost_test_node_codex_codexProviderConfiguration.test.ts
new file mode 100644
index 000000000000..a29d48306cf6
--- /dev/null
+++ b/editors/vscode/files/patch-src_vs_platform_agentHost_test_node_codex_codexProviderConfiguration.test.ts
@@ -0,0 +1,29 @@
+--- src/vs/platform/agentHost/test/node/codex/codexProviderConfiguration.test.ts.orig	2026-09-17 12:28:44 UTC
++++ src/vs/platform/agentHost/test/node/codex/codexProviderConfiguration.test.ts
+@@ -135,7 +135,7 @@ suite('CodexProviderConfiguration', () => {
+ 	}
+ 
+ 	test('rereads the user configuration on a version conflict', async () => {
+-		const client = new TestConfigurationClient(() => userConfiguration({ personality: 'pragmatic' }, `version-${client.readCount}`), () => {
++		const client: TestConfigurationClient = new TestConfigurationClient(() => userConfiguration({ personality: 'pragmatic' }, `version-${client.readCount}`), () => {
+ 			if (client.writes.length === 1) {
+ 				throw new JsonRpcError(-32600, 'Changed concurrently', { config_write_error_code: 'configVersionConflict' });
+ 			}
+@@ -145,7 +145,7 @@ suite('CodexProviderConfiguration', () => {
+ 	});
+ 
+ 	test('preserves an alias installed concurrently by another client', async () => {
+-		const client = new TestConfigurationClient(() => userConfiguration(client.readCount === 1 ? {} : { model_providers: { 'vscode-proxy': portableProvider } }), () => {
++		const client: TestConfigurationClient = new TestConfigurationClient(() => userConfiguration(client.readCount === 1 ? {} : { model_providers: { 'vscode-proxy': portableProvider } }), () => {
+ 			throw new JsonRpcError(-32600, 'Changed concurrently', { config_write_error_code: 'configVersionConflict' });
+ 		});
+ 		await ensurePortableCodexProxyProvider(client);
+@@ -153,7 +153,7 @@ suite('CodexProviderConfiguration', () => {
+ 	});
+ 
+ 	test('does not overwrite a conflicting alias introduced by a concurrent edit', async () => {
+-		const client = new TestConfigurationClient(() => userConfiguration(client.readCount === 1 ? {} : { model_providers: { 'vscode-proxy': { name: 'User provider', env_key: 'CUSTOM_TOKEN' } } }), () => {
++		const client: TestConfigurationClient = new TestConfigurationClient(() => userConfiguration(client.readCount === 1 ? {} : { model_providers: { 'vscode-proxy': { name: 'User provider', env_key: 'CUSTOM_TOKEN' } } }), () => {
+ 			throw new JsonRpcError(-32600, 'Changed concurrently', { config_write_error_code: 'configVersionConflict' });
+ 		});
+ 		await assert.rejects(ensurePortableCodexProxyProvider(client), /already defines an incompatible/);
diff --git a/editors/vscode/pkg-plist b/editors/vscode/pkg-plist
index 86953a6ddca1..b96ca5a8b574 100644
--- a/editors/vscode/pkg-plist
+++ b/editors/vscode/pkg-plist
@@ -21320,7 +21320,6 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/copilot/node_modules/vscode-tas-client/out/vscode-tas-client/VSCodeFilterProvider.js
 %%DATADIR%%/resources/app/extensions/copilot/node_modules/vscode-tas-client/out/vscode-tas-client/VSCodeTasClient.js
 %%DATADIR%%/resources/app/extensions/copilot/node_modules/vscode-tas-client/package.json
-%%DATADIR%%/resources/app/extensions/copilot/node_modules/vscode-tas-client/publishScript.js
 %%DATADIR%%/resources/app/extensions/copilot/node_modules/vscode-tas-client/tsconfig.json
 %%DATADIR%%/resources/app/extensions/copilot/node_modules/vscode-tas-client/tslint.json
 %%DATADIR%%/resources/app/extensions/copilot/node_modules/vscode-tas-client/version.json
@@ -22320,8 +22319,6 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/markdown-language-features/package.json
 %%DATADIR%%/resources/app/extensions/markdown-language-features/package.nls.json
 %%DATADIR%%/resources/app/extensions/markdown-language-features/schemas/package.schema.json
-%%DATADIR%%/resources/app/extensions/markdown-language-features/scripts/updateMarkdownEditorPackageJson.mts
-%%DATADIR%%/resources/app/extensions/markdown-language-features/scripts/updateMarkdownEditorPackageJson.test.mts
 %%DATADIR%%/resources/app/extensions/markdown-math/README.md
 %%DATADIR%%/resources/app/extensions/markdown-math/dist/extension.js
 %%DATADIR%%/resources/app/extensions/markdown-math/dist/extension.js.map