Improve diff hunks #18283
Merged
Improve diff hunks #18283
+124
−82
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
Co-authored-by: Max <max@zed.dev>
cla-bot
bot
added
the
cla-signed
maxdeviant
commented
Sep 24, 2024
| @@ -90,8 +90,8 @@ pub fn diff_hunk_to_display( | |||
| let hunk_end_row = hunk.row_range.end.max(hunk.row_range.start); | |||
| let hunk_end_point = Point::new(hunk_end_row.0, 0); | |||
|
|
|||
| let multi_buffer_start = snapshot.buffer_snapshot.anchor_after(hunk_start_point); | |||
| let multi_buffer_end = snapshot.buffer_snapshot.anchor_before(hunk_end_point); | |||
| let multi_buffer_start = snapshot.buffer_snapshot.anchor_before(hunk_start_point); | |||
There was a problem hiding this comment.
We ran into an issue where when comparing the start points between the diff hunks and the expanded hunks the biases would be different (which was causing problems when comparing them).
Adjusting this line seemed to fix the problem.
@SomeoneToIgnore Do you know if the previous biasing was intentional/load-bearing?
There was a problem hiding this comment.
I vaguely recall taking this pattern from some place, but the old code indeed looks like a mistake to me now.
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 improves the display of diff hunks:
We also did some refactoring to ensure the sizing of the diff indicators in the gutter were consistent.
Collapsed
Expanded
Release Notes: