From 2a5c533b6b8dbbe1d26da8b266b2a5bc1c9ae2bd Mon Sep 17 00:00:00 2001 From: Keisuke KATO Date: Fri, 2 Dec 2016 00:51:49 +0900 Subject: [PATCH] fixed shift+esc can be mapped to ctrl+j #40 (#45) * fixed shift+esc can be mapped to ctrl+j #40 * fixed shift+esc can be mapped to ctrl+j #40 --- CHANGELOG.md | 4 ++++ README.md | 5 ++++- package.json | 22 +++++++++++++++++++--- src/package-with-comment.json | 23 ++++++++++++++++++++--- 4 files changed, 47 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9755e1..aeecef4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 0.2.5 (December 1, 2016) + +* enhancement - shift+esc can be mapped to ctrl+j. See [#40](https://github.com/k--kato/vscode-intellij-idea-keybindings/issues/40). + ## 0.2.4 (November 30, 2016) * enhancement - Ctrl+Shift+Numpad (- and +) should perform "Fold all" & "Expand all". See [#38](https://github.com/k--kato/vscode-intellij-idea-keybindings/issues/38). diff --git a/README.md b/README.md index 1c2c5d7..473e760 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ Port of IntelliJ IDEA key bindings for VS Code. ## Usage + ### Editing Linux, Windows | macOS | Feature | Supported @@ -123,7 +124,9 @@ alt+left | ctrl+left | Go to previous editor tab | ✅ alt+right | ctrl+right | Go to next editor tab | ✅ f12 | f12 | Go back to previous tool window | N/A escape | escape | Go to editor (from tool window) | N/A -shift+escape | shift+escape | Hide active or last active window | ✅ +shift+escape | shift+escape | Hide active or last active window (Sidebar) | ✅ +shift+escape | shift+escape | Hide active or last active window (Terminal) | ✅ +shift+escape | shift+escape | Hide active or last active window (Panel) | N/A ctrl+shift+f4 | cmd+shift+f4 | Close active run/messages/find/... tab | N/A ctrl+g | cmd+l | Go to line | ✅ ctrl+e | cmd+e | Recent files popup | ✅ diff --git a/package.json b/package.json index c0557fe..769b630 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "intellij-idea-keybindings", - "version": "0.2.4", + "version": "0.2.5", "publisher": "k--kato", "engines": { "vscode": "1.7.x" @@ -711,8 +711,14 @@ "key": "shift+escape", "mac": "shift+escape", "command": "workbench.action.toggleSidebarVisibility", - "when": "!editorFocus", - "intellij": "Hide active or last active window" + "when": "!editorFocus && !terminalFocus", + "intellij": "Hide active or last active window (Sidebar)" + }, { + "key": "shift+escape", + "mac": "shift+escape", + "command": "workbench.action.terminal.toggleTerminal", + "when": "terminalFocus", + "intellij": "Hide active or last active window (Terminal)" }, @@ -723,6 +729,16 @@ + + + + + + + + + + { "key": "ctrl+g", "mac": "cmd+l", diff --git a/src/package-with-comment.json b/src/package-with-comment.json index 5aabe65..b5aabb1 100644 --- a/src/package-with-comment.json +++ b/src/package-with-comment.json @@ -1,6 +1,6 @@ { "name": "intellij-idea-keybindings", - "version": "0.2.4", + "version": "0.2.5", "publisher": "k--kato", "engines": { "vscode": "1.7.x" @@ -752,9 +752,26 @@ "key": "shift+escape", "mac": "shift+escape", "command": "workbench.action.toggleSidebarVisibility", - "when": "!editorFocus", - "intellij": "Hide active or last active window" + "when": "!editorFocus && !terminalFocus", + "intellij": "Hide active or last active window (Sidebar)" }, + { + "key": "shift+escape", + "mac": "shift+escape", + "command": "workbench.action.terminal.toggleTerminal", + "when": "terminalFocus", + "intellij": "Hide active or last active window (Terminal)" + }, + /* + { + "key": "shift+escape", + "mac": "shift+escape", + "command": "", + "when": "panelVisible", + "intellij": "Hide active or last active window (Panel)", + "todo": "not support panelVisible VS Code #14779" + }, +*/ /* { "key": "ctrl+shift+f4",