-
Notifications
You must be signed in to change notification settings - Fork 3.7k
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.
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
Rework diff rendering to allow putting the cursor into deleted text, soft-wrapping and scrolling deleted text correctly #22994
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
Co-authored-by: Conrad <[email protected]> Co-authored-by: Cole <[email protected]>
Co-authored-by: Conrad <[email protected]> Co-authored-by: Cole <[email protected]>
Co-authored-by: Conrad <[email protected]> Co-authored-by: Mikayla <[email protected]>
Co-authored-by: Conrad <[email protected]> Co-authored-by: Mikayla <[email protected]>
Co-authored-by: Conrad <[email protected]>
Co-authored-by: Cole <[email protected]>
Co-authored-by: Cole <[email protected]>
Co-authored-by: Cole <[email protected]>
Co-authored-by: Cole <[email protected]>
Co-authored-by: Conrad <[email protected]>
Co-authored-by: Conrad <[email protected]>
Correctly handle multiple edits to DiffMap Co-authored-by: Conrad <[email protected]>
Co-authored-by: Conrad <[email protected]>
Co-authored-by: Michael <[email protected]>
Co-authored-by: Michael <[email protected]>
…git status Co-authored-by: Michael <[email protected]>
Co-authored-by: Michael <[email protected]>
Co-authored-by: Cole <[email protected]>
b998030
to
923ee6f
Compare
maxbrunsfeld
added a commit
that referenced
this pull request
Jan 28, 2025
…culation (#23753) This fixes an issue introduced in #22994 where soft wrap would recalculate for the entire buffer when editing. Release Notes: - N/A --------- Co-authored-by: Conrad <[email protected]>
1 task
maxbrunsfeld
added a commit
that referenced
this pull request
Feb 3, 2025
Certain themes define the `created` and `deleted` status colors, but not `created_background` and `deleted_background`. Previously, Zed would use `created` and `deleted` colors, and apply a hard-coded opacity change, but *not* use `created_background` and `deleted_background`, but that behavior was inadvertently changed in #22994. This PR restores the old behavior as a fallback. If a theme defines a status color, but not the corresponding background color, we'll use a 75% transparent version of the foreground color as a fallback. Release Notes: - Fixed an issue in certain themes where diffs would render with the wrong red and green colors for deletions and insertions.
maxbrunsfeld
added a commit
that referenced
this pull request
Feb 3, 2025
Certain themes define the `created` and `deleted` status colors, but not `created_background` and `deleted_background`. Previously, Zed would use `created` and `deleted` colors, and apply a hard-coded opacity change, but *not* use `created_background` and `deleted_background`, but that behavior was inadvertently changed in #22994. This PR restores the old behavior as a fallback. If a theme defines a status color, but not the corresponding background color, we'll use a 75% transparent version of the foreground color as a fallback. Release Notes: - Fixed an issue in certain themes where diffs would render with the wrong red and green colors for deletions and insertions.
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 #12553
diff_hunk_before
Maybe:
/x
all the time to jump to the next x I can see).o
command when cursor is on last line of deleted hunk.shift-o
on first line of deleted hunk moves cursor but doesn't insert lineenter
at end of diff hunk inserts a new line but doesn't move cursorshift-enter
at start of diff hunk does nothing)Release Notes: