chore: Rebase against upstream

code/build/lib/stylelint/vscode-known-variables.json

@@ -458,8 +458,8 @@
 		"--vscode-notificationsErrorIcon-foreground",
 		"--vscode-notificationsInfoIcon-foreground",
 		"--vscode-notificationsWarningIcon-foreground",
-		"--vscode-outputEditor-background",
-		"--vscode-outputEditorStickyScroll-background",
+		"--vscode-outputView-background",
+		"--vscode-outputViewStickyScroll-background",
 		"--vscode-panel-background",
 		"--vscode-panel-border",
 		"--vscode-panel-dropBorder",

code/build/npm/preinstall.js

@@ -11,11 +11,11 @@ const patchNodeVersion = parseInt(nodeVersion[3]);
 
 if (!process.env['VSCODE_SKIP_NODE_VERSION_CHECK']) {
 	if (majorNodeVersion < 18 || (majorNodeVersion === 18 && minorNodeVersion < 15)) {
-		console.error('\033[1;31m*** Please use node.js versions >=18.15.x and <19.\033[0;0m');
+		console.error('\x1b[1;31m*** Please use node.js versions >=18.15.x and <19.\x1b[0;0m');
 		err = true;
 	}
 	if (majorNodeVersion >= 19) {
-		console.warn('\033[1;31m*** Warning: Versions of node.js >= 19 have not been tested.\033[0;0m')
+		console.warn('\x1b[1;31m*** Warning: Versions of node.js >= 19 have not been tested.\x1b[0;0m')
 	}
 }
 
@@ -35,18 +35,18 @@ if (
 	) ||
 	majorYarnVersion >= 2
 ) {
-	console.error('\033[1;31m*** Please use yarn >=1.10.1 and <2.\033[0;0m');
+	console.error('\x1b[1;31m*** Please use yarn >=1.10.1 and <2.\x1b[0;0m');
 	err = true;
 }
 
 /*if (!/yarn[\w-.]*\.c?js$|yarnpkg$/.test(process.env['npm_execpath'])) {
-	console.error('\033[1;31m*** Please use yarn to install dependencies.\033[0;0m');
+	console.error('\x1b[1;31m*** Please use yarn to install dependencies.\x1b[0;0m');
 	err = true;
 }*/
 
 if (process.platform === 'win32') {
 	if (!hasSupportedVisualStudioVersion()) {
-		console.error('\033[1;31m*** Invalid C/C++ Compiler Toolchain. Please check https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites.\033[0;0m');
+		console.error('\x1b[1;31m*** Invalid C/C++ Compiler Toolchain. Please check https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites.\x1b[0;0m');
 		err = true;
 	}
 	if (!err) {

code/extensions/git/package.nls.json

@@ -168,7 +168,7 @@
 	"config.smartCommitChanges.all": "Automatically stage all changes.",
 	"config.smartCommitChanges.tracked": "Automatically stage tracked changes only.",
 	"config.suggestSmartCommit": "Suggests to enable smart commit (commit all changes when there are no staged changes).",
-	"config.enableCommitSigning": "Enables commit signing with GPG or X.509.",
+	"config.enableCommitSigning": "Enables commit signing with GPG, X.509, or SSH.",
 	"config.discardAllScope": "Controls what changes are discarded by the `Discard all changes` command. `all` discards all changes. `tracked` discards only tracked files. `prompt` shows a prompt dialog every time the action is run.",
 	"config.decorations.enabled": "Controls whether Git contributes colors and badges to the Explorer and the Open Editors view.",
 	"config.enableStatusBarSync": "Controls whether the Git Sync command appears in the status bar.",

code/extensions/git/src/askpass-main.ts

@@ -46,7 +46,9 @@ function main(argv: string[]): void {
 	if (askpassType === 'ssh') {
 		if (/passphrase/i.test(request)) {
 			// passphrase
-			file = argv[6].replace(/^["']+|["':]+$/g, '');
+			// Commit signing - Enter passphrase:
+			// Git operation  - Enter passphrase for key '/c/Users/<username>/.ssh/id_ed25519':
+			file = argv[6]?.replace(/^["']+|["':]+$/g, '');
 		} else {
 			// authenticity
 			host = argv[6].replace(/^["']+|["':]+$/g, '');

code/extensions/git/src/askpass.ts

@@ -102,7 +102,7 @@ export class Askpass implements IIPCHandler, ITerminalEnvironmentProvider {
 			const options: InputBoxOptions = {
 				password: true,
 				placeHolder: l10n.t('Passphrase'),
-				prompt: `SSH Key: ${file}`,
+				prompt: file ? `SSH Key: ${file}` : undefined,
 				ignoreFocusOut: true
 			};
 

code/package.json

@@ -80,14 +80,14 @@
     "@vscode/windows-mutex": "^0.4.4",
     "@vscode/windows-process-tree": "^0.5.0",
     "@vscode/windows-registry": "^1.1.0",
-    "@xterm/addon-canvas": "0.6.0-beta.19",
-    "@xterm/addon-image": "0.7.0-beta.17",
-    "@xterm/addon-search": "0.14.0-beta.19",
-    "@xterm/addon-serialize": "0.12.0-beta.19",
-    "@xterm/addon-unicode11": "0.7.0-beta.19",
-    "@xterm/addon-webgl": "0.17.0-beta.19",
-    "@xterm/headless": "5.4.0-beta.19",
-    "@xterm/xterm": "5.4.0-beta.19",
+    "@xterm/addon-canvas": "0.6.0-beta.20",
+    "@xterm/addon-image": "0.7.0-beta.18",
+    "@xterm/addon-search": "0.14.0-beta.20",
+    "@xterm/addon-serialize": "0.12.0-beta.20",
+    "@xterm/addon-unicode11": "0.7.0-beta.20",
+    "@xterm/addon-webgl": "0.17.0-beta.20",
+    "@xterm/headless": "5.4.0-beta.20",
+    "@xterm/xterm": "5.4.0-beta.20",
     "graceful-fs": "4.2.11",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",

code/remote/package.json

@@ -13,14 +13,14 @@
     "@vscode/vscode-languagedetection": "1.0.21",
     "@vscode/windows-process-tree": "^0.5.0",
     "@vscode/windows-registry": "^1.1.0",
-    "@xterm/addon-canvas": "0.6.0-beta.19",
-    "@xterm/addon-image": "0.7.0-beta.17",
-    "@xterm/addon-search": "0.14.0-beta.19",
-    "@xterm/addon-serialize": "0.12.0-beta.19",
-    "@xterm/addon-unicode11": "0.7.0-beta.19",
-    "@xterm/addon-webgl": "0.17.0-beta.19",
-    "@xterm/headless": "5.4.0-beta.19",
-    "@xterm/xterm": "5.4.0-beta.19",
+    "@xterm/addon-canvas": "0.6.0-beta.20",
+    "@xterm/addon-image": "0.7.0-beta.18",
+    "@xterm/addon-search": "0.14.0-beta.20",
+    "@xterm/addon-serialize": "0.12.0-beta.20",
+    "@xterm/addon-unicode11": "0.7.0-beta.20",
+    "@xterm/addon-webgl": "0.17.0-beta.20",
+    "@xterm/headless": "5.4.0-beta.20",
+    "@xterm/xterm": "5.4.0-beta.20",
     "cookie": "^0.4.0",
     "graceful-fs": "4.2.11",
     "http-proxy-agent": "^7.0.0",

code/remote/web/package.json

@@ -7,13 +7,13 @@
 		"@microsoft/1ds-post-js": "^3.2.13",
 		"@vscode/iconv-lite-umd": "0.7.0",
 		"@vscode/vscode-languagedetection": "1.0.21",
-		"@xterm/addon-canvas": "0.6.0-beta.19",
-		"@xterm/addon-image": "0.7.0-beta.17",
-		"@xterm/addon-search": "0.14.0-beta.19",
-		"@xterm/addon-serialize": "0.12.0-beta.19",
-		"@xterm/addon-unicode11": "0.7.0-beta.19",
-		"@xterm/addon-webgl": "0.17.0-beta.19",
-		"@xterm/xterm": "5.4.0-beta.19",
+		"@xterm/addon-canvas": "0.6.0-beta.20",
+		"@xterm/addon-image": "0.7.0-beta.18",
+		"@xterm/addon-search": "0.14.0-beta.20",
+		"@xterm/addon-serialize": "0.12.0-beta.20",
+		"@xterm/addon-unicode11": "0.7.0-beta.20",
+		"@xterm/addon-webgl": "0.17.0-beta.20",
+		"@xterm/xterm": "5.4.0-beta.20",
 		"jschardet": "3.0.0",
 		"tas-client-umd": "0.1.8",
 		"vscode-oniguruma": "1.7.0",

code/remote/web/yarn.lock

@@ -48,40 +48,40 @@
   resolved "https://registry.yarnpkg.com/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz#89b48f293f6aa3341bb888c1118d16ff13b032d3"
   integrity sha512-zSUH9HYCw5qsCtd7b31yqkpaCU6jhtkKLkvOOA8yTrIRfBSOFb8PPhgmMicD7B/m+t4PwOJXzU1XDtrM9Fd3/g==
 
-"@xterm/[email protected].19":
-  version "0.6.0-beta.19"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.6.0-beta.19.tgz#5f8896b884d2a558a28eb197f7f4766ac37d33a0"
-  integrity sha512-i+26DqYgI/PZViCiEK4Vu8c4Fi5J0i+TwnFfBDLcumHH07Al1uRd5BRaVg/i93vk6bRyEIOiOiIToXSf37ov/w==
-
-"@xterm/[email protected].17":
-  version "0.7.0-beta.17"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.7.0-beta.17.tgz#bc3d6f09619ef1f3b68c7009d29ee14003a26b30"
-  integrity sha512-nnHVoYVoh+CpT4FQN/ALKesr96YvdVNUzQRQo4aAARUKst5DFaHQX9Yn/qLDN5s0WCqI3bgIEo8UAakfHITumA==
-
-"@xterm/[email protected].19":
-  version "0.14.0-beta.19"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.14.0-beta.19.tgz#2bc13378765f0d5e72d9bcb7887e23eee31de7eb"
-  integrity sha512-Y1pPdtdZj0xRQ/Is4jdO0dyZe+uM6AhWi3v2U4sdJmhz2mxVe/HAKBHkx6tyfMtX9ge/9ZYajd/Sy8rkjIFdmQ==
-
-"@xterm/[email protected].19":
-  version "0.12.0-beta.19"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.12.0-beta.19.tgz#465a9525a420b8f0d12eed419d6e051f9a887814"
-  integrity sha512-3v6a4/4gxAwoyJsBp6vJBofymgTH8paSHl8K2uQfFuLosOavNyCtrNPiNne7tpppK6t8zCDJ/mVrXNptz4Mlsg==
-
-"@xterm/[email protected].19":
-  version "0.7.0-beta.19"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.7.0-beta.19.tgz#0e81775f84346a97c657fb4cd7702de1cfe4b83f"
-  integrity sha512-U5O+JLklO4qtptWAWUw14QRWdalLl0bFAQxLKuTtDmusgfn33pNDRD6RH3R+IHhO2e6svAwrw27OcCEcdn0AJQ==
-
-"@xterm/[email protected].19":
-  version "0.17.0-beta.19"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.17.0-beta.19.tgz#fefe44c20b4d4d070363e03ae33087505a88807e"
-  integrity sha512-L59l9Cd4KTMCwnw2HPi/cUgH4iL5dK7VERK/wSTWEGYMOi3WGTmXqsg8ftfR2jFC9P33eqYNVJDmbr+pF0XsDg==
-
-"@xterm/[email protected].19":
-  version "5.4.0-beta.19"
-  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.4.0-beta.19.tgz#5c9c5cacd0cf2a0719086ce03ab035480b1cfd96"
-  integrity sha512-Rx/Y/y3YGjpiW6IUq8UlE6qrTYuUlEfpVg/BS6kIPr8/cUOchE1fsKWCMxz/u2bIyQyEovRi892iYcQJ4scstw==
+"@xterm/[email protected].20":
+  version "0.6.0-beta.20"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.6.0-beta.20.tgz#078dddef70caf880b2cb121fdda37d301fc13156"
+  integrity sha512-tHhsuqElE7LNiDJPbZzgVpmbcG2Dk6i2vh1EI+DzSByUWScDqLoeJbVPE5Xd2UW2garo24lxErpnIAlsytcA3A==
+
+"@xterm/[email protected].18":
+  version "0.7.0-beta.18"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.7.0-beta.18.tgz#588ea2d0841cff48c63bde1bfcdf56e9494dc6af"
+  integrity sha512-+HQ+IBmHPelzjRJ5zO3XkjbeQNr2Zrf5wAlbPhy4EGSD0mDCqHJSfzZ8wKrhx7t8qpfiA8eTpWu/M76WsEnlnA==
+
+"@xterm/[email protected].20":
+  version "0.14.0-beta.20"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.14.0-beta.20.tgz#cac366b1be1eb02cf9fe9537933f26f227d030c8"
+  integrity sha512-1LOL/OzWSrCBpndiBeeE2S1rxtKKgU1ucYFSG3P68W0J4VQz/Ksci1BgDKsgspj9jzpsGhdql3zwa5WEM7n4Pg==
+
+"@xterm/[email protected].20":
+  version "0.12.0-beta.20"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.12.0-beta.20.tgz#5fe126194ff4dc466b92a0946e081e039a14ad21"
+  integrity sha512-GdRCQDjLyVNBxCFnhfCWsMmuqv2PryUkOaNl4z5MqB5lBUkiEnRNY0u/s5f34+2zrijp3h0O/f9JDLW4gSUQgw==
+
+"@xterm/[email protected].20":
+  version "0.7.0-beta.20"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.7.0-beta.20.tgz#5d3c97320898dd6766f2dc127deb4f071c8698c2"
+  integrity sha512-4/uwJ6lV/xJplT7hJc7sO4Im4XNvEXHnUEFIs03FFp8ZUfu3U6wcBk6/GoKMwJKJtGVNxotiD6ZzJ5v8IBH6nA==
+
+"@xterm/[email protected].20":
+  version "0.17.0-beta.20"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.17.0-beta.20.tgz#443845ac5ac755cf762b105ed237b30426b07137"
+  integrity sha512-iqvXNSTfKIcO9FBraNwdO/ixPrTHok8CBN/wjlnGLv0ZMc4zLAiKE8+PHyg9ZY38QJfS+4Ouo8KsuZwoOYfnNA==
+
+"@xterm/[email protected].20":
+  version "5.4.0-beta.20"
+  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.4.0-beta.20.tgz#28bbbbc73eceb6ef3e1e095de195cf849d0cbfb6"
+  integrity sha512-nkY91qBy5pe1HlW9LOoLcyG6v4teEsliEtUVshAO42NrJDaPniSn28O5m5832UjZOdjLCY58QlcBkZUquODGrQ==
 
 [email protected]:
   version "3.0.0"

code/remote/yarn.lock

@@ -114,45 +114,45 @@
   resolved "https://registry.yarnpkg.com/@vscode/windows-registry/-/windows-registry-1.1.0.tgz#03dace7c29c46f658588b9885b9580e453ad21f9"
   integrity sha512-5AZzuWJpGscyiMOed0IuyEwt6iKmV5Us7zuwCDCFYMIq7tsvooO9BUiciywsvuthGz6UG4LSpeDeCxvgMVhnIw==
 
-"@xterm/[email protected].19":
-  version "0.6.0-beta.19"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.6.0-beta.19.tgz#5f8896b884d2a558a28eb197f7f4766ac37d33a0"
-  integrity sha512-i+26DqYgI/PZViCiEK4Vu8c4Fi5J0i+TwnFfBDLcumHH07Al1uRd5BRaVg/i93vk6bRyEIOiOiIToXSf37ov/w==
-
-"@xterm/[email protected].17":
-  version "0.7.0-beta.17"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.7.0-beta.17.tgz#bc3d6f09619ef1f3b68c7009d29ee14003a26b30"
-  integrity sha512-nnHVoYVoh+CpT4FQN/ALKesr96YvdVNUzQRQo4aAARUKst5DFaHQX9Yn/qLDN5s0WCqI3bgIEo8UAakfHITumA==
-
-"@xterm/[email protected].19":
-  version "0.14.0-beta.19"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.14.0-beta.19.tgz#2bc13378765f0d5e72d9bcb7887e23eee31de7eb"
-  integrity sha512-Y1pPdtdZj0xRQ/Is4jdO0dyZe+uM6AhWi3v2U4sdJmhz2mxVe/HAKBHkx6tyfMtX9ge/9ZYajd/Sy8rkjIFdmQ==
-
-"@xterm/[email protected].19":
-  version "0.12.0-beta.19"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.12.0-beta.19.tgz#465a9525a420b8f0d12eed419d6e051f9a887814"
-  integrity sha512-3v6a4/4gxAwoyJsBp6vJBofymgTH8paSHl8K2uQfFuLosOavNyCtrNPiNne7tpppK6t8zCDJ/mVrXNptz4Mlsg==
-
-"@xterm/[email protected].19":
-  version "0.7.0-beta.19"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.7.0-beta.19.tgz#0e81775f84346a97c657fb4cd7702de1cfe4b83f"
-  integrity sha512-U5O+JLklO4qtptWAWUw14QRWdalLl0bFAQxLKuTtDmusgfn33pNDRD6RH3R+IHhO2e6svAwrw27OcCEcdn0AJQ==
-
-"@xterm/[email protected].19":
-  version "0.17.0-beta.19"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.17.0-beta.19.tgz#fefe44c20b4d4d070363e03ae33087505a88807e"
-  integrity sha512-L59l9Cd4KTMCwnw2HPi/cUgH4iL5dK7VERK/wSTWEGYMOi3WGTmXqsg8ftfR2jFC9P33eqYNVJDmbr+pF0XsDg==
-
-"@xterm/[email protected].19":
-  version "5.4.0-beta.19"
-  resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.4.0-beta.19.tgz#e84a7cebda581273032f82fc8c53941204bc7f93"
-  integrity sha512-y7Ne2G/Tgn6bHr14eBHqcq5gGFFCHKGBzmXTExT1Z4Fb6ofPACPWAo60S5B6uh49W4Ts13gQYZ5C0XEvHud0Eg==
-
-"@xterm/[email protected].19":
-  version "5.4.0-beta.19"
-  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.4.0-beta.19.tgz#5c9c5cacd0cf2a0719086ce03ab035480b1cfd96"
-  integrity sha512-Rx/Y/y3YGjpiW6IUq8UlE6qrTYuUlEfpVg/BS6kIPr8/cUOchE1fsKWCMxz/u2bIyQyEovRi892iYcQJ4scstw==
+"@xterm/[email protected].20":
+  version "0.6.0-beta.20"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.6.0-beta.20.tgz#078dddef70caf880b2cb121fdda37d301fc13156"
+  integrity sha512-tHhsuqElE7LNiDJPbZzgVpmbcG2Dk6i2vh1EI+DzSByUWScDqLoeJbVPE5Xd2UW2garo24lxErpnIAlsytcA3A==
+
+"@xterm/[email protected].18":
+  version "0.7.0-beta.18"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.7.0-beta.18.tgz#588ea2d0841cff48c63bde1bfcdf56e9494dc6af"
+  integrity sha512-+HQ+IBmHPelzjRJ5zO3XkjbeQNr2Zrf5wAlbPhy4EGSD0mDCqHJSfzZ8wKrhx7t8qpfiA8eTpWu/M76WsEnlnA==
+
+"@xterm/[email protected].20":
+  version "0.14.0-beta.20"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.14.0-beta.20.tgz#cac366b1be1eb02cf9fe9537933f26f227d030c8"
+  integrity sha512-1LOL/OzWSrCBpndiBeeE2S1rxtKKgU1ucYFSG3P68W0J4VQz/Ksci1BgDKsgspj9jzpsGhdql3zwa5WEM7n4Pg==
+
+"@xterm/[email protected].20":
+  version "0.12.0-beta.20"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.12.0-beta.20.tgz#5fe126194ff4dc466b92a0946e081e039a14ad21"
+  integrity sha512-GdRCQDjLyVNBxCFnhfCWsMmuqv2PryUkOaNl4z5MqB5lBUkiEnRNY0u/s5f34+2zrijp3h0O/f9JDLW4gSUQgw==
+
+"@xterm/[email protected].20":
+  version "0.7.0-beta.20"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.7.0-beta.20.tgz#5d3c97320898dd6766f2dc127deb4f071c8698c2"
+  integrity sha512-4/uwJ6lV/xJplT7hJc7sO4Im4XNvEXHnUEFIs03FFp8ZUfu3U6wcBk6/GoKMwJKJtGVNxotiD6ZzJ5v8IBH6nA==
+
+"@xterm/[email protected].20":
+  version "0.17.0-beta.20"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.17.0-beta.20.tgz#443845ac5ac755cf762b105ed237b30426b07137"
+  integrity sha512-iqvXNSTfKIcO9FBraNwdO/ixPrTHok8CBN/wjlnGLv0ZMc4zLAiKE8+PHyg9ZY38QJfS+4Ouo8KsuZwoOYfnNA==
+
+"@xterm/[email protected].20":
+  version "5.4.0-beta.20"
+  resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.4.0-beta.20.tgz#af26d3d0e2cdd615ccfac4a8660181fee19898fd"
+  integrity sha512-H/as1d67J43/CB8xt1Yg/eJMbq1yopwG1bDBKdsf2ro8A1PmJFXNzaDB+wSgoH42fCusSpLJvXtUvDLtqfvBTg==
+
+"@xterm/[email protected].20":
+  version "5.4.0-beta.20"
+  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.4.0-beta.20.tgz#28bbbbc73eceb6ef3e1e095de195cf849d0cbfb6"
+  integrity sha512-nkY91qBy5pe1HlW9LOoLcyG6v4teEsliEtUVshAO42NrJDaPniSn28O5m5832UjZOdjLCY58QlcBkZUquODGrQ==
 
 agent-base@^7.0.1, agent-base@^7.0.2, agent-base@^7.1.0:
   version "7.1.0"

code/scripts/xterm-symlink.ps1

@@ -0,0 +1,34 @@
+<#
+.SYNOPSIS
+    Symlinks ./node_modules/xterm to provided $XtermFolder.
+#>
+
+Param(
+	[Parameter(Mandatory=$True)]
+	$XtermFolder
+)
+
+$TargetFolder = "./node_modules/@xterm/xterm"
+
+if (Test-Path $TargetFolder -PathType Container)
+{
+	Write-Host -ForegroundColor Green ":: Deleting $TargetFolder`n"
+	Remove-Item -Path $TargetFolder
+}
+
+if (Test-Path $XtermFolder -PathType Container)
+{
+	Write-Host -ForegroundColor Green "`n:: Creating symlink $TargetFolder -> $XtermFolder`n"
+	New-Item -Path $TargetFolder -ItemType SymbolicLink -Value $XtermFolder
+
+	Write-Host -ForegroundColor Green "`n:: Packaging xterm.js`n"
+	Set-Location $TargetFolder
+	yarn package -- --mode development
+	Set-Location -
+
+	Write-Host -ForegroundColor Green "`n:: Finished! To watch changes, open the VS Code terminal in the xterm.js repo and run:`n`n    yarn package -- --mode development --watch"
+}
+else
+{
+	Write-Error -ForegroundColor Red "`n:: $XtermFolder is not a valid folder"
+}

code/scripts/xterm-update.ps1

@@ -0,0 +1 @@
+node $PSScriptRoot\xterm-update.js (Get-Location)

code/src/vs/base/browser/ui/list/listWidget.ts

@@ -109,9 +109,8 @@ class TraitRenderer<T> implements IListRenderer<T, ITraitTemplateData>
 
 class Trait<T> implements ISpliceable<boolean>, IDisposable {
 
-	private length = 0;
-	private indexes: number[] = [];
-	private sortedIndexes: number[] = [];
+	protected indexes: number[] = [];
+	protected sortedIndexes: number[] = [];
 
 	private readonly _onChange = new Emitter<ITraitChangeEvent>();
 	readonly onChange: Event<ITraitChangeEvent> = this._onChange.event;
@@ -126,8 +125,6 @@ class Trait<T> implements ISpliceable<boolean>, IDisposable {
 	constructor(private _trait: string) { }
 
 	splice(start: number, deleteCount: number, elements: boolean[]): void {
-		deleteCount = Math.max(0, Math.min(deleteCount, this.length - start));
-
 		const diff = elements.length - deleteCount;
 		const end = start + deleteCount;
 		const sortedIndexes: number[] = [];
@@ -147,16 +144,8 @@ class Trait<T> implements ISpliceable<boolean>, IDisposable {
 			sortedIndexes.push(this.sortedIndexes[i++] + diff);
 		}
 
-		const length = this.length + diff;
-
-		if (this.sortedIndexes.length > 0 && sortedIndexes.length === 0 && length > 0) {
-			const first = this.sortedIndexes.find(index => index >= start) ?? length - 1;
-			sortedIndexes.push(Math.min(first, length - 1));
-		}
-
 		this.renderer.splice(start, deleteCount, elements.length);
 		this._set(sortedIndexes, sortedIndexes);
-		this.length = length;
 	}
 
 	renderIndex(index: number, container: HTMLElement): void {