Fix Map to new shortcuts for new features in vscode insiders #50

kasecato · Dec 15, 2016 · 5ef19c3 · 5ef19c3
1 parent b13897f
commit 5ef19c3
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.2.7 (December 14, 2016)
+
+* enhancement - Map to new shortcuts for new features in vscode insiders. See [#50](https://github.com/k--kato/vscode-intellij-idea-keybindings/issues/50).
+* bug fix - Update package.json with a compatible engine. See [#51](https://github.com/k--kato/vscode-intellij-idea-keybindings/pull/51).
+* bug fix - Installing from VS Code Marketplace installs version 0.1.1 instead of latest (0.2.6). See [#53](https://github.com/k--kato/vscode-intellij-idea-keybindings/issues/53).
+
 ## 0.2.6 (December 6, 2016)
 
 * enhancement - ctrl+q should be bound to show hover. See [#46](https://github.com/k--kato/vscode-intellij-idea-keybindings/issues/46).

diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ ctrl+v | cmd+v | Paste from clipboard | ✅
 ctrl+shift+v | cmd+shift+v | Paste from recent buffers... | N/A
 ctrl+d | cmd+d | Duplicate current line or selected block | ✅
 ctrl+y | cmd+backspace | Delete line at caret | ✅
-ctrl+shift+j | ctrl+shift+j | Smart line join | N/A
+ctrl+shift+j | ctrl+shift+j | Smart line join | ✅
 ctrl+enter | cmd+enter | Smart line split | ✅
 shift+enter | shift+enter | Start new line | ✅
 ctrl+shift+u | cmd+shift+u | Toggle case for word at caret or selected block | N/A
@@ -267,7 +267,7 @@ npm install
 Now you can compile the code:
 
 1. Launch Code
-1. Edit `src/package-with-comment.json`
+1. Edit **`src/package-with-comment.json`** (**NOT `package.json`**)
 1. Run Build Task `Ctrl`-`Shift`-`B` (Windows, Linux) or `Cmd`-`Shift`-`B` (macOS)
 1. Run Command Markdown Generator `node src/tool/gene-keybind-markdown.js`
 1. Paste the Command Markdown to `README.md`
@@ -283,6 +283,7 @@ when changes are saved.
 * [@HSAR](https://github.com/HSAR)
 * [@mastersimon](https://github.com/mastersimon)
 * [@thekalinga](https://github.com/thekalinga)
+* [@joaomoreno](https://github.com/joaomoreno)
 
 
 ## License

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
     "version": "0.2.6",
     "publisher": "k--kato",
     "engines": {
-        "vscode": "^1.7.0"
+        "vscode": "^1.8.0"
     },
     "displayName": "IntelliJ IDEA Keybindings",
     "description": "Port of IntelliJ IDEA Keybindings",
@@ -296,18 +296,13 @@
                 "command": "editor.action.deleteLines",
                 "when": "editorTextFocus && !editorReadonly",
                 "intellij": "Delete line at caret"
-            },
-
-
-
-
-
-
-
-
-
-
-            {
+            }, {
+                "key": "ctrl+shift+j",
+                "mac": "ctrl+shift+j",
+                "command": "editor.action.joinLines",
+                "when": "editorTextFocus && !editorReadonly",
+                "intellij": "Smart line join"
+            }, {
                 "key": "ctrl+enter",
                 "mac": "cmd+enter",
                 "command": "lineBreakInsert",
@@ -706,7 +701,7 @@
             {
                 "key": "shift+escape",
                 "mac": "shift+escape",
-                "command": "workbench.action.toggleSidebarVisibility",
+                "command": "workbench.action.closePanel",
                 "when": "!editorFocus && !terminalFocus",
                 "intellij": "Hide active or last active window (Sidebar)"
             }, {
@@ -1364,8 +1359,8 @@
                 "mac": "ctrl+cmd+g",
                 "command": "editor.action.selectHighlights",
                 "when": "editorFocus",
-                "intellij": "Sublime text Style Multiple Selections"
+                "intellij": "Sublime Text style multiple selections"
             }
         ]
     }
-}
+}
diff --git a/src/package-with-comment.json b/src/package-with-comment.json
@@ -3,7 +3,7 @@
     "version": "0.2.6",
     "publisher": "k--kato",
     "engines": {
-        "vscode": "1.7.x"
+        "vscode": "^1.8.0"
     },
     "displayName": "IntelliJ IDEA Keybindings",
     "description": "Port of IntelliJ IDEA Keybindings",
@@ -309,16 +309,13 @@
                 "when": "editorTextFocus && !editorReadonly",
                 "intellij": "Delete line at caret"
             },
-            /*
             {
                 "key": "ctrl+shift+j",
                 "mac": "ctrl+shift+j",
-                "command": "",
-                "when": "",
-                "intellij": "Smart line join",
-                "todo": "N/A"
+                "command": "editor.action.joinLines",
+                "when": "editorTextFocus && !editorReadonly",
+                "intellij": "Smart line join"
             },
-*/
             {
                 "key": "ctrl+enter",
                 "mac": "cmd+enter",
@@ -748,7 +745,7 @@
             {
                 "key": "shift+escape",
                 "mac": "shift+escape",
-                "command": "workbench.action.toggleSidebarVisibility",
+                "command": "workbench.action.closePanel",
                 "when": "!editorFocus && !terminalFocus",
                 "intellij": "Hide active or last active window (Sidebar)"
             },