Skip to content

Commit 15d6021

Browse files
TyriarTyriar
committed
Update xterm and addons to latest
Diff: xtermjs/xterm.js@51dc03a...31d3ae4 Move off deprecated registerMarker and correct given new | undefined in api
1 parent f2a77df commit 15d6021

7 files changed

Lines changed: 99 additions & 91 deletions

File tree

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@
6060
"vscode-ripgrep": "^1.5.8",
6161
"vscode-sqlite3": "4.0.10",
6262
"vscode-textmate": "5.1.1",
63-
"xterm": "4.6.0-beta.25",
64-
"xterm-addon-search": "0.6.0",
65-
"xterm-addon-unicode11": "0.2.0-beta.2",
66-
"xterm-addon-web-links": "0.3.0",
67-
"xterm-addon-webgl": "0.7.0-beta.8",
63+
"xterm": "4.6.0-beta.38",
64+
"xterm-addon-search": "0.7.0-beta.2",
65+
"xterm-addon-unicode11": "0.2.0-beta.5",
66+
"xterm-addon-web-links": "0.4.0-beta.5",
67+
"xterm-addon-webgl": "0.7.0-beta.10",
6868
"yauzl": "^2.9.2",
6969
"yazl": "^2.4.3"
7070
},

‎remote/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
"vscode-proxy-agent": "^0.5.2",
2121
"vscode-ripgrep": "^1.5.8",
2222
"vscode-textmate": "5.1.1",
23-
"xterm": "4.6.0-beta.25",
24-
"xterm-addon-search": "0.6.0",
25-
"xterm-addon-unicode11": "0.2.0-beta.2",
26-
"xterm-addon-web-links": "0.3.0",
27-
"xterm-addon-webgl": "0.7.0-beta.8",
23+
"xterm": "4.6.0-beta.38",
24+
"xterm-addon-search": "0.7.0-beta.2",
25+
"xterm-addon-unicode11": "0.2.0-beta.5",
26+
"xterm-addon-web-links": "0.4.0-beta.5",
27+
"xterm-addon-webgl": "0.7.0-beta.10",
2828
"yauzl": "^2.9.2",
2929
"yazl": "^2.4.3"
3030
},

‎remote/web/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"semver-umd": "^5.5.6",
66
"vscode-oniguruma": "1.3.0",
77
"vscode-textmate": "5.1.1",
8-
"xterm": "4.6.0-beta.25",
9-
"xterm-addon-search": "0.6.0",
10-
"xterm-addon-unicode11": "0.2.0-beta.2",
11-
"xterm-addon-web-links": "0.3.0",
12-
"xterm-addon-webgl": "0.7.0-beta.8"
8+
"xterm": "4.6.0-beta.38",
9+
"xterm-addon-search": "0.7.0-beta.2",
10+
"xterm-addon-unicode11": "0.2.0-beta.5",
11+
"xterm-addon-web-links": "0.4.0-beta.5",
12+
"xterm-addon-webgl": "0.7.0-beta.10"
1313
}
1414
}

‎remote/web/yarn.lock‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,27 @@ vscode-textmate@5.1.1:
1717
resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.1.1.tgz#d88dbf271bee7cede455a21bd4894ba5724a4a7e"
1818
integrity sha512-5VHjF+Fglf9d2JI5OyQ7FHutK6/29G0qYyD920K0SWO7uY8JTWbqyKAHEtfB/ZDk2fOe/E23n3wz9fHXKi63yg==
1919

20-
xterm-addon-search@0.6.0:
21-
version "0.6.0"
22-
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.6.0.tgz#542cc2c35e83e7332ce1982b65ad218ee769836c"
23-
integrity sha512-k3EsZzUptCXygHFP5rQuCBdWWkI/ZNuX3pDSOVdxPV9jB7U5Aha9guTIZoMP7FIjL8jce+ClQs6q7VINcRV1+w==
24-
25-
xterm-addon-unicode11@0.2.0-beta.2:
26-
version "0.2.0-beta.2"
27-
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.2.0-beta.2.tgz#2a13ba5b08fdb1005be241816c4e3302674db4af"
28-
integrity sha512-Y047mnIWrAj65TpStdyPYoPeDTX4en+XX4Y90KuQB3cW2xIyZj25NSVV9BZdqzSb7gk9M6KBvIcm8chj7S2N8Q==
29-
30-
xterm-addon-web-links@0.3.0:
31-
version "0.3.0"
32-
resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.3.0.tgz#88affe9235c928b41bab660a65330f46d91c940e"
33-
integrity sha512-vGXiIDqNMyxK5S1IzOjDqcgeQrrv7TDcSHiOeCNAoWCI2f+Rap9d18gjgnMKPyR+AbG0KoKnaKA6Dc1du1vs5A==
34-
35-
xterm-addon-webgl@0.7.0-beta.8:
36-
version "0.7.0-beta.8"
37-
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.7.0-beta.8.tgz#546651958d740bf05d6a05555fbcacd2759b2ee7"
38-
integrity sha512-2jxMtRR5zgAar1gPqt0iD/+GOlZ3cHyzzbIbC77EBIdZZFuhEDhJkucVPPS2KPcyqw3VROL1FgX7BSEV2rvdeA==
39-
40-
xterm@4.6.0-beta.25:
41-
version "4.6.0-beta.25"
42-
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.6.0-beta.25.tgz#2faea6cf8c677ed545792562165604ce7f314026"
43-
integrity sha512-63FLAUdJ8Bw9SMgLU3/r353P1WAtLxupbfvfddi4nMcz1WEGRq07O1CbmJn/bKHHkJw7gQQw0n1I8xnjFlLlTA==
20+
xterm-addon-search@0.7.0-beta.2:
21+
version "0.7.0-beta.2"
22+
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.7.0-beta.2.tgz#384bda136c707f97a77eefc76cc7d9e572ce0719"
23+
integrity sha512-A9fyiBBvG6ZNIwSJ03+sRCv9y20/uzd1wjCoaYUqp9fu3YGiHaGwyo9rAfm2M/fQM5vBmyJk4Qw/lwVq7TtlAw==
24+
25+
xterm-addon-unicode11@0.2.0-beta.5:
26+
version "0.2.0-beta.5"
27+
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.2.0-beta.5.tgz#5961850162df20b5e966166423cd6957ac2db298"
28+
integrity sha512-IjnbBcyfS5JgJDXPO0W2nk/VBtGwx6GWE2snMC676z4DmAABUqPXfTzJKfUoWqoT6UcbxB0oIjDzykCfoRJp6Q==
29+
30+
xterm-addon-web-links@0.4.0-beta.5:
31+
version "0.4.0-beta.5"
32+
resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.4.0-beta.5.tgz#523fd0a1c5668370d73e05019ed16eaf596894c8"
33+
integrity sha512-Qe0idPpSokCNvGrthSBjdrOZrsgXwnLYbzuv0JoEec/A9HVcxKmZ+ktw7fOA2gT/zbcwtrA5FWrir3GlRHglCQ==
34+
35+
xterm-addon-webgl@0.7.0-beta.10:
36+
version "0.7.0-beta.10"
37+
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.7.0-beta.10.tgz#39fdb96351e97a1bf15f4c4c8944ba3d05cacee4"
38+
integrity sha512-nQl/ASk+ck11aSrBZXb2a0tu+SNDnm89owBk/sAZeZzi5MHNo6bB8y2VTKNNC6D3i3aFouTz4VorYB25LUgNFg==
39+
40+
xterm@4.6.0-beta.38:
41+
version "4.6.0-beta.38"
42+
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.6.0-beta.38.tgz#8472b168941500c3071aba482c2b5c6040951ec7"
43+
integrity sha512-Q+nOalMD1MDGOqXdtkGZmOQqbSBU+71vhlX2RBwQoSpJa1QBrKDAhSlN/J+/XvouvVEtCiEFDeacF4EufMEIMg==

‎remote/yarn.lock‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -404,30 +404,30 @@ vscode-windows-registry@1.0.2:
404404
resolved "https://registry.yarnpkg.com/vscode-windows-registry/-/vscode-windows-registry-1.0.2.tgz#b863e704a6a69c50b3098a55fbddbe595b0c124a"
405405
integrity sha512-/CLLvuOSM2Vme2z6aNyB+4Omd7hDxpf4Thrt8ImxnXeQtxzel2bClJpFQvQqK/s4oaXlkBKS7LqVLeZM+uSVIA==
406406

407-
xterm-addon-search@0.6.0:
408-
version "0.6.0"
409-
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.6.0.tgz#542cc2c35e83e7332ce1982b65ad218ee769836c"
410-
integrity sha512-k3EsZzUptCXygHFP5rQuCBdWWkI/ZNuX3pDSOVdxPV9jB7U5Aha9guTIZoMP7FIjL8jce+ClQs6q7VINcRV1+w==
411-
412-
xterm-addon-unicode11@0.2.0-beta.2:
413-
version "0.2.0-beta.2"
414-
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.2.0-beta.2.tgz#2a13ba5b08fdb1005be241816c4e3302674db4af"
415-
integrity sha512-Y047mnIWrAj65TpStdyPYoPeDTX4en+XX4Y90KuQB3cW2xIyZj25NSVV9BZdqzSb7gk9M6KBvIcm8chj7S2N8Q==
416-
417-
xterm-addon-web-links@0.3.0:
418-
version "0.3.0"
419-
resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.3.0.tgz#88affe9235c928b41bab660a65330f46d91c940e"
420-
integrity sha512-vGXiIDqNMyxK5S1IzOjDqcgeQrrv7TDcSHiOeCNAoWCI2f+Rap9d18gjgnMKPyR+AbG0KoKnaKA6Dc1du1vs5A==
421-
422-
xterm-addon-webgl@0.7.0-beta.8:
423-
version "0.7.0-beta.8"
424-
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.7.0-beta.8.tgz#546651958d740bf05d6a05555fbcacd2759b2ee7"
425-
integrity sha512-2jxMtRR5zgAar1gPqt0iD/+GOlZ3cHyzzbIbC77EBIdZZFuhEDhJkucVPPS2KPcyqw3VROL1FgX7BSEV2rvdeA==
426-
427-
xterm@4.6.0-beta.25:
428-
version "4.6.0-beta.25"
429-
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.6.0-beta.25.tgz#2faea6cf8c677ed545792562165604ce7f314026"
430-
integrity sha512-63FLAUdJ8Bw9SMgLU3/r353P1WAtLxupbfvfddi4nMcz1WEGRq07O1CbmJn/bKHHkJw7gQQw0n1I8xnjFlLlTA==
407+
xterm-addon-search@0.7.0-beta.2:
408+
version "0.7.0-beta.2"
409+
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.7.0-beta.2.tgz#384bda136c707f97a77eefc76cc7d9e572ce0719"
410+
integrity sha512-A9fyiBBvG6ZNIwSJ03+sRCv9y20/uzd1wjCoaYUqp9fu3YGiHaGwyo9rAfm2M/fQM5vBmyJk4Qw/lwVq7TtlAw==
411+
412+
xterm-addon-unicode11@0.2.0-beta.5:
413+
version "0.2.0-beta.5"
414+
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.2.0-beta.5.tgz#5961850162df20b5e966166423cd6957ac2db298"
415+
integrity sha512-IjnbBcyfS5JgJDXPO0W2nk/VBtGwx6GWE2snMC676z4DmAABUqPXfTzJKfUoWqoT6UcbxB0oIjDzykCfoRJp6Q==
416+
417+
xterm-addon-web-links@0.4.0-beta.5:
418+
version "0.4.0-beta.5"
419+
resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.4.0-beta.5.tgz#523fd0a1c5668370d73e05019ed16eaf596894c8"
420+
integrity sha512-Qe0idPpSokCNvGrthSBjdrOZrsgXwnLYbzuv0JoEec/A9HVcxKmZ+ktw7fOA2gT/zbcwtrA5FWrir3GlRHglCQ==
421+
422+
xterm-addon-webgl@0.7.0-beta.10:
423+
version "0.7.0-beta.10"
424+
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.7.0-beta.10.tgz#39fdb96351e97a1bf15f4c4c8944ba3d05cacee4"
425+
integrity sha512-nQl/ASk+ck11aSrBZXb2a0tu+SNDnm89owBk/sAZeZzi5MHNo6bB8y2VTKNNC6D3i3aFouTz4VorYB25LUgNFg==
426+
427+
xterm@4.6.0-beta.38:
428+
version "4.6.0-beta.38"
429+
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.6.0-beta.38.tgz#8472b168941500c3071aba482c2b5c6040951ec7"
430+
integrity sha512-Q+nOalMD1MDGOqXdtkGZmOQqbSBU+71vhlX2RBwQoSpJa1QBrKDAhSlN/J+/XvouvVEtCiEFDeacF4EufMEIMg==
431431

432432
yauzl@^2.9.2:
433433
version "2.10.0"

‎src/vs/workbench/contrib/terminal/browser/addons/commandTrackerAddon.ts‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,13 +233,13 @@ export class CommandTrackerAddon implements ICommandTracker, ITerminalAddon {
233233
}
234234

235235
if (this._currentMarker === Boundary.Bottom) {
236-
this._currentMarker = xterm.registerMarker(this._getOffset(xterm) - 1);
236+
this._currentMarker = this._addMarkerOrThrow(xterm, this._getOffset(xterm) - 1);
237237
} else {
238238
const offset = this._getOffset(xterm);
239239
if (this._isDisposable) {
240240
this._currentMarker.dispose();
241241
}
242-
this._currentMarker = xterm.registerMarker(offset - 1);
242+
this._currentMarker = this._addMarkerOrThrow(xterm, offset - 1);
243243
}
244244
this._isDisposable = true;
245245
this._scrollToMarker(this._currentMarker, scrollPosition);
@@ -256,18 +256,26 @@ export class CommandTrackerAddon implements ICommandTracker, ITerminalAddon {
256256
}
257257

258258
if (this._currentMarker === Boundary.Top) {
259-
this._currentMarker = xterm.registerMarker(this._getOffset(xterm) + 1);
259+
this._currentMarker = this._addMarkerOrThrow(xterm, this._getOffset(xterm) + 1);
260260
} else {
261261
const offset = this._getOffset(xterm);
262262
if (this._isDisposable) {
263263
this._currentMarker.dispose();
264264
}
265-
this._currentMarker = xterm.registerMarker(offset + 1);
265+
this._currentMarker = this._addMarkerOrThrow(xterm, offset + 1);
266266
}
267267
this._isDisposable = true;
268268
this._scrollToMarker(this._currentMarker, scrollPosition);
269269
}
270270

271+
private _addMarkerOrThrow(xterm: Terminal, cursorYOffset: number): IMarker {
272+
const marker = xterm.addMarker(cursorYOffset);
273+
if (!marker) {
274+
throw new Error(`Could not create marker for ${cursorYOffset}`);
275+
}
276+
return marker;
277+
}
278+
271279
private _getOffset(xterm: Terminal): number {
272280
if (this._currentMarker === Boundary.Bottom) {
273281
return 0;

‎yarn.lock‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10042,30 +10042,30 @@ xtend@~2.1.1:
1004210042
dependencies:
1004310043
object-keys "~0.4.0"
1004410044

10045-
xterm-addon-search@0.6.0:
10046-
version "0.6.0"
10047-
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.6.0.tgz#542cc2c35e83e7332ce1982b65ad218ee769836c"
10048-
integrity sha512-k3EsZzUptCXygHFP5rQuCBdWWkI/ZNuX3pDSOVdxPV9jB7U5Aha9guTIZoMP7FIjL8jce+ClQs6q7VINcRV1+w==
10049-
10050-
xterm-addon-unicode11@0.2.0-beta.2:
10051-
version "0.2.0-beta.2"
10052-
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.2.0-beta.2.tgz#2a13ba5b08fdb1005be241816c4e3302674db4af"
10053-
integrity sha512-Y047mnIWrAj65TpStdyPYoPeDTX4en+XX4Y90KuQB3cW2xIyZj25NSVV9BZdqzSb7gk9M6KBvIcm8chj7S2N8Q==
10054-
10055-
xterm-addon-web-links@0.3.0:
10056-
version "0.3.0"
10057-
resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.3.0.tgz#88affe9235c928b41bab660a65330f46d91c940e"
10058-
integrity sha512-vGXiIDqNMyxK5S1IzOjDqcgeQrrv7TDcSHiOeCNAoWCI2f+Rap9d18gjgnMKPyR+AbG0KoKnaKA6Dc1du1vs5A==
10059-
10060-
xterm-addon-webgl@0.7.0-beta.8:
10061-
version "0.7.0-beta.8"
10062-
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.7.0-beta.8.tgz#546651958d740bf05d6a05555fbcacd2759b2ee7"
10063-
integrity sha512-2jxMtRR5zgAar1gPqt0iD/+GOlZ3cHyzzbIbC77EBIdZZFuhEDhJkucVPPS2KPcyqw3VROL1FgX7BSEV2rvdeA==
10064-
10065-
xterm@4.6.0-beta.25:
10066-
version "4.6.0-beta.25"
10067-
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.6.0-beta.25.tgz#2faea6cf8c677ed545792562165604ce7f314026"
10068-
integrity sha512-63FLAUdJ8Bw9SMgLU3/r353P1WAtLxupbfvfddi4nMcz1WEGRq07O1CbmJn/bKHHkJw7gQQw0n1I8xnjFlLlTA==
10045+
xterm-addon-search@0.7.0-beta.2:
10046+
version "0.7.0-beta.2"
10047+
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.7.0-beta.2.tgz#384bda136c707f97a77eefc76cc7d9e572ce0719"
10048+
integrity sha512-A9fyiBBvG6ZNIwSJ03+sRCv9y20/uzd1wjCoaYUqp9fu3YGiHaGwyo9rAfm2M/fQM5vBmyJk4Qw/lwVq7TtlAw==
10049+
10050+
xterm-addon-unicode11@0.2.0-beta.5:
10051+
version "0.2.0-beta.5"
10052+
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.2.0-beta.5.tgz#5961850162df20b5e966166423cd6957ac2db298"
10053+
integrity sha512-IjnbBcyfS5JgJDXPO0W2nk/VBtGwx6GWE2snMC676z4DmAABUqPXfTzJKfUoWqoT6UcbxB0oIjDzykCfoRJp6Q==
10054+
10055+
xterm-addon-web-links@0.4.0-beta.5:
10056+
version "0.4.0-beta.5"
10057+
resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.4.0-beta.5.tgz#523fd0a1c5668370d73e05019ed16eaf596894c8"
10058+
integrity sha512-Qe0idPpSokCNvGrthSBjdrOZrsgXwnLYbzuv0JoEec/A9HVcxKmZ+ktw7fOA2gT/zbcwtrA5FWrir3GlRHglCQ==
10059+
10060+
xterm-addon-webgl@0.7.0-beta.10:
10061+
version "0.7.0-beta.10"
10062+
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.7.0-beta.10.tgz#39fdb96351e97a1bf15f4c4c8944ba3d05cacee4"
10063+
integrity sha512-nQl/ASk+ck11aSrBZXb2a0tu+SNDnm89owBk/sAZeZzi5MHNo6bB8y2VTKNNC6D3i3aFouTz4VorYB25LUgNFg==
10064+
10065+
xterm@4.6.0-beta.38:
10066+
version "4.6.0-beta.38"
10067+
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.6.0-beta.38.tgz#8472b168941500c3071aba482c2b5c6040951ec7"
10068+
integrity sha512-Q+nOalMD1MDGOqXdtkGZmOQqbSBU+71vhlX2RBwQoSpJa1QBrKDAhSlN/J+/XvouvVEtCiEFDeacF4EufMEIMg==
1006910069

1007010070
y18n@^3.2.1:
1007110071
version "3.2.1"

0 commit comments

Comments
 (0)