Merge pull request #162 from kasecato/#161/revertDuplicateSelection

Fixed #161
kasecato · Oct 22, 2019 · 8277575 · 8277575
2 parents 836fc82 + 56081fd
commit 8277575
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.2.36 (Oct 22, 2019)
+
+* bug fix - Ctrl+D doesn't work for duplicate selection. See [#161](https://github.com/kasecato/vscode-intellij-idea-keybindings/issues/161)
+
 ## 0.2.35 (Oct 22, 2019)
 
 * enhancement - ctrl + home mapping for macOS. See [#149](https://github.com/kasecato/vscode-intellij-idea-keybindings/issues/149)

diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ ctrl+c | cmd+c | Copy current line or selected block to clipboard | ✅
 ctrl+v | cmd+v | Paste from clipboard | ✅
 ctrl+shift+v | cmd+shift+v | Paste from recent buffers... | N/A
 ctrl+d | cmd+d | Duplicate Line | ✅
-ctrl+d | cmd+d | Duplicate Selection | ✅
+ctrl+d | cmd+d | Duplicate Selection | N/A
 ctrl+y | cmd+backspace | Delete line at caret | ✅
 ctrl+shift+j | ctrl+shift+j | Smart line join | ✅
 ctrl+enter | cmd+enter | Smart line split | ✅

diff --git a/package.json b/package.json
@@ -44,8 +44,7 @@
         "url": "https://github.com/kasecato/vscode-intellij-idea-keybindings/issues"
     },
     "contributes": {
-        "keybindings": [
-            {
+        "keybindings": [{
                 "key": "ctrl+shift+enter",
                 "mac": "cmd+shift+enter",
                 "command": "acceptSelectedSuggestion",
@@ -173,16 +172,9 @@
                 "key": "ctrl+d",
                 "mac": "cmd+d",
                 "command": "editor.action.copyLinesDownAction",
-                "when": "editorTextFocus && !editorReadonly && !editorHasSelection",
+                "when": "editorTextFocus && !editorReadonly",
                 "intellij": "Duplicate Line"
             },
-            {
-                "key": "ctrl+d",
-                "mac": "cmd+d",
-                "command": "editor.action.duplicateSelection",
-                "when": "editorTextFocus && !editorReadonly && editorHasSelection",
-                "intellij": "Duplicate Selection"
-            },
             {
                 "key": "ctrl+y",
                 "mac": "cmd+backspace",

diff --git a/src/package-with-comment.json b/src/package-with-comment.json
@@ -313,16 +313,19 @@
                 "key": "ctrl+d",
                 "mac": "cmd+d",
                 "command": "editor.action.copyLinesDownAction",
-                "when": "editorTextFocus && !editorReadonly && !editorHasSelection",
+                "when": "editorTextFocus && !editorReadonly",
                 "intellij": "Duplicate Line"
             },
+/*
             {
                 "key": "ctrl+d",
                 "mac": "cmd+d",
-                "command": "editor.action.duplicateSelection",
+                "command": "",
                 "when": "editorTextFocus && !editorReadonly && editorHasSelection",
-                "intellij": "Duplicate Selection"
+                "intellij": "Duplicate Selection",
+                "todo": "N/A"
             },
+*/
             {
                 "key": "ctrl+y",
                 "mac": "cmd+backspace",