[pull] main from zed-industries:main #36
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
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
Fixes #15463 Release Notes: - Fixed display of symbols such as ` ` in hover popovers
Release Notes: - N/A ------ - Continue #24090 to fix text align for when used `whitespace_nowrap`. - Fix wrapped line length calculation. And add example ``` cargo run -p gpui --example text_layout ``` <img width="760" alt="image" src="https://github.com/user-attachments/assets/a087c300-0e0e-4a80-98c6-90161a9b0905" /> --------- Co-authored-by: Owen Law <[email protected]>
## Context I noticed that the project panel `select_next_git_entry` wasn't behaving correctly. Turns out it was searching in reverse, which caused the action to select itself or the last entry. This PR corrects the behavior and adds a unit test that should stop regressions. Note: Since select next/prev git entry uses the same function as select next/prev diagnostic, the test partially works for that as well. Release Notes: - Fix bug where `select_next_git_entry` project panel action would only select a previous entry or the currently selected entry. --------- Co-authored-by: Mikayla Maki <[email protected]>
Closes #18813 Release Notes: - vim: Add `gr` for [replace with register](https://github.com/vim-scripts/ReplaceWithRegister)
…ing (#24422) `use_key_equivalents` does nothing on linux, as key equivalents are only supported on mac. While it could be sensible to anticipate support, right now it is only used in these few spots, so removing it. Release Notes: - N/A
Release Notes: - Fixed a bug where toggling a diff hunk that immediately precedes another hunk would act on both hunks
Followup to #24258 Release Notes: - N/A
) This reverts commit 980ce5f. Release Notes: - N/A --------- Co-authored-by: Conrad Irwin <[email protected]>
Closes #24139 For weird reasons, Sway on few linux distoros sends `NoKeymap` event when switching windows. Zed crashes due to assertion on this event to be `XkbV1`. To fix this, we ignore `NoKeymap` event instead crashing Zed. Release Notes: - Fixed a crash in Wayland-based compositors like Sway when switching windows via the keyboard.
Git Panel updates: * Fixes commit/commit all button to work (and be disabled correctly in merge conflict status) * Updates keyboard shortcuts and sets focus on the button (enter now does the same as click; tab cycles between editor and change list) Closes #ISSUE Release Notes: - N/A *or* Added/Fixed/Improved ... --------- Co-authored-by: Cole Miller <[email protected]>
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.1)
Can you help keep this open source service alive? 💖 Please sponsor : )