Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add #231 that cmd+d compare selected files #330

Merged
merged 2 commits into from
Feb 23, 2024
Merged

Add #231 that cmd+d compare selected files #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
845010f
Add #231 that cmd+d compare selected files
kasecato Feb 23, 2024
d76e8a7
Fix compareFileWith
kasecato Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 | ✅
Expand All @@ -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
Expand Down
9 changes: 8 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 8 additions & 1 deletion src/package-with-comment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down