Styling for Apply/Discard buttons #21017
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: Max <max@zed.dev>
Co-Authored-By: Bennet Bo Fenner <53836821+bennetbo@users.noreply.github.com>
Co-Authored-By: Bennet Bo Fenner <53836821+bennetbo@users.noreply.github.com>
Co-Authored-By: Max <max@zed.dev>
rtfeldman
force-pushed
the
apply-discard-styling
branch
from
5f992e8 to
44db64a
Compare
notpeter
added
the
cla-signed
This test passed until 4ca64cc, which caused it to fail. However, looking at the test, it appears to have previously been broken (and 4ca64cc fixed it). In the test, we perform these two operations and then diff the result: ```rust editor.select_up_by_lines(&SelectUpByLines { lines: 5 }, cx); editor.delete_line(&DeleteLine, cx); ``` Previously, the test was asserting that the 4 lines (not 5) above the cursor were deleted. Now we instead assert that all 5 lines above the cursor were deleted, which seems correct.
maxbrunsfeld
added a commit
that referenced
this pull request
Nov 26, 2024
This reverts commit 8847480.
1 task
|
@rtfeldman where could we find designs ? Are they public ? |
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.
Change the "Apply" and "Discard" buttons to match @danilo-leal's design! Here are some different states:
Cursor in the first hunk
Now that the cursor is in a particular hunk, we show the "Apply" and "Discard" names, and the keyboard shortcut. If I press the keyboard shortcut, it will only apply to this hunk.
Cursor in the second hunk
Moving the cursor to a different hunk changes which buttons get the keyboard shortcut treatment. Now the keyboard shortcut is shown next to the hunk that will actually be affected if you press that shortcut.
Release Notes: