From 8c930bd0514bce574b2b9cda2c13948e04648d50 Mon Sep 17 00:00:00 2001 From: Crispin Bennett Date: Tue, 11 Aug 2020 13:33:15 +1000 Subject: [PATCH] Stop overriding vs code's default esc keybinding - as per [Calva's ESC keybinding overrides VS Code's (useful) default](https://github.com/BetterThanTomorrow/calva/issues/740) --- CHANGELOG.md | 1 + package-lock.json | 2 +- package.json | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30e5d799d..b8c0ac8f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Changes to Calva. ## [Unreleased] - Fix: [Interrupting evaluations produces extra output and no prompt](https://github.com/BetterThanTomorrow/calva/issues/738) +- Fix: [Calva's ESC keybinding overrides VS Code's (useful) default](https://github.com/BetterThanTomorrow/calva/issues/740) ## [2.0.119] - 2020-08-07 - Really fix: [Accessing recent results (*1, *2, *3) does not work](https://github.com/BetterThanTomorrow/calva/issues/724) diff --git a/package-lock.json b/package-lock.json index 78b7816ef..ea49dfa0c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "calva", - "version": "2.0.120", + "version": "2.0.120-fix-740-allow-default-esc-keybind", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 8957b554d..1dd6ab62b 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "Calva: Clojure & ClojureScript Interactive Programming", "description": "Integrated REPL, formatter, Paredit, and more. Powered by nREPL.", "icon": "assets/calva.png", - "version": "2.0.120", + "version": "2.0.120-fix-740-allow-default-esc-keybind", "publisher": "betterthantomorrow", "author": { "name": "Better Than Tomorrow", @@ -1102,7 +1102,7 @@ { "command": "calva.clearInlineResults", "key": "escape", - "when": "editorLangId == clojure && editorTextFocus && !editorReadOnly && !suggestWidgetVisible && !hasOtherSuggestions && !editorHasMultipleSelections && !parameterHintsVisible" + "when": "editorTextFocus && !editorHasMultipleSelections && !editorHasSelection && !editorReadOnly && !hasOtherSuggestions && !parameterHintsVisible && !selectionAnchorSet && !suggestWidgetVisible && editorLangId == 'clojure'" }, { "command": "calva.evaluateSelection",