Reset all changes overlapped by selections in :reset-diff-change
#10178
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
the-mikedavis
added
C-enhancement
the-mikedavis
force-pushed
the
reset-diff-change-in-range
branch
from
c5c5597
to
813dbcd
Compare
pascalkuthe
reviewed
Apr 6, 2024
the-mikedavis
added
S-waiting-on-author
the-mikedavis
force-pushed
the
reset-diff-change-in-range
branch
from
813dbcd
to
02dfcc5
Compare
This is useful for resetting multiple changes at once. For example you might use 'maf' or even '%' to select a larger region and reset all changes within. The original behavior of resetting the change on the current line is retained when the primary selection is 1-width since we look for chunks in the line range of each selection.
the-mikedavis
force-pushed
the
reset-diff-change-in-range
branch
from
02dfcc5
to
d931b17
Compare
the-mikedavis
changed the title
:reset-diff-change:reset-diff-change
the-mikedavis
added
S-waiting-on-review
pascalkuthe
approved these changes
Apr 9, 2024
mandx
added a commit
to mandx/helix
that referenced
this pull request
Apr 30, 2024
…-selection-diff` These are similar to the `reset-diff-change` command, except that rather wthan apply the diff base, the unsaved buffer changes (in `diff` syntax) are shown in a popup (with `show-selection-diff-popup`) or yanked to a register (using `yank-selection-diff`). This uses the new `hunks_intersecting_line_ranges` method from helix-editor#10178, so probably that PR should be merged first before considering merging this one.
mandx
added a commit
to mandx/helix
that referenced
this pull request
May 20, 2024
…-selection-diff` These are similar to the `reset-diff-change` command, except that rather wthan apply the diff base, the unsaved buffer changes (in `diff` syntax) are shown in a popup (with `show-selection-diff-popup`) or yanked to a register (using `yank-selection-diff`). This uses the new `hunks_intersecting_line_ranges` method from helix-editor#10178, so probably that PR should be merged first before considering merging this one.
mandx
added a commit
to mandx/helix
that referenced
this pull request
May 20, 2024
…-selection-diff` These are similar to the `reset-diff-change` command, except that rather wthan apply the diff base, the unsaved buffer changes (in `diff` syntax) are shown in a popup (with `show-selection-diff-popup`) or yanked to a register (using `yank-selection-diff`). This uses the new `hunks_intersecting_line_ranges` method from helix-editor#10178, so probably that PR should be merged first before considering merging this one.
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 is useful for resetting multiple changes at once. For example you might use
mafor even%to select a larger region and reset all changes within.The original behavior of resetting the change on the current line is retained when the primary selection is 1-width since we look for chunks in the line range of
the primaryeach selection.