From 6bc460f9ab0a7fcea6f0fdcb96eafec6c9c4178c Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Fri, 18 Oct 2019 10:42:04 -0700 Subject: [PATCH] xterm@4.2.0-beta18 Diff: https://github.com/xtermjs/xterm.js/compare/91cbeec...eb25243 - Error telemetry fixes, fixes #82309 - comma, colon and semi-colon as word separators, fixes #82173 - Dev container fixes - Fix scrollback going missing on Windows/conpty, fixes #78634 - Automation improvements --- package.json | 2 +- remote/package.json | 2 +- remote/web/package.json | 2 +- remote/web/yarn.lock | 8 ++++---- remote/yarn.lock | 8 ++++---- src/typings/xterm.d.ts | 32 +++++++++++++++++++++++++++++++- src/vs/monaco.d.ts | 4 ++-- yarn.lock | 8 ++++---- 8 files changed, 48 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 6589e0ceebe..07c1ce88d0d 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "vscode-ripgrep": "^1.5.7", "vscode-sqlite3": "4.0.8", "vscode-textmate": "^4.2.2", - "xterm": "4.2.0-beta10", + "xterm": "4.2.0-beta18", "xterm-addon-search": "0.3.0-beta5", "xterm-addon-web-links": "0.2.0", "yauzl": "^2.9.2", diff --git a/remote/package.json b/remote/package.json index e78936d43e0..2322f9073f9 100644 --- a/remote/package.json +++ b/remote/package.json @@ -20,7 +20,7 @@ "vscode-proxy-agent": "0.4.0", "vscode-ripgrep": "^1.5.7", "vscode-textmate": "^4.2.2", - "xterm": "4.2.0-beta10", + "xterm": "4.2.0-beta18", "xterm-addon-search": "0.3.0-beta5", "xterm-addon-web-links": "0.2.0", "yauzl": "^2.9.2", diff --git a/remote/web/package.json b/remote/web/package.json index 43bc35f457c..5f596b2f458 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -5,7 +5,7 @@ "onigasm-umd": "^2.2.2", "semver-umd": "^5.5.3", "vscode-textmate": "^4.2.2", - "xterm": "4.2.0-beta10", + "xterm": "4.2.0-beta18", "xterm-addon-search": "0.3.0-beta5", "xterm-addon-web-links": "0.2.0" } diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock index e39020e3633..2209d3956d8 100644 --- a/remote/web/yarn.lock +++ b/remote/web/yarn.lock @@ -41,7 +41,7 @@ xterm-addon-web-links@0.2.0: resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.2.0.tgz#b408a0be46211d8d4a0bb5e701d8f3c2bd07d473" integrity sha512-dq81c4Pzli2PgKVBgY2REte9sCVibR3df8AP3SEvCTM9uYFnUFxtxzMTplPnc7+rXabVhFdbU6x+rstIk8HNQg== -xterm@4.2.0-beta10: - version "4.2.0-beta10" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.2.0-beta10.tgz#28573392d2b3168e71dac15d8916248c2084532e" - integrity sha512-UUJ+qYBfV+dlEw9fUrGD9ZY6vy2BBpSICrvFU9/f3Z1Od1TXUO431AB00lr/2N6IdFfH35FHTMHXXxsxFD4k9A== +xterm@4.2.0-beta18: + version "4.2.0-beta18" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.2.0-beta18.tgz#c45fcb12eb601be724cc6803a7f4bbf19d0e6203" + integrity sha512-B9Q3EOTWOVVpZzBU1BiNCWGZO24m+kjlLGfdIBy3I6DX+COiEnd+boIAVDbwsJ4G2iCfYye2qEG/jXJlyJWvqg== diff --git a/remote/yarn.lock b/remote/yarn.lock index 502e42e803e..50585d319f7 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -421,10 +421,10 @@ xterm-addon-web-links@0.2.0: resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.2.0.tgz#b408a0be46211d8d4a0bb5e701d8f3c2bd07d473" integrity sha512-dq81c4Pzli2PgKVBgY2REte9sCVibR3df8AP3SEvCTM9uYFnUFxtxzMTplPnc7+rXabVhFdbU6x+rstIk8HNQg== -xterm@4.2.0-beta10: - version "4.2.0-beta10" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.2.0-beta10.tgz#28573392d2b3168e71dac15d8916248c2084532e" - integrity sha512-UUJ+qYBfV+dlEw9fUrGD9ZY6vy2BBpSICrvFU9/f3Z1Od1TXUO431AB00lr/2N6IdFfH35FHTMHXXxsxFD4k9A== +xterm@4.2.0-beta18: + version "4.2.0-beta18" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.2.0-beta18.tgz#c45fcb12eb601be724cc6803a7f4bbf19d0e6203" + integrity sha512-B9Q3EOTWOVVpZzBU1BiNCWGZO24m+kjlLGfdIBy3I6DX+COiEnd+boIAVDbwsJ4G2iCfYye2qEG/jXJlyJWvqg== yauzl@^2.9.2: version "2.10.0" diff --git a/src/typings/xterm.d.ts b/src/typings/xterm.d.ts index 3cf935a0ed1..c0bbd3cc497 100644 --- a/src/typings/xterm.d.ts +++ b/src/typings/xterm.d.ts @@ -279,7 +279,7 @@ declare module 'xterm' { /** * A callback that fires when the mouse hovers over a link for a moment. */ - tooltipCallback?: (event: MouseEvent, uri: string) => boolean | void; + tooltipCallback?: (event: MouseEvent, uri: string, location: IViewportRange) => boolean | void; /** * A callback that fires when the mouse leaves a link. Note that this can @@ -852,6 +852,36 @@ declare module 'xterm' { endRow: number; } + /** + * An object representing a range within the viewport of the terminal. + */ + interface IViewportRange { + /** + * The start cell of the range. + */ + start: IViewportCellPosition; + + /** + * The end cell of the range. + */ + end: IViewportCellPosition; + } + + /** + * An object representing a cell position within the viewport of the terminal. + */ + interface IViewportCellPosition { + /** + * The column of the cell. Note that this is 1-based; the first column is column 1. + */ + col: number; + + /** + * The row of the cell. Note that this is 1-based; the first row is row 1. + */ + row: number; + } + /** * Represents a terminal buffer. */ diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index 18e0a9abe18..9e73c33291e 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -42,7 +42,7 @@ declare namespace monaco { export class CancellationTokenSource { constructor(parent?: CancellationToken); - get token(): CancellationToken; + readonly token: CancellationToken; cancel(): void; dispose(cancel?: boolean): void; } @@ -117,7 +117,7 @@ declare namespace monaco { * namely the server name, would be missing. Therefore `Uri#fsPath` exists - it's sugar to ease working * with URIs that represent files on disk (`file` scheme). */ - get fsPath(): string; + readonly fsPath: string; with(change: { scheme?: string; authority?: string | null; diff --git a/yarn.lock b/yarn.lock index 111159a9d36..52e313ff2b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9276,10 +9276,10 @@ xterm-addon-web-links@0.2.0: resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.2.0.tgz#b408a0be46211d8d4a0bb5e701d8f3c2bd07d473" integrity sha512-dq81c4Pzli2PgKVBgY2REte9sCVibR3df8AP3SEvCTM9uYFnUFxtxzMTplPnc7+rXabVhFdbU6x+rstIk8HNQg== -xterm@4.2.0-beta10: - version "4.2.0-beta10" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.2.0-beta10.tgz#28573392d2b3168e71dac15d8916248c2084532e" - integrity sha512-UUJ+qYBfV+dlEw9fUrGD9ZY6vy2BBpSICrvFU9/f3Z1Od1TXUO431AB00lr/2N6IdFfH35FHTMHXXxsxFD4k9A== +xterm@4.2.0-beta18: + version "4.2.0-beta18" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.2.0-beta18.tgz#c45fcb12eb601be724cc6803a7f4bbf19d0e6203" + integrity sha512-B9Q3EOTWOVVpZzBU1BiNCWGZO24m+kjlLGfdIBy3I6DX+COiEnd+boIAVDbwsJ4G2iCfYye2qEG/jXJlyJWvqg== y18n@^3.2.1: version "3.2.1" -- GitLab