fixed #13 ctrl|cmd+shift+enter behaves differently than IntelliJ. (#14)

* fixed #13 ctrl|cmd+shift+enter behaves differently than IntelliJ. * fix readme and usage
kasecato · Sep 17, 2016 · d5bce09 · d5bce09
1 parent f8bcc70
commit d5bce09
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -209,6 +209,7 @@ Linux, Windows | macOS | Feature | Supported
 ---------------|------|---------|---------- 
 f7 | f7 | Next difference | Yes
 shift+f7 | shift+f7 | Previous difference | Yes
+ctrl+shift+enter | cmd+shift+enter | Start new line | Yes
 
 
 ## Installation

diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
     "name": "intellij-idea-keybindings",
-    "version": "0.1.5",
+    "version": "0.1.6",
     "publisher": "k--kato",
     "engines": {
-        "vscode": "1.4.x"
+        "vscode": "1.5.x"
     },
     "displayName": "IntelliJ IDEA Keybindings",
     "description": "Port of IntelliJ IDEA Keybindings",
@@ -20,7 +20,7 @@
     ],
     "dependencies": {},
     "devDependencies": {
-        "vscode": "^0.11.14",
+        "vscode": "^0.11.18",
         "gulp": "~3.9.1",
         "gulp-cli": "~1.2.2",
         "gulp-strip-json-comments": "~2.0.0",
@@ -68,8 +68,8 @@
             {
                 "key": "ctrl+shift+enter",
                 "mac": "cmd+shift+enter",
-                "command": "editor.action.insertLineAfter",
-                "when": "editorTextFocus",
+                "command": "acceptSelectedSuggestion",
+                "when": "editorFocus && suggestWidgetVisible",
                 "intellij": "Complete statement"
             }, {
                 "key": "ctrl+p",
@@ -1223,8 +1223,13 @@
                 "command": "workbench.action.compareEditor.previousChange",
                 "when": "textCompareEditorVisible",
                 "intellij": "Previous difference"
+            }, {
+                "key": "ctrl+shift+enter",
+                "mac": "cmd+shift+enter",
+                "command": "editor.action.insertLineAfter",
+                "when": "editorTextFocus && !suggestWidgetVisible",
+                "intellij": "Start new line"
             }
-
         ]
     }
 }
diff --git a/src/package-with-comment.json b/src/package-with-comment.json
@@ -1,9 +1,9 @@
 {
     "name": "intellij-idea-keybindings",
-    "version": "0.1.5",
+    "version": "0.1.6",
     "publisher": "k--kato",
     "engines": {
-        "vscode": "1.4.x"
+        "vscode": "1.5.x"
     },
     "displayName": "IntelliJ IDEA Keybindings",
     "description": "Port of IntelliJ IDEA Keybindings",
@@ -21,7 +21,7 @@
     "dependencies": {
     },
     "devDependencies": {
-        "vscode": "^0.11.14",
+        "vscode": "^0.11.18",
         "gulp": "~3.9.1",
         "gulp-cli": "~1.2.2",
         "gulp-strip-json-comments": "~2.0.0",
@@ -70,8 +70,8 @@
             {
                 "key": "ctrl+shift+enter",
                 "mac": "cmd+shift+enter",
-                "command": "editor.action.insertLineAfter",
-                "when": "editorTextFocus",
+                "command": "acceptSelectedSuggestion",
+                "when": "editorFocus && suggestWidgetVisible",
                 "intellij": "Complete statement"
             },
             {
@@ -1277,8 +1277,14 @@
                 "command": "workbench.action.compareEditor.previousChange",
                 "when": "textCompareEditorVisible",
                 "intellij": "Previous difference"
+            },
+            {
+                "key": "ctrl+shift+enter",
+                "mac": "cmd+shift+enter",
+                "command": "editor.action.insertLineAfter",
+                "when": "editorTextFocus && !suggestWidgetVisible",
+                "intellij": "Start new line"
             }
-
         ]
     }
 }
diff --git a/src/tool/gene-keybind-markdown.js b/src/tool/gene-keybind-markdown.js
@@ -1,5 +1,5 @@
 /*---------------------------------------------------------------------------*\
- * node src/tool/gene-keybind-markdown.js
+ * node gene-keybind-markdown.js
 \*---------------------------------------------------------------------------*/
 
 const fs = require('fs'),