editors/vscode: update to 1.85.0

Changelog: https://code.visualstudio.com/updates/v1_85

Reported by:	GitHub (watch releases)

8 files changed, 28 insertions, 35 deletions

diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index 66d21967d357..39fe553cb5a9 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	vscode
-DISTVERSION=	1.84.2
-PORTREVISION=	4
+DISTVERSION=	1.85.0
 CATEGORIES=	editors
 MASTER_SITES=	https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:yarn_cache
 DISTFILES=	yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache \
@@ -67,7 +66,7 @@ USES=		desktop-file-utils gl gmake gnome iconv:wchar_t jpeg \
 USE_GITHUB=	yes
 GH_ACCOUNT=	microsoft
 
-SOURCE_COMMIT_HASH=	2b35e1e6d88f1ce073683991d1eff5284a32690f
+SOURCE_COMMIT_HASH=	af28b32d7e553898b2a91af498b1fb666fdebe0c
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
@@ -114,7 +113,7 @@ pre-everything::
 	@${ECHO_MSG} "opened by a jail (default 1024) is exceeded during the build of ${PORTNAME}."
 	@${ECHO_MSG} "To successfully build ${PORTNAME} with poudriere(8), you must add the following"
 	@${ECHO_MSG} "line to poudriere.conf:"
-	@${ECHO_MSG} "MAX_FILES_${PORTNAME}=4096"
+	@${ECHO_MSG} "MAX_FILES_${PORTNAME}=8192"
 	@${ECHO_MSG} ""
 
 post-extract:
diff --git a/editors/vscode/distinfo b/editors/vscode/distinfo
index e67c74672ae7..d01c916735a8 100644
--- a/editors/vscode/distinfo
+++ b/editors/vscode/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1699706355
-SHA256 (vscode/yarn-offline-cache-1.84.2.tar.gz) = bc2058cd6a0fca84d19b4d30fc68a1ecb501cbd93a4c9a015a2cede3d1f7a4f7
-SIZE (vscode/yarn-offline-cache-1.84.2.tar.gz) = 334829565
-SHA256 (vscode/vscode-marketplace-exts-1.84.2.tar.gz) = f6d0cd7bb8ebd2b69dae4519111aeaa39ac2ea305f3ea5ea54dae04b180dd7c0
-SIZE (vscode/vscode-marketplace-exts-1.84.2.tar.gz) = 1722684
-SHA256 (vscode/microsoft-vscode-1.84.2_GH0.tar.gz) = 01b28abc554fd6999eb5f7fbd999c659f5f98924c3a71dae2c7e7bb5bfa0bf8d
-SIZE (vscode/microsoft-vscode-1.84.2_GH0.tar.gz) = 17328943
+TIMESTAMP = 1702294395
+SHA256 (vscode/yarn-offline-cache-1.85.0.tar.gz) = 2f4763095b70de0acbe755293a4827d0280a686a130b9483c474d7d8865859b6
+SIZE (vscode/yarn-offline-cache-1.85.0.tar.gz) = 335435776
+SHA256 (vscode/vscode-marketplace-exts-1.85.0.tar.gz) = 448d22ad426f416c8f7121385bfd4535c37fb6a86e83f0b46905da8a805bc4f5
+SIZE (vscode/vscode-marketplace-exts-1.85.0.tar.gz) = 1843208
+SHA256 (vscode/microsoft-vscode-1.85.0_GH0.tar.gz) = b7fcf4fce5ce31669e93240783ff9ecfbe6d239bb2446c5eb3c11900d430a727
+SIZE (vscode/microsoft-vscode-1.85.0_GH0.tar.gz) = 17197468
diff --git a/editors/vscode/files/patch-build_lib_layersChecker.ts b/editors/vscode/files/patch-build_lib_layersChecker.ts
index e339f31483d6..db11f83ea2bf 100644
--- a/editors/vscode/files/patch-build_lib_layersChecker.ts
+++ b/editors/vscode/files/patch-build_lib_layersChecker.ts
@@ -1,6 +1,6 @@
---- build/lib/layersChecker.ts.orig	2023-09-06 21:00:17 UTC
+--- build/lib/layersChecker.ts.orig	2023-12-06 10:36:56 UTC
 +++ build/lib/layersChecker.ts
-@@ -310,7 +310,7 @@ function checkFile(program: ts.Program, sourceFile: ts
+@@ -338,7 +338,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_npm_postinstall.js b/editors/vscode/files/patch-build_npm_postinstall.js
index eea5f96e29b0..6f425b03106d 100644
--- a/editors/vscode/files/patch-build_npm_postinstall.js
+++ b/editors/vscode/files/patch-build_npm_postinstall.js
@@ -1,4 +1,4 @@
---- build/npm/postinstall.js.orig	2023-08-02 11:59:07 UTC
+--- build/npm/postinstall.js.orig	2023-12-06 10:36:56 UTC
 +++ build/npm/postinstall.js
 @@ -41,8 +41,14 @@ function yarnInstall(dir, opts) {
  	const raw = process.env['npm_config_argv'] || '{}';
@@ -22,6 +22,6 @@
  }
  
 -cp.execSync('git config pull.rebase merges');
--cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
+-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs');
 +// cp.execSync('git config pull.rebase merges');
-+// cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
++// cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs');
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 34d078a576ef..a26eff297722 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	2023-03-29 09:14:46 UTC
+--- src/vs/base/common/platform.ts.orig	2023-12-06 10:36:56 UTC
 +++ src/vs/base/common/platform.ts
-@@ -86,7 +86,7 @@ if (typeof navigator === 'object' && !isElectronRender
+@@ -81,7 +81,7 @@ if (typeof navigator === 'object' && !isElectronRender
  	_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;
@@ -9,7 +9,7 @@
  	_isMobile = _userAgent?.indexOf('Mobi') >= 0;
  	_isWeb = true;
  
-@@ -107,7 +107,7 @@ if (typeof navigator === 'object' && !isElectronRender
+@@ -102,7 +102,7 @@ else if (typeof nodeProcess === 'object') {
  else if (typeof nodeProcess === 'object') {
  	_isWindows = (nodeProcess.platform === 'win32');
  	_isMacintosh = (nodeProcess.platform === 'darwin');
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 49766d31ecfc..a87024f1b1fa 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	2023-11-01 09:39:20 UTC
+--- src/vs/code/electron-main/app.ts.orig	2023-12-06 10:36:56 UTC
 +++ src/vs/code/electron-main/app.ts
-@@ -978,7 +978,7 @@ export class CodeApplication extends Disposable {
+@@ -989,7 +989,7 @@ export class CodeApplication extends Disposable {
  				services.set(IUpdateService, new SyncDescriptor(Win32UpdateService));
  				break;
  
diff --git a/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts b/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts
index 66c1c62baa27..3de7ceb4fa21 100644
--- a/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts
+++ b/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts
@@ -1,6 +1,6 @@
---- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig	2023-11-01 09:39:20 UTC
+--- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig	2023-12-06 10:36:56 UTC
 +++ src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
-@@ -1778,7 +1778,8 @@ export class ExtensionEditor extends EditorPane {
+@@ -1801,7 +1801,8 @@ export class ExtensionEditor extends EditorPane {
  
  		switch (platform) {
  			case 'win32': key = rawKeyBinding.win; break;
diff --git a/editors/vscode/pkg-plist b/editors/vscode/pkg-plist
index c47ebd3faf1a..485339078b1c 100644
--- a/editors/vscode/pkg-plist
+++ b/editors/vscode/pkg-plist
@@ -254,7 +254,6 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/hlsl/syntaxes/hlsl.tmLanguage.json
 %%DATADIR%%/resources/app/extensions/html-language-features/README.md
 %%DATADIR%%/resources/app/extensions/html-language-features/client/dist/node/htmlClientMain.js
-%%DATADIR%%/resources/app/extensions/html-language-features/client/dist/node/htmlClientMain.js.LICENSE.txt
 %%DATADIR%%/resources/app/extensions/html-language-features/icons/html.png
 %%DATADIR%%/resources/app/extensions/html-language-features/package.json
 %%DATADIR%%/resources/app/extensions/html-language-features/package.nls.json
@@ -299,7 +298,6 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/javascript/tags-language-configuration.json
 %%DATADIR%%/resources/app/extensions/json-language-features/README.md
 %%DATADIR%%/resources/app/extensions/json-language-features/client/dist/node/jsonClientMain.js
-%%DATADIR%%/resources/app/extensions/json-language-features/client/dist/node/jsonClientMain.js.LICENSE.txt
 %%DATADIR%%/resources/app/extensions/json-language-features/icons/json.png
 %%DATADIR%%/resources/app/extensions/json-language-features/package.json
 %%DATADIR%%/resources/app/extensions/json-language-features/package.nls.json
@@ -351,7 +349,6 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/markdown-language-features/.eslintignore
 %%DATADIR%%/resources/app/extensions/markdown-language-features/README.md
 %%DATADIR%%/resources/app/extensions/markdown-language-features/dist/extension.js
-%%DATADIR%%/resources/app/extensions/markdown-language-features/dist/extension.js.LICENSE.txt
 %%DATADIR%%/resources/app/extensions/markdown-language-features/icon.png
 %%DATADIR%%/resources/app/extensions/markdown-language-features/media/highlight.css
 %%DATADIR%%/resources/app/extensions/markdown-language-features/media/index.js
@@ -417,13 +414,11 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/media-preview/package.nls.json
 %%DATADIR%%/resources/app/extensions/merge-conflict/README.md
 %%DATADIR%%/resources/app/extensions/merge-conflict/dist/mergeConflictMain.js
-%%DATADIR%%/resources/app/extensions/merge-conflict/dist/mergeConflictMain.js.LICENSE.txt
 %%DATADIR%%/resources/app/extensions/merge-conflict/media/icon.png
 %%DATADIR%%/resources/app/extensions/merge-conflict/package.json
 %%DATADIR%%/resources/app/extensions/merge-conflict/package.nls.json
 %%DATADIR%%/resources/app/extensions/microsoft-authentication/README.md
 %%DATADIR%%/resources/app/extensions/microsoft-authentication/dist/extension.js
-%%DATADIR%%/resources/app/extensions/microsoft-authentication/dist/extension.js.LICENSE.txt
 %%DATADIR%%/resources/app/extensions/microsoft-authentication/media/auth.css
 %%DATADIR%%/resources/app/extensions/microsoft-authentication/media/favicon.ico
 %%DATADIR%%/resources/app/extensions/microsoft-authentication/media/icon.png
@@ -499,16 +494,18 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/README.md
 %%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/ThirdPartyNotices.txt
 %%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/ci.yml
+%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/84b6bc62673660f3ffa2.module.wasm
+%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/9.extension.web.js
+%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/94625be35e004f01f9d5.module.wasm
 %%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/cpu-client.bundle.js
 %%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/extension.js
 %%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/extension.web.js
 %%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/heap-client.bundle.js
+%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/heapsnapshot-client.bundle.js
+%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/heapsnapshotWorker.js
 %%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/package.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/resources/icon.png
 %%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/tsconfig.browser.json
-%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/webpack.cpu-client.js
-%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/webpack.extension.js
-%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/webpack.heap-client.js
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/cancellationToken.js
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/cs/diagnosticMessages.generated.json
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/de/diagnosticMessages.generated.json
@@ -719,7 +716,6 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/sql/package.json
 %%DATADIR%%/resources/app/extensions/sql/package.nls.json
 %%DATADIR%%/resources/app/extensions/sql/syntaxes/sql.tmLanguage.json
-%%DATADIR%%/resources/app/extensions/swift/LICENSE.md
 %%DATADIR%%/resources/app/extensions/swift/language-configuration.json
 %%DATADIR%%/resources/app/extensions/swift/package.json
 %%DATADIR%%/resources/app/extensions/swift/package.nls.json
@@ -855,7 +851,7 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/out/vs/base/node/cpuUsage.sh
 %%DATADIR%%/resources/app/out/vs/base/node/ps.sh
 %%DATADIR%%/resources/app/out/vs/base/node/terminateProcess.sh
-%%DATADIR%%/resources/app/out/vs/base/parts/sandbox/electron-sandbox/preload-slim.js
+%%DATADIR%%/resources/app/out/vs/base/parts/sandbox/electron-sandbox/preload-aux.js
 %%DATADIR%%/resources/app/out/vs/base/parts/sandbox/electron-sandbox/preload.js
 %%DATADIR%%/resources/app/out/vs/base/worker/workerMain.js
 %%DATADIR%%/resources/app/out/vs/code/electron-main/main.js
@@ -946,7 +942,6 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/extensions-web.svg
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/extensions.svg
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/git.svg
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/interactivePlayground.svg
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/languages.svg
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/learn.svg
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/light-hc.png
@@ -962,7 +957,6 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/settings.svg
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/settingsSync.svg
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/shortcuts.svg
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/sideBySide.svg
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/terminal.svg
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/workspaceTrust.svg
 %%DATADIR%%/resources/app/out/vs/workbench/services/extensionManagement/common/media/defaultIcon.png