Add command for resetting diff hunks #5736
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
pascalkuthe
added
C-enhancement
pascalkuthe
force-pushed
the
diff-reset
branch
from
42a2884
to
73f8212
Compare
|
The diagnostics get confused by the reset. It just pushed the diagnostic down and I have to save the file to clear it. Although this isn't specific to reset, it is just easier to demonstrate here.
|
That's just #701 and happens for any edit not just the |
pascalkuthe
force-pushed
the
diff-reset
branch
3 times, most recently
from
4f688f6
to
ff2a750
Compare
the-mikedavis
previously approved these changes
Feb 6, 2023
pascalkuthe
force-pushed
the
diff-reset
branch
from
ff2a750
to
b0136de
Compare
pascalkuthe
force-pushed
the
diff-reset
branch
from
b0136de
to
a8f1311
Compare
sagnibak
pushed a commit
to sagnibak/helix
that referenced
this pull request
Mar 21, 2023
wes-adams
pushed a commit
to wes-adams/helix
that referenced
this pull request
Jul 4, 2023
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.
Closes #4974
Adds the
:reset-diff-changecommand (aliases:diffgand:diffget) that resets a hunk backto its original text.
This change requires exposing the
diff_base(the file that a diff was computed against). To accommodate that I slightly refactored the terminology theDiffHandleand renamed theFileHunksstruct toDiffas it doesn't just contains hunks anymore.