editors/vscode: update to 1.58.2

This is the last version based on electron 12.

Changelog:
- https://code.visualstudio.com/updates/v1_57
- https://code.visualstudio.com/updates/v1_58

15 files changed, 101 insertions, 121 deletions

diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index 18042ed1fcbb..bc7e7a5d4249 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	vscode
-DISTVERSION=	1.56.2
-PORTREVISION=	4
+DISTVERSION=	1.58.2
 CATEGORIES=	editors
 MASTER_SITES=	https://registry.npmjs.org/esbuild-freebsd-64/-/:esbuild_binary \
 		https://nodejs.org/dist/v${NODE_VER}/:node_headers \
@@ -73,13 +72,13 @@ USES=		desktop-file-utils gl gmake gnome jpeg pkgconfig \
 USE_GITHUB=	yes
 GH_ACCOUNT=	microsoft
 
-SOURCE_COMMIT_HASH=	054a9295330880ed74ceaedda236253b4f39a335
+SOURCE_COMMIT_HASH=	c3f126316369cd610563c75b1b1725e0679adfb3
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \
 		xrandr xrender xscrnsaver xtst
-USE_GL=		gl glesv2
+USE_GL=		gbm gl glesv2
 USE_GNOME=	atk cairo pango gdkpixbuf2 gtk30 libxml2 libxslt
 
 USE_LDCONFIG=	${DATADIR}
@@ -88,7 +87,7 @@ USE_LDCONFIG=	${DATADIR}
 NODE_VER=	14.16.0
 NODE_VER_MAJOR=	${NODE_VER:C/\..*$//}
 # See ${WRKSRC}/build/package.json for ESBUILD_VER_BUILD
-ESBUILD_VER_BUILD=	0.8.30
+ESBUILD_VER_BUILD=	0.12.6
 # See ${WRKSRC}/extensions/package.json for ESBUILD_VER_EXTENSIONS
 ESBUILD_VER_EXTENSIONS=	0.11.12
 
diff --git a/editors/vscode/distinfo b/editors/vscode/distinfo
index af62ce10c12f..39b423b7df08 100644
--- a/editors/vscode/distinfo
+++ b/editors/vscode/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1621667721
-SHA256 (vscode/esbuild-freebsd-64-0.8.30.tgz) = 6411afe1826beb7b1fc47c7f55fb5799d86a5b9a0abd8b60b02c9a9f4e21d6d8
-SIZE (vscode/esbuild-freebsd-64-0.8.30.tgz) = 2924493
+TIMESTAMP = 1636617352
+SHA256 (vscode/esbuild-freebsd-64-0.12.6.tgz) = 356c12b53e77f210f6155cf978d2e51054e983eaf0d63d218c153b559e3e1160
+SIZE (vscode/esbuild-freebsd-64-0.12.6.tgz) = 3132209
 SHA256 (vscode/esbuild-freebsd-64-0.11.12.tgz) = 010c6fc2333da76741d982582192a36bd3419331a433de0da05a45727fe4b4b2
 SIZE (vscode/esbuild-freebsd-64-0.11.12.tgz) = 3047441
 SHA256 (vscode/node-v14.16.0-headers.tar.gz) = 4b44b92903a61c29af20550f9d25bfc3029657df6b5f0a12072a70360f7eedee
 SIZE (vscode/node-v14.16.0-headers.tar.gz) = 597013
-SHA256 (vscode/yarn-offline-cache-1.56.2.tar.gz) = dba20cb0ca4da7c37ba2e3b482a79eb379e869b4182452d833a8b896a72d88bf
-SIZE (vscode/yarn-offline-cache-1.56.2.tar.gz) = 109724191
-SHA256 (vscode/vscode-marketplace-exts-1.56.2.tar.gz) = 39ce87ab59394da9ac47c08949536d96abc5f937711fd44c1aba0adfa39e57ac
-SIZE (vscode/vscode-marketplace-exts-1.56.2.tar.gz) = 2414973
-SHA256 (vscode/microsoft-vscode-1.56.2_GH0.tar.gz) = d1963dd3aeb600c34a246dfc35ff36c0f8b3ddbd3e2c92775a50e84f159b6014
-SIZE (vscode/microsoft-vscode-1.56.2_GH0.tar.gz) = 13719381
+SHA256 (vscode/yarn-offline-cache-1.58.2.tar.gz) = e34738bc77cfd710f13a554dd537124147142175bfc93839599de3b0b9a6294a
+SIZE (vscode/yarn-offline-cache-1.58.2.tar.gz) = 113681109
+SHA256 (vscode/vscode-marketplace-exts-1.58.2.tar.gz) = 203dedc53eed84a7f2363cca07454e57f7404a354c9f063469a2a723d27dc90b
+SIZE (vscode/vscode-marketplace-exts-1.58.2.tar.gz) = 2159583
+SHA256 (vscode/microsoft-vscode-1.58.2_GH0.tar.gz) = 1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
+SIZE (vscode/microsoft-vscode-1.58.2_GH0.tar.gz) = 14503440
diff --git a/editors/vscode/files/patch-build_gulpfile.extensions.js b/editors/vscode/files/patch-build_gulpfile.extensions.js
index 92cebd634653..c44e3efd968b 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	2021-05-04 21:42:00 UTC
+--- build/gulpfile.extensions.js.orig	2021-07-14 21:51:05 UTC
 +++ build/gulpfile.extensions.js
-@@ -248,7 +248,7 @@ const cleanExtensionsBuildTask = task.define('clean-ex
+@@ -218,7 +218,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_gulpfile.vscode.js b/editors/vscode/files/patch-build_gulpfile.vscode.js
index a48b75cb117a..a39237a1c48b 100644
--- a/editors/vscode/files/patch-build_gulpfile.vscode.js
+++ b/editors/vscode/files/patch-build_gulpfile.vscode.js
@@ -1,6 +1,6 @@
---- build/gulpfile.vscode.js.orig	2021-03-04 22:21:59 UTC
+--- build/gulpfile.vscode.js.orig	2021-06-17 12:10:36 UTC
 +++ build/gulpfile.vscode.js
-@@ -285,7 +285,7 @@ function packageTask(platform, arch, sourceFolderName,
+@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName,
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/editors/vscode/files/patch-build_npm_postinstall.js b/editors/vscode/files/patch-build_npm_postinstall.js
index c5b7422ea9cc..4e057d4aae3f 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	2021-02-03 15:33:23 UTC
+--- build/npm/postinstall.js.orig	2021-07-14 21:51:05 UTC
 +++ build/npm/postinstall.js
 @@ -21,8 +21,9 @@ function yarnInstall(location, opts) {
  	const raw = process.env['npm_config_argv'] || '{}';
@@ -16,5 +16,5 @@
  	yarnInstall(watchPath);
  }
  
--cp.execSync('git config pull.rebase true');
+-cp.execSync('git config pull.rebase merges');
 +// cp.execSync('git config pull.rebase true');
diff --git a/editors/vscode/files/patch-product.json b/editors/vscode/files/patch-product.json
index 31e8781f7252..2da3381a2b2f 100644
--- a/editors/vscode/files/patch-product.json
+++ b/editors/vscode/files/patch-product.json
@@ -1,8 +1,8 @@
---- product.json.orig	2021-03-30 12:04:46 UTC
+--- product.json.orig	2021-06-17 12:10:36 UTC
 +++ product.json
-@@ -30,6 +30,17 @@
- 		"ms-vscode.remotehub",
- 		"ms-vscode.remotehub-insiders"
+@@ -31,6 +31,17 @@
+ 		"GitHub.remotehub",
+ 		"GitHub.remotehub-insiders"
  	],
 +	"documentationUrl": "https://go.microsoft.com/fwlink/?LinkID=533484",
 +	"extensionsGallery": {
diff --git a/editors/vscode/files/patch-src_bootstrap-node.js b/editors/vscode/files/patch-src_bootstrap-node.js
index 93378c04e66e..3577ae80a964 100644
--- a/editors/vscode/files/patch-src_bootstrap-node.js
+++ b/editors/vscode/files/patch-src_bootstrap-node.js
@@ -1,6 +1,6 @@
---- src/bootstrap-node.js.orig	2021-03-30 12:04:46 UTC
+--- src/bootstrap-node.js.orig	2021-07-14 21:51:05 UTC
 +++ src/bootstrap-node.js
-@@ -130,7 +130,7 @@ exports.configurePortable = function (product) {
+@@ -121,7 +121,7 @@ exports.configurePortable = function (product) {
  			return process.env['VSCODE_PORTABLE'];
  		}
  
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 1658945818bd..0920935c7dfb 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	2021-03-30 12:04:46 UTC
+--- src/vs/base/common/platform.ts.orig	2021-07-14 21:51:05 UTC
 +++ src/vs/base/common/platform.ts
-@@ -97,7 +97,7 @@ if (typeof navigator === 'object' && !isElectronRender
+@@ -103,7 +103,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 @@
  	_isWeb = true;
  	_locale = navigator.language;
  	_language = _locale;
-@@ -107,7 +107,7 @@ if (typeof navigator === 'object' && !isElectronRender
+@@ -113,7 +113,7 @@ if (typeof navigator === 'object' && !isElectronRender
  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 0eee52c9281a..697548c88d9a 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	2021-05-04 21:42:00 UTC
+--- src/vs/code/electron-main/app.ts.orig	2021-07-14 21:51:05 UTC
 +++ src/vs/code/electron-main/app.ts
-@@ -539,7 +539,7 @@ export class CodeApplication extends Disposable {
+@@ -490,7 +490,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 2b7746a7bf3d..e93bff561ead 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	2021-05-04 21:42:00 UTC
+--- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig	2021-07-14 21:51:05 UTC
 +++ src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
-@@ -1395,7 +1395,8 @@ export class ExtensionEditor extends EditorPane {
+@@ -1381,7 +1381,8 @@ export class ExtensionEditor extends EditorPane {
  
  		switch (platform) {
  			case 'win32': key = rawKeyBinding.win; break;
diff --git a/editors/vscode/files/patch-test_automation_src_code.ts b/editors/vscode/files/patch-test_automation_src_code.ts
index d5b9aea83a22..28c91a9a4bf7 100644
--- a/editors/vscode/files/patch-test_automation_src_code.ts
+++ b/editors/vscode/files/patch-test_automation_src_code.ts
@@ -1,4 +1,4 @@
---- test/automation/src/code.ts.orig	2021-03-04 22:21:59 UTC
+--- test/automation/src/code.ts.orig	2021-07-14 21:51:05 UTC
 +++ test/automation/src/code.ts
 @@ -24,7 +24,7 @@ function getDevElectronPath(): string {
  	switch (process.platform) {
@@ -18,7 +18,7 @@
  			const product = require(path.join(root, 'resources', 'app', 'product.json'));
  			return path.join(root, product.applicationName);
  		}
-@@ -145,7 +145,7 @@ export async function spawn(options: SpawnOptions): Pr
+@@ -148,7 +148,7 @@ export async function spawn(options: SpawnOptions): Pr
  		'--driver', handle
  	];
  
diff --git a/editors/vscode/files/patch-test_integration_browser_src_index.ts b/editors/vscode/files/patch-test_integration_browser_src_index.ts
deleted file mode 100644
index e4a0fecb8ebf..000000000000
--- a/editors/vscode/files/patch-test_integration_browser_src_index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/integration/browser/src/index.ts.orig	2020-10-02 16:06:59 UTC
-+++ test/integration/browser/src/index.ts
-@@ -32,7 +32,7 @@ const height = 800;
- type BrowserType = 'chromium' | 'firefox' | 'webkit';
- 
- async function runTestsInBrowser(browserType: BrowserType, endpoint: url.UrlWithStringQuery, server: cp.ChildProcess): Promise<void> {
--	const args = process.platform === 'linux' && browserType === 'chromium' ? ['--no-sandbox'] : undefined; // disable sandbox to run chrome on certain Linux distros
-+	const args = (process.platform === 'linux' || process.platform === 'freebsd') && browserType === 'chromium' ? ['--no-sandbox'] : undefined; // disable sandbox to run chrome on certain Linux distros
- 	const browser = await playwright[browserType].launch({ headless: !Boolean(optimist.argv.debug), args });
- 	const context = await browser.newContext();
- 	const page = await context.newPage();
diff --git a/editors/vscode/files/patch-test_smoke_src_main.ts b/editors/vscode/files/patch-test_smoke_src_main.ts
index 6393a91d1cca..dfcf4a0a4f1c 100644
--- a/editors/vscode/files/patch-test_smoke_src_main.ts
+++ b/editors/vscode/files/patch-test_smoke_src_main.ts
@@ -1,6 +1,6 @@
---- test/smoke/src/main.ts.orig	2021-02-03 15:33:23 UTC
+--- test/smoke/src/main.ts.orig	2021-07-14 21:51:05 UTC
 +++ test/smoke/src/main.ts
-@@ -90,7 +90,7 @@ if (!opts.web) {
+@@ -91,7 +91,7 @@ if (!opts.web) {
  		switch (process.platform) {
  			case 'darwin':
  				return path.join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron');
@@ -9,7 +9,7 @@
  				return path.join(buildPath, 'electron', `${product.applicationName}`);
  			case 'win32':
  				return path.join(buildPath, 'electron', `${product.nameShort}.exe`);
-@@ -103,7 +103,7 @@ if (!opts.web) {
+@@ -104,7 +104,7 @@ if (!opts.web) {
  		switch (process.platform) {
  			case 'darwin':
  				return path.join(root, 'Contents', 'MacOS', 'Electron');
diff --git a/editors/vscode/files/patch-test_unit_browser_index.js b/editors/vscode/files/patch-test_unit_browser_index.js
deleted file mode 100644
index 6efbdf44537b..000000000000
--- a/editors/vscode/files/patch-test_unit_browser_index.js
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/unit/browser/index.js.orig	2021-03-11 08:29:15 UTC
-+++ test/unit/browser/index.js
-@@ -146,7 +146,7 @@ function consoleLogFn(msg) {
- }
- 
- async function runTestsInBrowser(testModules, browserType) {
--	const args = process.platform === 'linux' && browserType === 'chromium' ? ['--no-sandbox'] : undefined; // disable sandbox to run chrome on certain Linux distros
-+	const args = (process.platform === 'linux' || process.platform === 'freebsd') && browserType === 'chromium' ? ['--no-sandbox'] : undefined; // disable sandbox to run chrome on certain Linux distros
- 	const browser = await playwright[browserType].launch({ headless: !Boolean(argv.debug), args });
- 	const context = await browser.newContext();
- 	const page = await context.newPage();
diff --git a/editors/vscode/pkg-plist b/editors/vscode/pkg-plist
index b3d5230188c3..432767363e37 100644
--- a/editors/vscode/pkg-plist
+++ b/editors/vscode/pkg-plist
@@ -126,6 +126,10 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/css/package.nls.json
 %%DATADIR%%/resources/app/extensions/css/syntaxes/css.tmLanguage.json
 %%DATADIR%%/resources/app/extensions/css/yarn.lock
+%%DATADIR%%/resources/app/extensions/dart/language-configuration.json
+%%DATADIR%%/resources/app/extensions/dart/package.json
+%%DATADIR%%/resources/app/extensions/dart/package.nls.json
+%%DATADIR%%/resources/app/extensions/dart/syntaxes/dart.tmLanguage.json
 %%DATADIR%%/resources/app/extensions/debug-auto-launch/.vscode/launch.json
 %%DATADIR%%/resources/app/extensions/debug-auto-launch/dist/extension.js
 %%DATADIR%%/resources/app/extensions/debug-auto-launch/dist/nls.metadata.header.json
@@ -205,6 +209,7 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/github-authentication/images/icon.png
 %%DATADIR%%/resources/app/extensions/github-authentication/package.json
 %%DATADIR%%/resources/app/extensions/github-authentication/package.nls.json
+%%DATADIR%%/resources/app/extensions/github/README.md
 %%DATADIR%%/resources/app/extensions/github/dist/extension.js
 %%DATADIR%%/resources/app/extensions/github/dist/nls.metadata.header.json
 %%DATADIR%%/resources/app/extensions/github/dist/nls.metadata.json
@@ -369,8 +374,26 @@ 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-math/.gitignore
+%%DATADIR%%/resources/app/extensions/markdown-math/README.md
+%%DATADIR%%/resources/app/extensions/markdown-math/dist/extension.js
+%%DATADIR%%/resources/app/extensions/markdown-math/esbuild.js
+%%DATADIR%%/resources/app/extensions/markdown-math/extension.webpack.config.js
+%%DATADIR%%/resources/app/extensions/markdown-math/icon.png
+%%DATADIR%%/resources/app/extensions/markdown-math/language-configuration.json
+%%DATADIR%%/resources/app/extensions/markdown-math/package.json
+%%DATADIR%%/resources/app/extensions/markdown-math/package.nls.json
+%%DATADIR%%/resources/app/extensions/markdown-math/preview-styles/index.css
+%%DATADIR%%/resources/app/extensions/markdown-math/src/extension.ts
+%%DATADIR%%/resources/app/extensions/markdown-math/src/types.d.ts
+%%DATADIR%%/resources/app/extensions/markdown-math/syntaxes/md-math-block.tmLanguage.json
+%%DATADIR%%/resources/app/extensions/markdown-math/syntaxes/md-math-inline.tmLanguage.json
+%%DATADIR%%/resources/app/extensions/markdown-math/syntaxes/md-math.tmLanguage.json
+%%DATADIR%%/resources/app/extensions/markdown-math/tsconfig.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/nls.metadata.header.json
+%%DATADIR%%/resources/app/extensions/merge-conflict/dist/nls.metadata.json
 %%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
@@ -442,26 +465,29 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/customBreakpoints.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/debugAdapter.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/profiling/basicCpuProfiler.nls.metadata.json
+%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/profiling/heapDumpProfiler.nls.metadata.json
 %%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/variables.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
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/chromehash_bg.wasm
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/dap/errors.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/diagnosticTool.bundle.js
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/extension.js
+%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/extension.js.LICENSE.txt
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/hash.bundle.js
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/mappings.wasm
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/targets/browser/browserAttacher.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/targets/node/nodeAttacher.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/targets/node/nodeBinaryProvider.nls.metadata.json
-%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/targets/node/terminalProgramLauncher.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/terminateProcess.sh
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/autoAttach.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/companionBrowserLaunch.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/configuration/chromiumDebugConfigurationProvider.nls.metadata.json
+%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/configuration/edgeDebugConfigurationProvider.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/configuration/nodeDebugConfigurationProvider.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/configuration/nodeDebugConfigurationResolver.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/debugLinkUI.nls.metadata.json
@@ -469,6 +495,7 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/debugTerminalUI.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/diagnosticsUI.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/disableSourceMapUI.nls.metadata.json
+%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/edgeDevToolOpener.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/linkedBreakpointLocationUI.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/longPredictionUI.nls.metadata.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/prettyPrint.nls.metadata.json
@@ -480,7 +507,9 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/profiling/uiProfileSession.nls.metadata.json
 %%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.node-debug/LICENSE.txt
+%%DATADIR%%/resources/app/extensions/ms-vscode.node-debug/README.md
 %%DATADIR%%/resources/app/extensions/ms-vscode.node-debug/SECURITY.md
 %%DATADIR%%/resources/app/extensions/ms-vscode.node-debug/ThirdPartyNotices.txt
 %%DATADIR%%/resources/app/extensions/ms-vscode.node-debug/dist/debugInjection.js
@@ -861,17 +890,6 @@ share/applications/code-oss.desktop
 %%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.remotehub/CHANGELOG.md
-%%DATADIR%%/resources/app/extensions/ms-vscode.remotehub/LICENSE.txt
-%%DATADIR%%/resources/app/extensions/ms-vscode.remotehub/README.md
-%%DATADIR%%/resources/app/extensions/ms-vscode.remotehub/dist/browser/extension.js
-%%DATADIR%%/resources/app/extensions/ms-vscode.remotehub/dist/extension.js
-%%DATADIR%%/resources/app/extensions/ms-vscode.remotehub/lsif.json
-%%DATADIR%%/resources/app/extensions/ms-vscode.remotehub/package.json
-%%DATADIR%%/resources/app/extensions/ms-vscode.remotehub/package.nls.json
-%%DATADIR%%/resources/app/extensions/ms-vscode.remotehub/resources/remotehub-insiders.png
-%%DATADIR%%/resources/app/extensions/ms-vscode.remotehub/resources/remotehub.png
-%%DATADIR%%/resources/app/extensions/ms-vscode.remotehub/schemas/package.schema.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/README.md
 %%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/client.bundle.js
 %%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/extension.js
@@ -974,6 +992,11 @@ share/applications/code-oss.desktop
 %%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
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts
+%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2021.d.ts
+%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2021.full.d.ts
+%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2021.promise.d.ts
+%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2021.string.d.ts
+%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2021.weakref.d.ts
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es5.d.ts
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es6.d.ts
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.esnext.d.ts
@@ -1005,12 +1028,6 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/node_modules/vscode-grammar-updater/bin.js
 %%DATADIR%%/resources/app/extensions/node_modules/vscode-grammar-updater/index.js
 %%DATADIR%%/resources/app/extensions/node_modules/vscode-grammar-updater/package.json
-%%DATADIR%%/resources/app/extensions/notebook-markdown-extensions/.gitignore
-%%DATADIR%%/resources/app/extensions/notebook-markdown-extensions/README.md
-%%DATADIR%%/resources/app/extensions/notebook-markdown-extensions/esbuild.js
-%%DATADIR%%/resources/app/extensions/notebook-markdown-extensions/icon.png
-%%DATADIR%%/resources/app/extensions/notebook-markdown-extensions/package.json
-%%DATADIR%%/resources/app/extensions/notebook-markdown-extensions/package.nls.json
 %%DATADIR%%/resources/app/extensions/npm/README.md
 %%DATADIR%%/resources/app/extensions/npm/dist/nls.metadata.header.json
 %%DATADIR%%/resources/app/extensions/npm/dist/nls.metadata.json
@@ -1254,11 +1271,15 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/node_modules.asar.unpacked/native-keymap/build/Release/keymapping.node
 %%DATADIR%%/resources/app/node_modules.asar.unpacked/native-watchdog/build/Release/watchdog.node
 %%DATADIR%%/resources/app/node_modules.asar.unpacked/node-pty/build/Release/pty.node
+%%DATADIR%%/resources/app/node_modules.asar.unpacked/node-pty/lib/shared/conout.js
+%%DATADIR%%/resources/app/node_modules.asar.unpacked/node-pty/lib/worker/conoutSocketWorker.js
 %%DATADIR%%/resources/app/node_modules.asar.unpacked/nsfw/build/Release/nsfw.node
 %%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-ripgrep/bin/rg
 %%DATADIR%%/resources/app/node_modules.asar.unpacked/vscode-sqlite3/build/Release/sqlite.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
 %%DATADIR%%/resources/app/out/bootstrap-fork.js
 %%DATADIR%%/resources/app/out/bootstrap-node.js
@@ -1319,9 +1340,9 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/out/vs/workbench/browser/parts/editor/media/letterpress-hc.svg
 %%DATADIR%%/resources/app/out/vs/workbench/browser/parts/editor/media/letterpress.svg
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/debug/browser/media/continue-tb.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/debug/browser/media/continue-without-debugging-tb.png
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/debug/browser/media/pause-tb.png
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/debug/browser/media/restart-tb.png
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/debug/browser/media/run-with-debugging-tb.png
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/debug/browser/media/stepinto-tb.png
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/debug/browser/media/stepout-tb.png
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/debug/browser/media/stepover-tb.png
@@ -1342,50 +1363,32 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/webview/electron-browser/pre/electron-index.js
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/webview/electron-browser/pre/index.html
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/colorTheme.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/dark/commandPalette.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/dark/debug.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/dark/extensions.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/dark/keymaps.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/dark/languageExtensions.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/dark/openFolder.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/dark/openVSC.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/dark/playground.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/dark/scm.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/dark/settings.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/dark/settingsSync.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/dark/shortcuts.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/dark/splitview.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/dark/tasks.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/dark/terminal.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/forwardPorts.png
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/commandPalette.svg
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/dark.png
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/debug.svg
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/extensions.svg
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/git.svg
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/github.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/hc/commandPalette.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/hc/extensions.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/hc/keymaps.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/hc/languageExtensions.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/hc/openFolder.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/hc/settings.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/hc/settingsSync.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/hc/terminal.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/light/commandPalette.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/light/debug.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/light/extensions.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/light/keymaps.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/light/languageExtensions.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/light/openFolder.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/light/openVSC.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/light/playground.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/light/scm.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/light/settings.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/light/settingsSync.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/light/shortcuts.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/light/splitview.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/light/tasks.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/light/terminal.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/pullRequests.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/remoteTerminal.png
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/runProject.png
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/interactivePlayground.svg
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/languages.svg
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/learn.svg
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/light.png
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/monokai.png
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/more.png
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/notebookThemes/colab.png
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/notebookThemes/default.png
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/notebookThemes/jupyter.png
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/openFolder.svg
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/quiet-light.png
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/runTask.svg
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/search.svg
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/settings.svg
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/settingsSync.svg
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/shortcuts.svg
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/sideBySide.svg
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/terminal.svg
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/tutorialVideo.png
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/gettingStarted/common/media/workspaceTrust.svg
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/overlay/browser/media/commandpalette-dark.svg
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/welcome/overlay/browser/media/commandpalette.svg
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/workspace/browser/media/trusted-badge.png