Update xterm and integrate new scroll bars

extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts

@@ -10,7 +10,8 @@ import { assertNoRpc } from '../utils';
 
 // Terminal integration tests are disabled on web https://github.com/microsoft/vscode/issues/92826
 // Windows images will often not have functional shell integration
-(env.uiKind === UIKind.Web || platform() === 'win32' ? suite.skip : suite)('vscode API - Terminal.shellIntegration', () => {
+// TODO: Linux https://github.com/microsoft/vscode/issues/221399
+(env.uiKind === UIKind.Web || platform() === 'win32' || platform() === 'linux' ? suite.skip : suite)('vscode API - Terminal.shellIntegration', () => {
 	const disposables: Disposable[] = [];
 
 	suiteSetup(async () => {

package.json

@@ -82,14 +82,14 @@
     "@vscode/windows-mutex": "^0.5.0",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
-    "@xterm/addon-clipboard": "0.2.0-beta.19",
-    "@xterm/addon-image": "0.9.0-beta.36",
-    "@xterm/addon-search": "0.16.0-beta.36",
-    "@xterm/addon-serialize": "0.14.0-beta.36",
-    "@xterm/addon-unicode11": "0.9.0-beta.36",
-    "@xterm/addon-webgl": "0.19.0-beta.36",
-    "@xterm/headless": "5.6.0-beta.36",
-    "@xterm/xterm": "5.6.0-beta.36",
+    "@xterm/addon-clipboard": "0.2.0-beta.29",
+    "@xterm/addon-image": "0.9.0-beta.46",
+    "@xterm/addon-search": "0.16.0-beta.46",
+    "@xterm/addon-serialize": "0.14.0-beta.46",
+    "@xterm/addon-unicode11": "0.9.0-beta.46",
+    "@xterm/addon-webgl": "0.19.0-beta.46",
+    "@xterm/headless": "5.6.0-beta.46",
+    "@xterm/xterm": "5.6.0-beta.46",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
     "jschardet": "3.1.3",

remote/package.json

@@ -14,14 +14,14 @@
     "@vscode/vscode-languagedetection": "1.0.21",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
-    "@xterm/addon-clipboard": "0.2.0-beta.19",
-    "@xterm/addon-image": "0.9.0-beta.36",
-    "@xterm/addon-search": "0.16.0-beta.36",
-    "@xterm/addon-serialize": "0.14.0-beta.36",
-    "@xterm/addon-unicode11": "0.9.0-beta.36",
-    "@xterm/addon-webgl": "0.19.0-beta.36",
-    "@xterm/headless": "5.6.0-beta.36",
-    "@xterm/xterm": "5.6.0-beta.36",
+    "@xterm/addon-clipboard": "0.2.0-beta.29",
+    "@xterm/addon-image": "0.9.0-beta.46",
+    "@xterm/addon-search": "0.16.0-beta.46",
+    "@xterm/addon-serialize": "0.14.0-beta.46",
+    "@xterm/addon-unicode11": "0.9.0-beta.46",
+    "@xterm/addon-webgl": "0.19.0-beta.46",
+    "@xterm/headless": "5.6.0-beta.46",
+    "@xterm/xterm": "5.6.0-beta.46",
     "cookie": "^0.4.0",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",

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-clipboard": "0.2.0-beta.19",
-		"@xterm/addon-image": "0.9.0-beta.36",
-		"@xterm/addon-search": "0.16.0-beta.36",
-		"@xterm/addon-serialize": "0.14.0-beta.36",
-		"@xterm/addon-unicode11": "0.9.0-beta.36",
-		"@xterm/addon-webgl": "0.19.0-beta.36",
-		"@xterm/xterm": "5.6.0-beta.36",
+		"@xterm/addon-clipboard": "0.2.0-beta.29",
+		"@xterm/addon-image": "0.9.0-beta.46",
+		"@xterm/addon-search": "0.16.0-beta.46",
+		"@xterm/addon-serialize": "0.14.0-beta.46",
+		"@xterm/addon-unicode11": "0.9.0-beta.46",
+		"@xterm/addon-webgl": "0.19.0-beta.46",
+		"@xterm/xterm": "5.6.0-beta.46",
 		"jschardet": "3.1.3",
 		"tas-client-umd": "0.2.0",
 		"vscode-oniguruma": "1.7.0",

remote/web/yarn.lock

@@ -48,42 +48,42 @@
   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.2.0-beta.19"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.19.tgz#da2ea7a0d6e51383d4a21cbb04fb7fbd9db7d853"
-  integrity sha512-A/NxJQoOq21kE1ykZ07Cw3IxD5cQFxba1iMxnSFvWGVC71ZdHGwUveLeY8nHWEL8PfLsZxAgIzlMTfWgfkQ+CA==
+"@xterm/[email protected].29":
+  version "0.2.0-beta.29"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.29.tgz#cd0b9674d06732e8d644f3c83e66be3fc3071df4"
+  integrity sha512-IwiEN31P2t1gBtq65DoDtNdyQEmbkfBEM439+73U/4EYgMWik6iAM6gLGGG8QNtSqyugWbkNV+w4Lirk6D3oCw==
   dependencies:
     js-base64 "^3.7.5"
 
-"@xterm/[email protected].36":
-  version "0.9.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.9.0-beta.36.tgz#79024103c48f4e401ca15afe49fad4f3834c023c"
-  integrity sha512-m8c5OfJBzPYfv90mSgc0bX/P+qUsgczVajHW+kE59UoC311ng13IlCg6a4bJHb2EHqGsq19fIrYCn6+JsMdRsQ==
-
-"@xterm/[email protected].36":
-  version "0.16.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.16.0-beta.36.tgz#22deda3250552f24de05f8112299d15f3fe90f01"
-  integrity sha512-lN66vYpKvNBxbvtJXLbuidirirmIzySXnl8JvarcrDaw4HlqluOvvjEdVYKofWV5ZGSaPfIAijwJW1f0KjUhJw==
-
-"@xterm/[email protected].36":
-  version "0.14.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.36.tgz#1407c13fe1bd869ad4f26e7b7da4e7fa87442021"
-  integrity sha512-6KpzHlQIuHakPv70dKhQp8f6e9hk4q1fNuuTD1rEzDg8DeKRfUDjorw1vPkKTB/DD+3zaMUBtg7DFVVEi+/+Cw==
-
-"@xterm/[email protected].36":
-  version "0.9.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.36.tgz#158dcdd707a466958a256a960e5d9a967a97a9dc"
-  integrity sha512-BKP2ml0fYOHnfaTp0LorSluNXjHRSEwf3yrD3K6jEZfYTBePhee1TAxOdNH/TdqwNYZYaYHaK87A5mSuYpKPBQ==
-
-"@xterm/[email protected].36":
-  version "0.19.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.36.tgz#8926a0434e5ce74eee12a965c06cd5f601391f18"
-  integrity sha512-bJA1enVNlIMRkBU9i7i8qX26Zs2/CrGedREW5WI0NZUAn0IHlatWlj3aOfTuI2MYWUPGE8ul30PyipYP6P+fmA==
-
-"@xterm/[email protected].36":
-  version "5.6.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.6.0-beta.36.tgz#fd0fd598b67e3bcba61a59bb1a33b131ad86eea3"
-  integrity sha512-YtFKQIggbvV2brWifksZAtLi447j0DFdoSRoq4vQi/N7KFC0pguGdG3YzYkDOyqoeLMPu569e2b5oevMe6d2aQ==
+"@xterm/[email protected].46":
+  version "0.9.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.9.0-beta.46.tgz#b1b4743bb1d2944cc6c0f5e3db64e9d642bd64be"
+  integrity sha512-vI9jn16uGT6ucm/+/6tLoftqo5WlWyX8Qts1Q+cpp9r7w1hNb/Xm0S5Zn89F19PfNIT8lMsr1GmYAJxUHDd4dQ==
+
+"@xterm/[email protected].46":
+  version "0.16.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.16.0-beta.46.tgz#5d8d1a055a1d501f3fba9044080132eccf346e4a"
+  integrity sha512-L5C7dDKhZQ0OPE2DgfJsagcyAIIj67EFPGE2GIiOa301djfULR4yReIMXTzwfTWS6vDn3yN0XGiO58glh9oJkw==
+
+"@xterm/[email protected].46":
+  version "0.14.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.46.tgz#e1d8faccf2d2651f2be43723a79d3e85c99af02b"
+  integrity sha512-QH2wl4pUU3OMOpT6TF06sSgTNF1sA0sri6tvvfgLBv8F4sZDqfd4RwQOXxSteUCfxlo9L4066633lcZgjFBotQ==
+
+"@xterm/[email protected].46":
+  version "0.9.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.46.tgz#a361de7edcb0e36ede64e08a230cc2e7ecd28fd1"
+  integrity sha512-/ilzq5k90rUhFf3mUBb3HNjzMKVix9bS5Yp5ZSOVtcMu0fkscfoBubOhNMvEfsDb50fHi0BwZH9cZaYWYU6yfQ==
+
+"@xterm/[email protected].46":
+  version "0.19.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.46.tgz#f916ab5841365deca722ab06b6e30794c7da083e"
+  integrity sha512-wEC4WspfcibPxxIIEiUdxG+Pw1AgjU/73NuqjZ7VWIitXZwcVzj0wHiwX2d+ild3Ba255yB3sOHJRLc/yhsr2g==
+
+"@xterm/[email protected].46":
+  version "5.6.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.6.0-beta.46.tgz#91ba1f484dafbe126e3163380fa08c7e391b286f"
+  integrity sha512-Ur/ki1PSOXxJRt3ivRU5mG/DVqVDa3OaqoIsGdCMGulHUDhes4KGoYMzlyFqsaLdhl1zKcnM1S34e6xPsIrA+w==
 
 js-base64@^3.7.5:
   version "3.7.7"

remote/yarn.lock

@@ -122,47 +122,47 @@
   resolved "https://registry.yarnpkg.com/@vscode/windows-registry/-/windows-registry-1.1.0.tgz#03dace7c29c46f658588b9885b9580e453ad21f9"
   integrity sha512-5AZzuWJpGscyiMOed0IuyEwt6iKmV5Us7zuwCDCFYMIq7tsvooO9BUiciywsvuthGz6UG4LSpeDeCxvgMVhnIw==
 
-"@xterm/[email protected].19":
-  version "0.2.0-beta.19"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.19.tgz#da2ea7a0d6e51383d4a21cbb04fb7fbd9db7d853"
-  integrity sha512-A/NxJQoOq21kE1ykZ07Cw3IxD5cQFxba1iMxnSFvWGVC71ZdHGwUveLeY8nHWEL8PfLsZxAgIzlMTfWgfkQ+CA==
+"@xterm/[email protected].29":
+  version "0.2.0-beta.29"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.29.tgz#cd0b9674d06732e8d644f3c83e66be3fc3071df4"
+  integrity sha512-IwiEN31P2t1gBtq65DoDtNdyQEmbkfBEM439+73U/4EYgMWik6iAM6gLGGG8QNtSqyugWbkNV+w4Lirk6D3oCw==
   dependencies:
     js-base64 "^3.7.5"
 
-"@xterm/[email protected].36":
-  version "0.9.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.9.0-beta.36.tgz#79024103c48f4e401ca15afe49fad4f3834c023c"
-  integrity sha512-m8c5OfJBzPYfv90mSgc0bX/P+qUsgczVajHW+kE59UoC311ng13IlCg6a4bJHb2EHqGsq19fIrYCn6+JsMdRsQ==
-
-"@xterm/[email protected].36":
-  version "0.16.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.16.0-beta.36.tgz#22deda3250552f24de05f8112299d15f3fe90f01"
-  integrity sha512-lN66vYpKvNBxbvtJXLbuidirirmIzySXnl8JvarcrDaw4HlqluOvvjEdVYKofWV5ZGSaPfIAijwJW1f0KjUhJw==
-
-"@xterm/[email protected].36":
-  version "0.14.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.36.tgz#1407c13fe1bd869ad4f26e7b7da4e7fa87442021"
-  integrity sha512-6KpzHlQIuHakPv70dKhQp8f6e9hk4q1fNuuTD1rEzDg8DeKRfUDjorw1vPkKTB/DD+3zaMUBtg7DFVVEi+/+Cw==
-
-"@xterm/[email protected].36":
-  version "0.9.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.36.tgz#158dcdd707a466958a256a960e5d9a967a97a9dc"
-  integrity sha512-BKP2ml0fYOHnfaTp0LorSluNXjHRSEwf3yrD3K6jEZfYTBePhee1TAxOdNH/TdqwNYZYaYHaK87A5mSuYpKPBQ==
-
-"@xterm/[email protected].36":
-  version "0.19.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.36.tgz#8926a0434e5ce74eee12a965c06cd5f601391f18"
-  integrity sha512-bJA1enVNlIMRkBU9i7i8qX26Zs2/CrGedREW5WI0NZUAn0IHlatWlj3aOfTuI2MYWUPGE8ul30PyipYP6P+fmA==
-
-"@xterm/[email protected].36":
-  version "5.6.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.6.0-beta.36.tgz#cf3e690024019eac2e22d87e0e9f04da6e99cfa9"
-  integrity sha512-X0Te4ssxcVZ3/YlYEjzN+4w5e4f3Ni/kdjBUKoyZSRpA1+Er54HC/I3t1jc4amqI9xysnVwhq+Ey+LjygIfALw==
-
-"@xterm/[email protected].36":
-  version "5.6.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.6.0-beta.36.tgz#fd0fd598b67e3bcba61a59bb1a33b131ad86eea3"
-  integrity sha512-YtFKQIggbvV2brWifksZAtLi447j0DFdoSRoq4vQi/N7KFC0pguGdG3YzYkDOyqoeLMPu569e2b5oevMe6d2aQ==
+"@xterm/[email protected].46":
+  version "0.9.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.9.0-beta.46.tgz#b1b4743bb1d2944cc6c0f5e3db64e9d642bd64be"
+  integrity sha512-vI9jn16uGT6ucm/+/6tLoftqo5WlWyX8Qts1Q+cpp9r7w1hNb/Xm0S5Zn89F19PfNIT8lMsr1GmYAJxUHDd4dQ==
+
+"@xterm/[email protected].46":
+  version "0.16.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.16.0-beta.46.tgz#5d8d1a055a1d501f3fba9044080132eccf346e4a"
+  integrity sha512-L5C7dDKhZQ0OPE2DgfJsagcyAIIj67EFPGE2GIiOa301djfULR4yReIMXTzwfTWS6vDn3yN0XGiO58glh9oJkw==
+
+"@xterm/[email protected].46":
+  version "0.14.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.46.tgz#e1d8faccf2d2651f2be43723a79d3e85c99af02b"
+  integrity sha512-QH2wl4pUU3OMOpT6TF06sSgTNF1sA0sri6tvvfgLBv8F4sZDqfd4RwQOXxSteUCfxlo9L4066633lcZgjFBotQ==
+
+"@xterm/[email protected].46":
+  version "0.9.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.46.tgz#a361de7edcb0e36ede64e08a230cc2e7ecd28fd1"
+  integrity sha512-/ilzq5k90rUhFf3mUBb3HNjzMKVix9bS5Yp5ZSOVtcMu0fkscfoBubOhNMvEfsDb50fHi0BwZH9cZaYWYU6yfQ==
+
+"@xterm/[email protected].46":
+  version "0.19.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.46.tgz#f916ab5841365deca722ab06b6e30794c7da083e"
+  integrity sha512-wEC4WspfcibPxxIIEiUdxG+Pw1AgjU/73NuqjZ7VWIitXZwcVzj0wHiwX2d+ild3Ba255yB3sOHJRLc/yhsr2g==
+
+"@xterm/[email protected].46":
+  version "5.6.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.6.0-beta.46.tgz#0e6ca1e3302729524475761819c24c2a5d3e92bb"
+  integrity sha512-3LQmFaPdvw6S+EFJTDKRqR/Dj+WXw2Ju2Act7Gy9xpkCq5K0a1HLC0E2Hl/PTM+8rR+1tRGxgL+1kntdeUeZSg==
+
+"@xterm/[email protected].46":
+  version "5.6.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.6.0-beta.46.tgz#91ba1f484dafbe126e3163380fa08c7e391b286f"
+  integrity sha512-Ur/ki1PSOXxJRt3ivRU5mG/DVqVDa3OaqoIsGdCMGulHUDhes4KGoYMzlyFqsaLdhl1zKcnM1S34e6xPsIrA+w==
 
 agent-base@^7.0.1, agent-base@^7.0.2, agent-base@^7.1.0:
   version "7.1.0"

src/vs/workbench/contrib/terminal/browser/media/terminal.css

@@ -73,8 +73,16 @@
 }
 
 .monaco-workbench .xterm {
-	/* All terminals have at least 20px left, 10px right edge padding and 2 padding on the bottom (so underscores on last line are visible) */
-	padding: 0 10px 2px 20px;
+	/* All terminals have at least 20px left padding for the gutter */
+	padding-left: 20px;
+}
+
+.monaco-workbench .xterm .xterm-scrollable-element {
+	/* Offset the scrollable element such that:
+	 * - The terminal grid will be positioned to the right of the gutter
+	 * - Elements are not hidden in the gutter */
+	margin-left: -20px;
+	padding-left: 20px;
 }
 
 .monaco-workbench .terminal-editor .xterm,
@@ -130,11 +138,6 @@
 .xterm.xterm-cursor-pointer .xterm-screen { cursor: pointer; }
 .xterm.column-select.focus .xterm-screen  { cursor: crosshair; }
 
-.monaco-workbench .terminal-editor .terminal-group .monaco-split-view2.horizontal .split-view-view:last-child .xterm,
-.monaco-workbench .pane-body.integrated-terminal .terminal-group .monaco-split-view2.horizontal .split-view-view:last-child .xterm {
-	padding-right: 20px;
-}
-
 .monaco-workbench .terminal-editor .xterm a:not(.xterm-invalid-link),
 .monaco-workbench .pane-body.integrated-terminal .xterm a:not(.xterm-invalid-link) {
 	/* To support message box sizing */
@@ -159,8 +162,8 @@
 
 .monaco-workbench .terminal-editor .terminal-wrapper:not(.fixed-dims) .xterm-viewport,
 .monaco-workbench .pane-body.integrated-terminal .terminal-wrapper:not(.fixed-dims) .xterm-viewport {
-	/* Override xterm.js' width as we want to size the viewport to fill the panel so the scrollbar is on the right edge */
-	width: auto !important;
+	/* Override xterm.js' position so the area that accepts mouse events extends to the edge of the scroll bar */
+	right: 14px;
 }
 
 .monaco-workbench .pane-body.integrated-terminal {
@@ -520,29 +523,6 @@
 	background-color: var(--vscode-terminal-hoverHighlightBackground);
 }
 
-.force-scrollbar .xterm .xterm-viewport,
-.monaco-workbench .xterm.focus .xterm-viewport,
-.monaco-workbench .xterm:focus .xterm-viewport,
-.monaco-workbench .xterm:hover .xterm-viewport {
-	background-color: var(--vscode-scrollbarSlider-background) !important;
-}
-
-.monaco-workbench .xterm-viewport {
-	scrollbar-color: var(--vscode-scrollbarSlider-background) transparent;
-}
-
-.monaco-workbench .xterm .xterm-viewport::-webkit-scrollbar-thumb:hover {
-	background-color: var(--vscode-scrollbarSlider-hoverBackground);
-}
-
-.monaco-workbench .xterm-viewport:hover {
-	scrollbar-color: var(--vscode-scrollbarSlider-hoverBackground) transparent;
-}
-
-.monaco-workbench .xterm .xterm-viewport::-webkit-scrollbar-thumb:active {
-	background-color: var(--vscode-scrollbarSlider-activeBackground);
-}
-
 .monaco-workbench .xterm.terminal.hide {
 	visibility: hidden;
 }