[pull] main from zed-industries:main #56
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}
Rationale for the changes: * `requires migration` -> `uses some deprecated settings` changed because really it isn't required by this version of Zed, and I believe we hope to offer support for deprecated settings and their migration for a long time. * Rename of `migration` -> `updated` is because to me, "updated" feels lighter and more accurate. To me migration has connotations of moving to a whole new format. Formatting changes are due to shortening the line causing cargo fmt to go from not formatting the code to doing so. Release Notes: - N/A --------- Co-authored-by: smit <[email protected]>
…idity (#24711) This PR updates the file icon mappings such that: - C# (`.cs`) files map to the `csharp` key - Cue (`.cue`) files map to the `cue` key - GitLab YAML (`gitlab-ci.yml`) files map to the `gitlab` key - Luau (`.luau`) files map to the `luau` key - Solidity (`.sol`) files map to the `solidity` key Release Notes: - Icon themes: Added the ability to change the file icon for C# (`.cs`) files. - Icon themes: Added the ability to change the file icon for Cue (`.cue`) files. - Icon themes: Added the ability to change the file icon for GitLab YAML (`gitlab-ci.yml`) files. - Icon themes: Added the ability to change the file icon for Luau (`.luau`) files. - Icon themes: Added the ability to change the file icon for Solidity (`.sol`) files. --------- Co-authored-by: Marshall Bowers <[email protected]>
closes #19620. I am not 100% sure on how to test this though. @elithrar: would you mind giving this branch a shot and seeing if it works for you? I kicked off bundling for this pull request and you should be able to download a DMG from the CI artifacts as soon as it's done building. Release Notes: - Fixed a bug that caused OS-level CA certificate bundles to not be respected. --------- Co-authored-by: Bennet <[email protected]> Co-authored-by: Mikayla Maki <[email protected]>
Release Notes: - N/A --------- Co-authored-by: Antonio Scandurra <[email protected]> Co-authored-by: as-cii <[email protected]> Co-authored-by: Danilo Leal <[email protected]>
…a feature flag (#24734) This PR puts the "Eager Preview Mode" menu entry behind a feature flag rather than a staff flag. Currently it defaults to `false` for staff so that it doesn't leak into any marketing/launch materials. Folks who want to see it can opt-in to the flag explicitly, for now. Release Notes: - N/A
…t accepted a prediction (#24733) This makes the tab tab tab experience smoother Release Notes: - N/A --------- Co-authored-by: Antonio Scandurra <[email protected]> Co-authored-by: as-cii <[email protected]> Co-authored-by: Danilo Leal <[email protected]> Co-authored-by: Antonio <[email protected]> Co-authored-by: Ben <[email protected]>
Closes #ISSUE Release Notes: - N/A
Closes #22252 This PR fixes the bug introduced in #19495 by: Problem: The vertical scrollbar is currently rendered absolutely on top of the editor. When calculating soft wrap, the editor uses its width to decide how many words fit on a line. This causes words to overlap with the vertical scrollbar because it doesn't account for the scrollbar's width. To fix the overlap, extra overflow is added to the scrollbar, which solves the issue but creates unnecessary scrolling in soft wrap mode. Fix: The editor width is adjusted to account for the scrollbar's width. This makes sure the correct number of words fit on a line and prevents overlapping with the scrollbar in soft wrap mode. Since the scrollbar width is now accounted for in the editor's width, there's no need to add extra overflow, unless there’s no soft wrap. In that case, when text overflows the editor’s width, we still need to add extra overscroll to match the scrollbar width. Without this, long lines will overlap with the scrollbar. Release Notes: - Fixed issue where horizontal scrollbar would scroll few characters width when soft wrap is active.
Closes #24597 This fixes the regression from 00971fb which removed the `text_ui(cx)` - call from the keybinding render. The removal caused improperly scaled font rendering as shown in the images below. This PR reintroduces this behaviour for all cases where `size` is not set. | | `main` | With this patch | Parent of 00971fb | --- | ---- | ---- | --- | | Small font size (10px) | <img width="204" alt="cur_small" src="https://github.com/user-attachments/assets/2bb1615a-c346-4da5-855c-01894744ee74" /> | <img width="205" alt="pr_small" src="https://github.com/user-attachments/assets/26ab70f0-d6ca-439b-aaea-4d6ded4f8f11" /> | <img width="203" alt="prev_small" src="https://github.com/user-attachments/assets/92a04008-8408-4a98-83a2-59fdd6e5708a" /> | | Large font size | <img width="369" alt="cur_big" src="https://github.com/user-attachments/assets/8400c205-19b6-479c-a3d1-df12ed4e84da" /> | <img width="398" alt="pr_big" src="https://github.com/user-attachments/assets/01f495aa-0be1-4169-ae09-4292b0e638ff" /> | <img width="389" alt="prev_big" src="https://github.com/user-attachments/assets/e041a8ea-a958-4a3b-8fef-0f7fe5079c34" /> | Release Notes: - Fixed keybind hints being improperly scaled for custom ui font sizes
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 : )