Merge pull request #330 from kasecato/#231/add_two_files_compare

Add #231 that cmd+d compare selected files
kasecato · Feb 23, 2024 · 5121dd6 · 5121dd6
2 parents 069d5da + d76e8a7
commit 5121dd6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -279,6 +279,7 @@ shift+f12 | shift+f12 | Restore Default layout | ✅
 Linux, Windows | macOS | Feature | Supported
 ---------------|------|---------|----------
 ctrl+d | cmd+d | Compare Files | ✅
+ctrl+d | cmd+d | Compare Selected Files | ✅
 f7 | f7 | Next difference | ✅
 shift+f7 | shift+f7 | Previous difference | ✅
 alt+ctrl+enter | alt+cmd+enter | Start new line before current | ✅
@@ -291,7 +292,7 @@ alt+right | shift+cmd+] | Select next tab (Terminal) | ✅
 alt+tab | alt+tab | Goto next splitter | ✅
 shift+alt+tab | shift+alt+tab | Goto previous splitter | ✅
 enter | enter | Open Highlighted File (Explorer) | ✅
-alt+home | alt+home | Jump to Navigation Bar | ✅
+alt+home | cmd+up | Jump to Navigation Bar | ✅
 shift+ctrl+c | shift+cmd+c | Copy paths | ✅
 
 ### CamelHumps

diff --git a/package.json b/package.json
@@ -1454,9 +1454,16 @@
                 "key": "ctrl+d",
                 "mac": "cmd+d",
                 "command": "workbench.files.action.compareFileWith",
-                "when": "!editorTextFocus",
+                "when": "filesExplorerFocus && !explorerResourceIsFolder && !inputFocus && !listMultiSelection",
                 "intellij": "Compare Files"
             },
+            {
+                "key": "ctrl+d",
+                "mac": "cmd+d",
+                "command": "compareSelected",
+                "when": "filesExplorerFocus && !explorerResourceIsFolder && !inputFocus && listDoubleSelection",
+                "intellij": "Compare Selected Files"
+            },
             {
                 "key": "f7",
                 "mac": "f7",

diff --git a/src/package-with-comment.json b/src/package-with-comment.json
@@ -1900,9 +1900,16 @@
                 "key": "ctrl+d",
                 "mac": "cmd+d",
                 "command": "workbench.files.action.compareFileWith",
-                "when": "!editorTextFocus",
+                "when": "filesExplorerFocus && !explorerResourceIsFolder && !inputFocus && !listMultiSelection",
                 "intellij": "Compare Files"
             },
+            {
+                "key": "ctrl+d",
+                "mac": "cmd+d",
+                "command": "compareSelected",
+                "when": "filesExplorerFocus && !explorerResourceIsFolder && !inputFocus && listDoubleSelection",
+                "intellij": "Compare Selected Files"
+            },
             {
                 "key": "f7",
                 "mac": "f7",