fixed #36 (#37)

* fixed #36 * fixed readme
kasecato · Nov 29, 2016 · 5e6127d · 5e6127d
1 parent c86f553
commit 5e6127d
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.2.3 (November 29, 2016)
+
+* enhancement - alt+1 should toggle close corresponding tool window instead of just opening. See [#36](https://github.com/k--kato/vscode-intellij-idea-keybindings/issues/36).
+
 ## 0.2.2 (November 24, 2016)
 
 * bug fix - My Ctrl + Delete and Ctrl + Backspace shortcuts are inverted. See [#34](https://github.com/k--kato/vscode-intellij-idea-keybindings/issues/34).

diff --git a/README.md b/README.md
@@ -190,8 +190,13 @@ Linux, Windows | macOS | Feature | Supported
 ---------------|------|---------|---------- 
 alt+0 | cmd+0 | Activate Messages window (Problems) | ✅
 alt+1 | cmd+1 | Open corresponding tool window (Explorer) | ✅
+alt+1 | cmd+1 | Close corresponding tool window (Explorer) | ✅
+alt+3 | cmd+3 | Open corresponding tool window (Search) | ✅
+alt+3 | cmd+3 | Close corresponding tool window (Search) | ✅
 alt+5 | cmd+5 | Open corresponding tool window (Debug) | ✅
+alt+5 | cmd+5 | Close corresponding tool window (Debug) | ✅
 alt+9 | cmd+9 | Open corresponding tool window (Git) | ✅
+alt+9 | cmd+9 | Close corresponding tool window (Git) | ✅
 ctrl+s | cmd+s | Save all | ✅
 ctrl+alt+y | cmd+alt+y | Synchronize | ✅
 ctrl+alt+f | ctrl+cmd+f | Toggle full screen mode | ✅
@@ -219,9 +224,8 @@ shift+ctrl+enter | shift+cmd+enter | Start new line | ✅
 
 1. Install Visual Studio Code 1.7.0 or higher
 1. Launch Code
-1. From the command palette `Ctrl`-`Shift`-`P` (Windows, Linux) or `Cmd`-`Shift`-`P` (macOS)
-1. Select `Extensions: Install Extension`
-1. Choose the extension '`intellij-idea-keybindings`'
+1. From the extension view `Ctrl`-`Shift`-`X` (Windows, Linux) or `Cmd`-`Shift`-`X` (macOS)
+1. Search and Choose the extension `Intellij IDEA Keybindings`
 1. Reload Visual Studio Code
 
 
@@ -245,13 +249,10 @@ npm install
 Now you can compile the code:
 
 1. Launch Code
+1. Edit `src/package-with-comment.json`
 1. Run Build Task `Ctrl`-`Shift`-`B` (Windows, Linux) or `Cmd`-`Shift`-`B` (macOS)
-
-or
-
-1. Launch Code
-1. From the command palette `Ctrl`-`Shift`-`P` (Windows, Linux) or `Cmd`-`Shift`-`P` (macOS)
-1. Select `Tasks: Run Build Task`
+1. Run Command Markdown Generator `node src/tool/gene-keybind-markdown.js`
+1. Paste the Command Markdown to `README.md`
 
 After the initial compile, the source files will be watched and recompiled
 when changes are saved.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "intellij-idea-keybindings",
-    "version": "0.2.2",
+    "version": "0.2.3",
     "publisher": "k--kato",
     "engines": {
         "vscode": "1.7.x"
@@ -1127,17 +1127,50 @@
                 "key": "alt+1",
                 "mac": "cmd+1",
                 "command": "workbench.view.explorer",
+                "when": "editorFocus",
                 "intellij": "Open corresponding tool window (Explorer)"
+            }, {
+                "key": "alt+1",
+                "mac": "cmd+1",
+                "command": "workbench.action.toggleSidebarVisibility",
+                "when": "!editorFocus",
+                "intellij": "Close corresponding tool window (Explorer)"
+            }, {
+                "key": "alt+3",
+                "mac": "cmd+3",
+                "command": "workbench.view.search",
+                "when": "!searchViewletVisible",
+                "intellij": "Open corresponding tool window (Search)"
+            }, {
+                "key": "alt+3",
+                "mac": "cmd+3",
+                "command": "workbench.action.toggleSidebarVisibility",
+                "when": "searchViewletVisible",
+                "intellij": "Close corresponding tool window (Search)"
             }, {
                 "key": "alt+5",
                 "mac": "cmd+5",
                 "command": "workbench.view.debug",
+                "when": "!editorFocus",
                 "intellij": "Open corresponding tool window (Debug)"
+            }, {
+                "key": "alt+5",
+                "mac": "cmd+5",
+                "command": "workbench.action.toggleSidebarVisibility",
+                "when": "!editorFocus",
+                "intellij": "Close corresponding tool window (Debug)"
             }, {
                 "key": "alt+9",
                 "mac": "cmd+9",
                 "command": "workbench.view.git",
+                "when": "editorFocus",
                 "intellij": "Open corresponding tool window (Git)"
+            }, {
+                "key": "alt+9",
+                "mac": "cmd+9",
+                "command": "workbench.action.toggleSidebarVisibility",
+                "when": "!editorFocus",
+                "intellij": "Close corresponding tool window (Git)"
             }, {
                 "key": "ctrl+s",
                 "mac": "cmd+s",

diff --git a/src/package-with-comment.json b/src/package-with-comment.json
@@ -1,6 +1,6 @@
 {
     "name": "intellij-idea-keybindings",
-    "version": "0.2.2",
+    "version": "0.2.3",
     "publisher": "k--kato",
     "engines": {
         "vscode": "1.7.x"
@@ -1172,20 +1172,58 @@
                 "key": "alt+1",
                 "mac": "cmd+1",
                 "command": "workbench.view.explorer",
+                "when": "editorFocus",
                 "intellij": "Open corresponding tool window (Explorer)"
             },
+            {
+                "key": "alt+1",
+                "mac": "cmd+1",
+                "command": "workbench.action.toggleSidebarVisibility",
+                "when": "!editorFocus",
+                "intellij": "Close corresponding tool window (Explorer)"
+            },
+            {
+                "key": "alt+3",
+                "mac": "cmd+3",
+                "command": "workbench.view.search",
+                "when": "!searchViewletVisible",
+                "intellij": "Open corresponding tool window (Search)"
+            },
+            {
+                "key": "alt+3",
+                "mac": "cmd+3",
+                "command": "workbench.action.toggleSidebarVisibility",
+                "when": "searchViewletVisible",
+                "intellij": "Close corresponding tool window (Search)"
+            },
             {
                 "key": "alt+5",
                 "mac": "cmd+5",
                 "command": "workbench.view.debug",
+                "when": "!editorFocus",
                 "intellij": "Open corresponding tool window (Debug)"
             },
+            {
+                "key": "alt+5",
+                "mac": "cmd+5",
+                "command": "workbench.action.toggleSidebarVisibility",
+                "when": "!editorFocus",
+                "intellij": "Close corresponding tool window (Debug)"
+            },
             {
                 "key": "alt+9",
                 "mac": "cmd+9",
                 "command": "workbench.view.git",
+                "when": "editorFocus",
                 "intellij": "Open corresponding tool window (Git)"
             },
+            {
+                "key": "alt+9",
+                "mac": "cmd+9",
+                "command": "workbench.action.toggleSidebarVisibility",
+                "when": "!editorFocus",
+                "intellij": "Close corresponding tool window (Git)"
+            },
             {
                 "key": "ctrl+s",
                 "mac": "cmd+s",