[pull] main from zed-industries:main #57
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}
- [x] Staging hunks - [x] Unstaging hunks - [x] Write a randomized test - [x] Get test passing - [x] Fix existing bug in diff_base_byte_range computation - [x] Remote project support - [ ] ~~Improve performance of buffer_range_to_unchanged_diff_base_range~~ - [ ] ~~Bug: project diff editor scrolls to top when staging/unstaging hunk~~ existing issue - [ ] ~~UI~~ deferred - [x] Tricky cases - [x] Correctly handle acting on multiple hunks for a single file - [x] Remove path from index when unstaging the last staged hunk, if it's absent from HEAD, or staging the only hunk, if it's deleted in the working copy Release Notes: - Add `ToggleStagedSelectedDiffHunks` action for staging and unstaging individual diff hunks
Also, place accept key binding indicator on right edge of popover to avoid obscuring content above. Release Notes: - N/A Co-authored-by: Danilo Leal <[email protected]> Co-authored-by: rtfeldman <[email protected]> Co-authored-by: Agus Zubiaga <[email protected]>
Release Notes: - N/A
Release Notes: - N/A Co-authored-by: Max Brunsfeld <[email protected]> Co-authored-by: Danilo Leal <[email protected]> Co-authored-by: rtfeldman <[email protected]> Co-authored-by: mgsloan <[email protected]>
…tory and sub files) (#24560) Closes #10232 Context: We have three ways to open files or dirs in Zed: `zed`, `zed --new`, and `zed --add`. `--new` forces the project to open in a new window, while `--add` forces it to open in an existing window (even if the dir isn’t a subdir of an existing project or the file isn’t part of it). Using just `zed` tries to open it in an existing window based on similar logic of `--add`, but if no related project is found the dir, opens in a new window. Problem: Right now, subdirs that are part of an existing project open in the existing window when using `zed`. By default, subdirs should open in a new window instead. If someone wants to open it in the existing window, they can explicitly use `--add`. After this PR, only root dir and files will focus on existing window, when `zed ` is used. Fix: For the `zed` case, we’ve filtered out subdirs in the logic that assigns them to an existing window. Release Notes: - Fixed an issue where subdirectories of an already opened project, when opened via the terminal, would open in the existing project instead of a new window.
Improves rendering of Zeta keybind shortcuts on Linux Before:  After: (with muting modifier changes merged)  Release Notes: - N/A --------- Co-authored-by: Michael <[email protected]> Co-authored-by: Agus <[email protected]>
Also prep infrastructure for pushing a commit Release Notes: - N/A --------- Co-authored-by: Conrad Irwin <[email protected]> Co-authored-by: Conrad <[email protected]> Co-authored-by: Nate Butler <[email protected]>
This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [danger](https://redirect.github.com/danger/danger-js) | [`12.3.3` -> `12.3.4`](https://renovatebot.com/diffs/npm/danger/12.3.3/12.3.4) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>danger/danger-js (danger)</summary> ### [`v12.3.4`](https://redirect.github.com/danger/danger-js/blob/HEAD/CHANGELOG.md#1234) [Compare Source](https://redirect.github.com/danger/danger-js/compare/12.3.3...12.3.4) - Ensure that [babel ignores](https://babeljs.io/docs/options#ignore) do not cause the transpiler to fall over, by supporting the `null` return from `loadOptions` which occurs when a file is ignored. - Allow absolute paths for a Dangerfile </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 3pm on Wednesday" in timezone America/New_York, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- Release Notes: - N/A <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xNjcuMSIsInVwZGF0ZWRJblZlciI6IjM5LjE2Ny4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
This PR makes it so Zeta respects the `x-zed-minimum-required-version` header sent back from the server. If the current Zed version is strictly less than the indicated minimum required version, we show an error indicating that an update is required in order to continue using Zeta: <img width="472" alt="Screenshot 2025-02-12 at 6 15 44 PM" src="https://github.com/user-attachments/assets/51b85dff-23a0-464c-ae4b-5b8f46b5915c" /> Release Notes: - N/A
This PR updates the blog post link in the onboarding modal to be behind the `predict-edits-launch` feature flag instead of a staff flag. This will allow us to enable the blog post link once we're live. Release Notes: - N/A --------- Co-authored-by: Marshall Bowers <[email protected]>
This PR adds support for bicep file icon: Release Notes: - Icon themes: Added the ability to change the file icon for Bicep (`.bicep`) files.
…4772) The docs have not been updated yet, this is anticipating their presence soon.  Release Notes: - N/A
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [cloudflare/wrangler-action](https://redirect.github.com/cloudflare/wrangler-action) | action | digest | `7a5f8bb` -> `392082e` | --- ### Configuration 📅 **Schedule**: Branch creation - "after 3pm on Wednesday" in timezone America/New_York, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- Release Notes: - N/A <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xNjcuMSIsInVwZGF0ZWRJblZlciI6IjM5LjE2Ny4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
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 : )