feat: add visual mode mappings #78
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
akinsho
reviewed
May 20, 2024
| map({ 'n', 'v' }, config.default_mappings.both, '<Plug>(git-conflict-both)', opts('Choose Both')) | ||
| map({ 'n', 'v' }, config.default_mappings.none, '<Plug>(git-conflict-none)', opts('Choose None')) | ||
| map({ 'n', 'v' }, config.default_mappings.theirs, '<Plug>(git-conflict-theirs)', opts('Choose Theirs')) | ||
| map({ 'v', 'v' }, config.default_mappings.ours, '<Plug>(git-conflict-ours)', opts('Choose Ours')) |
There was a problem hiding this comment.
Is this correct? should this be 'V', 'v'
There was a problem hiding this comment.
Yeah, the 'v' will remap to visual, visual line, and visual block mode
|
ey @akinsho is there anything left for this PR to be accepted? |
|
@jugarpeupv lots of issues across other repos and not much time, I appreciate you're keen for it but it is on my radar, no need for a ping. |
|
Probably won't have time soon to test this manually so will merge for now but if there's any breakage I'll roll it back. |
|
@akinsho many thanks, appreciate it. I tested the fork and it worked fine |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR solves issue #34 by allowing the "Choose ..." mappings to be called in visual mode and resolving the conflicts in the visual range with the given choice
Though in my testing, the default 'c.' mappings did not work because vim would ignore the second character