forked from zed-industries/zed
-
Notifications
You must be signed in to change notification settings - Fork 0
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
[pull] main from zed-industries:main #30
Merged
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
…pen (#24265) This was an leftover from when we were persisting a per-project setting. Release Notes: - N/A
When you have an edit prediction available, you can now also accept it with `alt-tab` (or `alt-enter` on Linux) even if you don't have an LSP completions menu open. This is meant to lower the mental load when going from one mode to another. Release Notes: - N/A
Release Notes: - N/A --------- Co-authored-by: Mikayla <[email protected]>
Reverts #24152 See comment: #24152 (comment) Manually confirmed >20k generates error.
This PR sorts the dependency lists in the `Cargo.toml` for the `languages` crate. Release Notes: - N/A
Release Notes: - N/A
Logging an error in this case isn't super necessary. Release Notes: - N/A Co-authored-by: Bennet Bo Fenner <[email protected]>
Rework of #24130 Uses https://github.com/d1y/git_firefly/tree/1033c0b57ec88a002cb68efc64c8d9bf5c212e30 `COMMIT_EDITMSG` language-related definitions (thanks @d1y ) Instead of using real `.git/COMMIT_EDITMSG` file, create a buffer without FS representation, stored in the `Repository` and shared the regular way via the `BufferStore`. Adds a knowledge of what `Git Commit` language is, and uses it in the buffers which are rendered in the git panel. Release Notes: - N/A --------- Co-authored-by: Conrad Irwin <[email protected]> Co-authored-by: d1y <[email protected]> Co-authored-by: Smit <[email protected]>
Go back to a less optimized implementation for now since the custom cursor target seems to have some bugs. Release Notes: - Fixed missing git blame and status output in some projects with multiple git repositories
…erent spellings (#24281) Follow-up to #24278 This PR ensures we're checking if there's a license-type file in both US & UK English spelling, and fixes the error logging again, treating for when the worktree contains just a single file or multiple. Release Notes: - N/A Co-authored-by: Bennet Bo Fenner <[email protected]>
This PR makes adding icons to the primary and secondary actions, in the `MessageNotification` component, optional. Also took the opportunity to remove a probably unnecessary "third action" from it; streamlining the component API (we had added that for a design that we're not using anymore). I did keep the "more info" possibility, which may be useful in the future, though. Release Notes: - N/A
…completions` (#24207) Release Notes: - N/A --------- Co-authored-by: Danilo <[email protected]> Co-authored-by: Danilo Leal <[email protected]>
This reverts commit 31fa414. This reverts commit b9e0aae. `lyon` commit revert:  `MSAA` commit revert:  cc @huacnlee , @\as-cii had decided to revert this PR due to a selection right corner rendering bug. Not sure what to propose for a fix from my side Release Notes: - N/A
…generated manifest (#24295) This PR updates the Zed extension CLI with support for populating the `provides` field in the generated extension manifest. This field will contain the set of features that the extension provides. For example: ``` "provides": ["themes", "icon-themes"] ``` Release Notes: - N/A
Release Notes: - N/A
Release Notes: - Fix expand buttons adjacent to folded hunks
- Adds the `panel` crate for defining UI shared between panels, like common button and header designs, etc - Starts to update the git ui to be more consistent with other panels Release Notes: - N/A
- **Base diffs on uncommitted changes** - **Show added files in project diff view** - **Fix git panel optimism** - **boop** - **Co-Authored-By: Cole <[email protected]>** - **Fix commit (all) buttons state** - **WIP** - **WIP: commit all mode** Closes #ISSUE Release Notes: - N/A
Closes #ISSUE Co-Authored-By: Mikayla <[email protected]> Release Notes: - N/A
Release Notes: - N/A
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 : )