git: 293d2a10f603 - main - editors/vscode: update to 1.68.0

From: Hiroki Tagato <tagattie_at_FreeBSD.org>
Date: Sun, 12 Jun 2022 04:49:59 UTC
The branch main has been updated by tagattie:

URL: https://cgit.FreeBSD.org/ports/commit/?id=293d2a10f6030830ce8e4f36e48dcc6a6f06d417

commit 293d2a10f6030830ce8e4f36e48dcc6a6f06d417
Author:     Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2022-06-12 04:48:27 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2022-06-12 04:49:52 +0000

    editors/vscode: update to 1.68.0
    
    Changelog: https://code.visualstudio.com/updates/v1_68
---
 editors/vscode/Makefile                            |  5 ++--
 editors/vscode/distinfo                            | 14 +++++------
 .../files/patch-build_gulpfile.extensions.js       |  4 ++--
 .../vscode/files/patch-build_npm_postinstall.js    |  6 ++---
 editors/vscode/files/patch-product.json            |  6 ++---
 .../vscode/files/patch-resources_linux_bin_code.sh |  8 +++----
 .../files/patch-src_vs_code_electron-main_app.ts   |  4 ++--
 ...-src_vs_workbench_api_browser_mainThreadTask.ts |  4 ++--
 ...h_contrib_extensions_browser_extensionEditor.ts |  4 ++--
 editors/vscode/pkg-plist                           | 28 ++++++++++++----------
 10 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index 5d63829dccdb..58c63bf6584f 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	vscode
-DISTVERSION=	1.67.2
-PORTREVISION=	3
+DISTVERSION=	1.68.0
 CATEGORIES=	editors
 MASTER_SITES=	https://registry.npmjs.org/esbuild-freebsd-64/-/:esbuild_binary \
 		https://nodejs.org/dist/v${NODE_VER}/:node_headers \
@@ -69,7 +68,7 @@ USES=		desktop-file-utils gl gmake gnome iconv jpeg pkgconfig \
 USE_GITHUB=	yes
 GH_ACCOUNT=	microsoft
 
-SOURCE_COMMIT_HASH=	c3511e6c69bb39013c4a4b7b9566ec1ca73fc4d5
+SOURCE_COMMIT_HASH=	4af164ea3a06f701fe3e89a2bcbb421d2026b68f
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
diff --git a/editors/vscode/distinfo b/editors/vscode/distinfo
index 68ec1634e32f..e469685ad6c8 100644
--- a/editors/vscode/distinfo
+++ b/editors/vscode/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1652921429
+TIMESTAMP = 1654932461
 SHA256 (vscode/esbuild-freebsd-64-0.14.2.tgz) = 9e5669e0afa0bdccdce9ab5c07eeec45cc3116ebdeb2739ff7f11e27c6ab6c34
 SIZE (vscode/esbuild-freebsd-64-0.14.2.tgz) = 3228893
 SHA256 (vscode/esbuild-freebsd-64-0.11.23.tgz) = 976dc94c9aa92d7ef029c1f5e246883986fa92626aba8c8a37876a6929c64c30
 SIZE (vscode/esbuild-freebsd-64-0.11.23.tgz) = 3108323
 SHA256 (vscode/node-v16.13.0-headers.tar.gz) = 9abfc6dcd32bce3b9a978b8c23b8bb48a562c94919feba489f9bb9d4bbeeae66
 SIZE (vscode/node-v16.13.0-headers.tar.gz) = 561593
-SHA256 (vscode/yarn-offline-cache-1.67.2.tar.gz) = 256e42fa3a937715e3cf8b70e684de767adbeff662769be23e30a9d455d9831c
-SIZE (vscode/yarn-offline-cache-1.67.2.tar.gz) = 155547818
-SHA256 (vscode/vscode-marketplace-exts-1.67.2.tar.gz) = 0c79dcc3891da8720965bb1e37bf5b06d6ff468de3591a6467d0ff4c35b4894c
-SIZE (vscode/vscode-marketplace-exts-1.67.2.tar.gz) = 1557167
-SHA256 (vscode/microsoft-vscode-1.67.2_GH0.tar.gz) = 3edf6b340a9d49721d170ac14884a73502091122aac8c3a6190047d3ef9b15c8
-SIZE (vscode/microsoft-vscode-1.67.2_GH0.tar.gz) = 14731169
+SHA256 (vscode/yarn-offline-cache-1.68.0.tar.gz) = 2626dd9277c73c2cb35c7736501499cdb203e47dcaf9094bf763e92c19846a07
+SIZE (vscode/yarn-offline-cache-1.68.0.tar.gz) = 157536832
+SHA256 (vscode/vscode-marketplace-exts-1.68.0.tar.gz) = d58209ee20bd8f9fd282b05bfbb92ebac586dc170f52fb98652473fee1ca99cf
+SIZE (vscode/vscode-marketplace-exts-1.68.0.tar.gz) = 1735717
+SHA256 (vscode/microsoft-vscode-1.68.0_GH0.tar.gz) = 585c6776a037bfee6be776d4b1944d52765a04629ef511c89ab2bf305185d8f2
+SIZE (vscode/microsoft-vscode-1.68.0_GH0.tar.gz) = 15273650
diff --git a/editors/vscode/files/patch-build_gulpfile.extensions.js b/editors/vscode/files/patch-build_gulpfile.extensions.js
index 1b49af99d5b1..5e69e0f97b50 100644
--- a/editors/vscode/files/patch-build_gulpfile.extensions.js
+++ b/editors/vscode/files/patch-build_gulpfile.extensions.js
@@ -1,6 +1,6 @@
---- build/gulpfile.extensions.js.orig	2022-05-16 17:42:35 UTC
+--- build/gulpfile.extensions.js.orig	2022-06-08 11:20:55 UTC
 +++ build/gulpfile.extensions.js
-@@ -222,7 +222,7 @@ const cleanExtensionsBuildTask = task.define('clean-ex
+@@ -223,7 +223,7 @@ const cleanExtensionsBuildTask = task.define('clean-ex
  const compileExtensionsBuildTask = task.define('compile-extensions-build', task.series(
  	cleanExtensionsBuildTask,
  	task.define('bundle-extensions-build', () => ext.packageLocalExtensionsStream(false).pipe(gulp.dest('.build'))),
diff --git a/editors/vscode/files/patch-build_npm_postinstall.js b/editors/vscode/files/patch-build_npm_postinstall.js
index ba263fc339d8..9013734a9ffb 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	2022-04-11 07:30:00 UTC
+--- build/npm/postinstall.js.orig	2022-06-08 11:20:55 UTC
 +++ build/npm/postinstall.js
 @@ -20,7 +20,8 @@ function yarnInstall(location, opts) {
  	const raw = process.env['npm_config_argv'] || '{}';
@@ -10,8 +10,8 @@
  	if (opts.ignoreEngines) {
  		args.push('--ignore-engines');
  		delete opts.ignoreEngines;
-@@ -91,5 +92,5 @@ runtime "${runtime}"`;
- 	yarnInstall(watchPath);
+@@ -73,5 +74,5 @@ for (let dir of dirs) {
+ 	yarnInstall(dir, opts);
  }
  
 -cp.execSync('git config pull.rebase merges');
diff --git a/editors/vscode/files/patch-product.json b/editors/vscode/files/patch-product.json
index e998d9776de9..2838935ea55a 100644
--- a/editors/vscode/files/patch-product.json
+++ b/editors/vscode/files/patch-product.json
@@ -1,9 +1,9 @@
---- product.json.orig	2022-05-16 17:42:35 UTC
+--- product.json.orig	2022-06-08 11:20:55 UTC
 +++ product.json
 @@ -28,6 +28,17 @@
  	"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
  	"urlProtocol": "code-oss",
- 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/181b43c0e2949e36ecb623d8cc6de29d4fa2bae8/out/vs/workbench/contrib/webview/browser/pre/",
+ 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/3c8520fab514b9f56070214496b26ff68d1b1cb5/out/vs/workbench/contrib/webview/browser/pre/",
 +	"documentationUrl": "https://go.microsoft.com/fwlink/?LinkID=533484",
 +	"extensionsGallery": {
 +		"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
@@ -17,4 +17,4 @@
 +	"tipsAndTricksUrl": "https://go.microsoft.com/fwlink/?linkid=852118",
  	"builtInExtensions": [
  		{
- 			"name": "ms-vscode.references-view",
+ 			"name": "ms-vscode.js-debug-companion",
diff --git a/editors/vscode/files/patch-resources_linux_bin_code.sh b/editors/vscode/files/patch-resources_linux_bin_code.sh
index 51f4e1521ec8..8dfaf087e568 100644
--- a/editors/vscode/files/patch-resources_linux_bin_code.sh
+++ b/editors/vscode/files/patch-resources_linux_bin_code.sh
@@ -1,11 +1,11 @@
---- resources/linux/bin/code.sh.orig	2020-07-21 14:27:11 UTC
+--- resources/linux/bin/code.sh.orig	2022-06-08 11:20:55 UTC
 +++ resources/linux/bin/code.sh
-@@ -4,7 +4,7 @@
- # Licensed under the MIT License. See License.txt in the project root for license information.
+@@ -13,7 +13,7 @@ if [ -n "$VSCODE_IPC_HOOK_CLI" ]; then
+ fi
  
  # test that VSCode wasn't installed inside WSL
 -if grep -qi Microsoft /proc/version && [ -z "$DONT_PROMPT_WSL_INSTALL" ]; then
 +if grep -qi Microsoft /proc/version 2> /dev/null && [ -z "$DONT_PROMPT_WSL_INSTALL" ]; then
- 	echo "To use @@PRODNAME@@ with the Windows Subsystem for Linux, please install @@PRODNAME@@ in Windows and uninstall the Linux version in WSL. You can then use the \`@@NAME@@\` command in a WSL terminal just as you would in a normal command prompt." 1>&2
+ 	echo "To use @@PRODNAME@@ with the Windows Subsystem for Linux, please install @@PRODNAME@@ in Windows and uninstall the Linux version in WSL. You can then use the \`@@APPNAME@@\` command in a WSL terminal just as you would in a normal command prompt." 1>&2
  	printf "Do you want to continue anyway? [y/N] " 1>&2
  	read -r YN
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 2ad34862bec8..e8bc5965213b 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	2022-05-16 17:42:35 UTC
+--- src/vs/code/electron-main/app.ts.orig	2022-06-08 11:20:55 UTC
 +++ src/vs/code/electron-main/app.ts
-@@ -585,7 +585,7 @@ export class CodeApplication extends Disposable {
+@@ -587,7 +587,7 @@ export class CodeApplication extends Disposable {
  				services.set(IUpdateService, new SyncDescriptor(Win32UpdateService));
  				break;
  
diff --git a/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts b/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts
index 587152993056..e0524753a7aa 100644
--- a/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts
+++ b/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts
@@ -1,6 +1,6 @@
---- src/vs/workbench/api/browser/mainThreadTask.ts.orig	2021-08-18 23:34:31 UTC
+--- src/vs/workbench/api/browser/mainThreadTask.ts.orig	2022-06-08 11:20:55 UTC
 +++ src/vs/workbench/api/browser/mainThreadTask.ts
-@@ -650,7 +650,7 @@ export class MainThreadTask implements MainThreadTaskS
+@@ -662,7 +662,7 @@ export class MainThreadTask implements MainThreadTaskS
  			case 'darwin':
  				platform = Platform.Platform.Mac;
  				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 6e7c3d0b3967..07388aa6ce82 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	2022-05-16 17:42:35 UTC
+--- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig	2022-06-08 11:20:55 UTC
 +++ src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
-@@ -1752,7 +1752,8 @@ export class ExtensionEditor extends EditorPane {
+@@ -1773,7 +1773,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 7eee210ba8ec..3bcf4e66e4ac 100644
--- a/editors/vscode/pkg-plist
+++ b/editors/vscode/pkg-plist
@@ -491,6 +491,7 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/resources/readme/top-level-await.png
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/resources/readme/web-worker.png
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/resources/readme/webview2.png
+%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/25b0f220a897d7433728f6f34169bdbf.node
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/breakpoints/userDefinedBreakpoint.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/console/queryObjectsMessage.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/console/textualMessage.nls.metadata.json
@@ -502,6 +503,7 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/sources.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/stackTrace.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/threads.nls.metadata.json
+%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/variableStore.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/binder.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/bootloader.bundle.js
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/bootloader.bundle.js.LICENSE.txt
@@ -540,14 +542,6 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/terminalLinkHandler.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/watchdog.bundle.js
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/watchdog.bundle.js.LICENSE.txt
-%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/LICENSE.txt
-%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/README.md
-%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/SECURITY.md
-%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/ThirdPartyNotices.txt
-%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/dist/extension.js
-%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/dist/extension.js.map
-%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/media/icon.png
-%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/package.json
 %%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
@@ -608,8 +602,10 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2019.symbol.d.ts
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2020.bigint.d.ts
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2020.d.ts
+%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2020.date.d.ts
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2020.full.d.ts
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2020.intl.d.ts
+%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2020.number.d.ts
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2020.promise.d.ts
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2020.string.d.ts
@@ -624,6 +620,7 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2022.d.ts
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2022.error.d.ts
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2022.full.d.ts
+%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2022.intl.d.ts
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2022.object.d.ts
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2022.string.d.ts
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es5.d.ts
@@ -710,6 +707,14 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/razor/package.json
 %%DATADIR%%/resources/app/extensions/razor/package.nls.json
 %%DATADIR%%/resources/app/extensions/razor/syntaxes/cshtml.tmLanguage.json
+%%DATADIR%%/resources/app/extensions/references-view/README.md
+%%DATADIR%%/resources/app/extensions/references-view/dist/extension.js
+%%DATADIR%%/resources/app/extensions/references-view/dist/nls.metadata.header.json
+%%DATADIR%%/resources/app/extensions/references-view/dist/nls.metadata.json
+%%DATADIR%%/resources/app/extensions/references-view/media/demo.png
+%%DATADIR%%/resources/app/extensions/references-view/media/icon.png
+%%DATADIR%%/resources/app/extensions/references-view/package.json
+%%DATADIR%%/resources/app/extensions/references-view/package.nls.json
 %%DATADIR%%/resources/app/extensions/restructuredtext/language-configuration.json
 %%DATADIR%%/resources/app/extensions/restructuredtext/package.json
 %%DATADIR%%/resources/app/extensions/restructuredtext/package.nls.json
@@ -867,6 +872,7 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/node_modules.asar.unpacked/node-pty/lib/worker/conoutSocketWorker.js
 %%DATADIR%%/resources/app/node_modules.asar.unpacked/spdlog/build/Release/spdlog.node
 %%DATADIR%%/resources/app/node_modules.asar.unpacked/vscode-oniguruma/release/onig.wasm
+%%DATADIR%%/resources/app/node_modules.asar.unpacked/vscode-policy-watcher/build/Release/vscode-policy-watcher.node
 %%DATADIR%%/resources/app/node_modules.asar.unpacked/windows-foreground-love/build/Release/foreground_love.node
 %%DATADIR%%/resources/app/node_modules.asar.unpacked/windows-foreground-love/build/Release/obj.target/foreground_love.node
 %%DATADIR%%/resources/app/out/bootstrap-amd.js
@@ -914,8 +920,6 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/out/vs/code/node/cliProcessMain.nls.js
 %%DATADIR%%/resources/app/out/vs/loader.js
 %%DATADIR%%/resources/app/out/vs/platform/environment/node/userDataPath.js
-%%DATADIR%%/resources/app/out/vs/platform/extensions/node/extensionHostStarterWorker.js
-%%DATADIR%%/resources/app/out/vs/platform/extensions/node/extensionHostStarterWorkerMain.js
 %%DATADIR%%/resources/app/out/vs/platform/files/node/watcher/watcherMain.js
 %%DATADIR%%/resources/app/out/vs/platform/files/node/watcher/watcherMain.nls.js
 %%DATADIR%%/resources/app/out/vs/platform/sharedProcess/electron-browser/sharedProcessWorkerMain.js
@@ -959,13 +963,13 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/output/common/outputLinkComputer.js
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/terminal/browser/media/shellIntegration-env.zsh
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/terminal/browser/media/shellIntegration-login.zsh
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/terminal/browser/media/shellIntegration-profile.zsh
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/terminal/browser/media/shellIntegration.zsh
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/webview/browser/pre/fake.html
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/webview/browser/pre/index.html
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/webview/browser/pre/main.js
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/webview/browser/pre/service-worker.js
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/colorTheme.png
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/commandPalette.svg