From 206d764c6de3ea06e8a210d2aa31dd09cdffdf4e Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Fri, 4 Sep 2020 22:38:43 -0700 Subject: [PATCH 1/2] xterm@4.9.0-beta.24 --- package.json | 2 +- remote/package.json | 2 +- remote/web/package.json | 2 +- remote/web/yarn.lock | 8 ++++---- remote/yarn.lock | 8 ++++---- yarn.lock | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 71dadc91178d0..783cbebf24522 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "vscode-ripgrep": "^1.8.0", "vscode-sqlite3": "4.0.10", "vscode-textmate": "5.2.0", - "xterm": "4.9.0-beta.8", + "xterm": "4.9.0-beta.24", "xterm-addon-search": "0.7.0", "xterm-addon-unicode11": "0.2.0", "xterm-addon-webgl": "0.8.0", diff --git a/remote/package.json b/remote/package.json index c10fbe792c266..9889d63800e87 100644 --- a/remote/package.json +++ b/remote/package.json @@ -20,7 +20,7 @@ "vscode-proxy-agent": "^0.5.2", "vscode-ripgrep": "^1.8.0", "vscode-textmate": "5.2.0", - "xterm": "4.9.0-beta.8", + "xterm": "4.9.0-beta.24", "xterm-addon-search": "0.7.0", "xterm-addon-unicode11": "0.2.0", "xterm-addon-webgl": "0.8.0", diff --git a/remote/web/package.json b/remote/web/package.json index de712cfdeb316..35155a77096d0 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -7,7 +7,7 @@ "semver-umd": "^5.5.7", "vscode-oniguruma": "1.3.1", "vscode-textmate": "5.2.0", - "xterm": "4.9.0-beta.8", + "xterm": "4.9.0-beta.24", "xterm-addon-search": "0.7.0", "xterm-addon-unicode11": "0.2.0", "xterm-addon-webgl": "0.8.0" diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock index 15fb0958eea83..a19f4e291cc3c 100644 --- a/remote/web/yarn.lock +++ b/remote/web/yarn.lock @@ -42,7 +42,7 @@ xterm-addon-webgl@0.8.0: resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.8.0.tgz#4bc6bb4dbfea5b0d2d7978d6c5cef922d584fb4f" integrity sha512-dlpYPsv0C9S6v6+T/h/d/otSbdUTizMJdxvSoS34tUpMOHev6iW7Zqt5KRFqYxl4vCqpDk9Wmhb3fKL3kwX5fQ== -xterm@4.9.0-beta.8: - version "4.9.0-beta.8" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.9.0-beta.8.tgz#ca121934d63f88668d2d5b11d9b2fc3bde7bd805" - integrity sha512-EEonYBLANDUBfEeEnHG632bZdgBaAUWst8LFr6oC6f2uLFfJGHQvVJuLaEkPtRvS+jOeoorEXZRPmso1/ANHXA== +xterm@4.9.0-beta.24: + version "4.9.0-beta.24" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.9.0-beta.24.tgz#48f0990c6d32ad3a9bcc4fb49531d7effdaccea5" + integrity sha512-CIVxxxbBiSw1WOMkIjjivaiIC9jNgih4klfWsRGx0qiDF5nbzHuLXkPTt+yAQUu9FCyTUwECm9Pkl3gUsSaGKg== diff --git a/remote/yarn.lock b/remote/yarn.lock index 499dc73ca5c92..2ed9daf35556a 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -445,10 +445,10 @@ xterm-addon-webgl@0.8.0: resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.8.0.tgz#4bc6bb4dbfea5b0d2d7978d6c5cef922d584fb4f" integrity sha512-dlpYPsv0C9S6v6+T/h/d/otSbdUTizMJdxvSoS34tUpMOHev6iW7Zqt5KRFqYxl4vCqpDk9Wmhb3fKL3kwX5fQ== -xterm@4.9.0-beta.8: - version "4.9.0-beta.8" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.9.0-beta.8.tgz#ca121934d63f88668d2d5b11d9b2fc3bde7bd805" - integrity sha512-EEonYBLANDUBfEeEnHG632bZdgBaAUWst8LFr6oC6f2uLFfJGHQvVJuLaEkPtRvS+jOeoorEXZRPmso1/ANHXA== +xterm@4.9.0-beta.24: + version "4.9.0-beta.24" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.9.0-beta.24.tgz#48f0990c6d32ad3a9bcc4fb49531d7effdaccea5" + integrity sha512-CIVxxxbBiSw1WOMkIjjivaiIC9jNgih4klfWsRGx0qiDF5nbzHuLXkPTt+yAQUu9FCyTUwECm9Pkl3gUsSaGKg== yauzl@^2.9.2: version "2.10.0" diff --git a/yarn.lock b/yarn.lock index 140ed883c1a92..e771d018a2f8f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10050,10 +10050,10 @@ xterm-addon-webgl@0.8.0: resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.8.0.tgz#4bc6bb4dbfea5b0d2d7978d6c5cef922d584fb4f" integrity sha512-dlpYPsv0C9S6v6+T/h/d/otSbdUTizMJdxvSoS34tUpMOHev6iW7Zqt5KRFqYxl4vCqpDk9Wmhb3fKL3kwX5fQ== -xterm@4.9.0-beta.8: - version "4.9.0-beta.8" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.9.0-beta.8.tgz#ca121934d63f88668d2d5b11d9b2fc3bde7bd805" - integrity sha512-EEonYBLANDUBfEeEnHG632bZdgBaAUWst8LFr6oC6f2uLFfJGHQvVJuLaEkPtRvS+jOeoorEXZRPmso1/ANHXA== +xterm@4.9.0-beta.24: + version "4.9.0-beta.24" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.9.0-beta.24.tgz#48f0990c6d32ad3a9bcc4fb49531d7effdaccea5" + integrity sha512-CIVxxxbBiSw1WOMkIjjivaiIC9jNgih4klfWsRGx0qiDF5nbzHuLXkPTt+yAQUu9FCyTUwECm9Pkl3gUsSaGKg== y18n@^3.2.1: version "3.2.1" From 5faa26d9336f355132f81c0deb9d0396e3183a28 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Fri, 4 Sep 2020 22:54:46 -0700 Subject: [PATCH 2/2] Optimize keydown/up events by only working on !repeat --- .../workbench/contrib/terminal/browser/links/terminalLink.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/terminal/browser/links/terminalLink.ts b/src/vs/workbench/contrib/terminal/browser/links/terminalLink.ts index a194082afb475..c409b06e9c18e 100644 --- a/src/vs/workbench/contrib/terminal/browser/links/terminalLink.ts +++ b/src/vs/workbench/contrib/terminal/browser/links/terminalLink.ts @@ -60,12 +60,12 @@ export class TerminalLink extends DisposableStore implements ILink { // Listen for modifier before handing it off to the hover to handle so it gets disposed correctly this._hoverListeners = new DisposableStore(); this._hoverListeners.add(dom.addDisposableListener(document, 'keydown', e => { - if (this._isModifierDown(e)) { + if (!e.repeat && this._isModifierDown(e)) { this._enableDecorations(); } })); this._hoverListeners.add(dom.addDisposableListener(document, 'keyup', e => { - if (!this._isModifierDown(e)) { + if (!e.repeat && !this._isModifierDown(e)) { this._disableDecorations(); } }));