805d5c9
zed 0.173.7
Joseph T. Lyons created
805d5c9
zed 0.173.7
Joseph T. Lyons created
cf03d4e
Merge branch 'main' into v0.173.x
Joseph T. Lyons created
7ba1492
file_icons: Add separate icon key for Bicep files (#24757)
This PR adds support for bicep file icon: Release Notes: - Icon themes: Added the ability to change the file icon for Bicep (`.bicep`) files.
Michal Vrbata created
0a68122
edit predictions: Enable blog post link behind a feature flag (#24720)
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 <git@maxdeviant.com>
Danilo Leal and Marshall Bowers created
277fb54
zeta: Respect `x-zed-minimum-required-version` header (#24771)
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
Marshall Bowers created
0e42a69
Update dependency danger to v12.3.4 (#24770)
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>
renovate[bot] and renovate[bot] created
b014afa
Add an undo button to the git panel (#24593)
Also prep infrastructure for pushing a commit Release Notes: - N/A --------- Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com> Co-authored-by: Conrad <conrad@zed.dev> Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Mikayla Maki , Conrad Irwin , Conrad , and Nate Butler created
df8adc8
Fix linux zeta modifiers display (#24764)
Improves rendering of Zeta keybind shortcuts on Linux Before:  After: (with muting modifier changes merged)  Release Notes: - N/A --------- Co-authored-by: Michael <michael@zed.dev> Co-authored-by: Agus <agus@zed.dev>
Ben Kunkle , Michael , and Agus created
522b8d6
editor: Fix autoscroll flickering regression (#24758)
This PR fixes autoscroll flickering issue caused by recent [#24735](https://github.com/zed-industries/zed/pull/24735) which fixes soft wrap scroll issues. No release notes, as this was few hours ago. Adding vertical scrollbar width to viewport width, so that autoscroll function don't try to that much pixels extra. Release Notes: - N/A
smit created
5dc3c23
workspace: Do not reuse window for sub directory (only for root directory 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.
smit created
c771ca4
Fix <1px gap between diff popover and accept keybindingg (#24756)
Release Notes: - N/A Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com> Co-authored-by: Danilo Leal <daniloleal09@gmail.com> Co-authored-by: rtfeldman <oss@rtfeldman.com> Co-authored-by: mgsloan <mgsloan@gmail.com>
Agus Zubiaga , Max Brunsfeld , Danilo Leal , rtfeldman , and mgsloan created
ab4a6f1
Open git panel when deploying project diff via action (#24751)
Release Notes: - N/A
Cole Miller created
316b97d
Position prediction popover adjacent to edit if possible (#24750)
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 <daniloleal09@gmail.com> Co-authored-by: rtfeldman <oss@rtfeldman.com> Co-authored-by: Agus Zubiaga <hi@aguz.me>
Max Brunsfeld , Danilo Leal , rtfeldman , and Agus Zubiaga created
eea6b52
Implement staging and unstaging hunks (#24606)
- [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
Cole Miller created
ea8da43
ui: Fix keybind sizing for non-default UI font sizes (#24708)
Closes #24597 This fixes the regression from https://github.com/zed-industries/zed/commit/00971fbe415fdc4695307f192134093c7bcd138c 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 https://github.com/zed-industries/zed/commit/00971fbe415fdc4695307f192134093c7bcd138c | --- | ---- | ---- | --- | | 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
Finn Evers created
b7860ae
zed 0.173.6
Joseph T. Lyons created
38ee945
Merge branch 'main' into v0.173.x
Joseph T. Lyons created
a3c8b0a
Merge branch 'main' into v0.173.x
Joseph T. Lyons created
cc97f41
editor: Fix horizontal scroll when soft wrap is active (#24735)
Closes #22252 This PR fixes the bug introduced in https://github.com/zed-industries/zed/pull/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.
smit created
ba7d2ba
project: Activate `buffer_diff/test-support` in `test-support` (#24739)
Closes #ISSUE Release Notes: - N/A
Piotr Osiewicz created
553cc2c
edit predictions: Do not require modifier if in leading space but just accepted a prediction (#24733)
This makes the tab tab tab experience smoother Release Notes: - N/A --------- Co-authored-by: Antonio Scandurra <me@as-cii.com> Co-authored-by: as-cii <as-cii@zed.dev> Co-authored-by: Danilo Leal <daniloleal09@gmail.com> Co-authored-by: Antonio <antonio@zed.dev> Co-authored-by: Ben <ben@zed.dev>
Agus Zubiaga , Antonio Scandurra , as-cii , Danilo Leal , Antonio , and Ben created
3f95d79
inline_completion_button: Put "Eager Preview Mode" menu entry behind 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
Marshall Bowers created
51092c4
Polish edit predictions (#24732)
Release Notes: - N/A --------- Co-authored-by: Antonio Scandurra <me@as-cii.com> Co-authored-by: as-cii <as-cii@zed.dev> Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
Agus Zubiaga , Antonio Scandurra , as-cii , and Danilo Leal created
56e6fb6
Merge branch 'main' into v0.173.x
Joseph T. Lyons created
2b7d372
Replace `rustls-native-certs` with `rustls-platform-verifier` (#24656)
closes https://github.com/zed-industries/zed/issues/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 <bennet@zed.dev> Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
Antonio Scandurra , Bennet , and Mikayla Maki created
1ce6e8d
file_icons: Use separate keys for C#, Cue, GitLab YAML, Luau, and Solidity (#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 <git@maxdeviant.com>
Sanjeev Shrestha and Marshall Bowers created
eb389a5
edit predictions: Update migration banner text and rename chore (#24713)
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 <0xtimsb@gmail.com>
Michael Sloan and smit created
e148815
docs: Fix `modal_max_width` naming (#24719)
## Fixes `modal_max_width` doc. The settings `modal_max_width` was `max_modal_width` in the doc.
Adrien Tiburce created
fc86e7c
Fix modifier key logic for edit predictions preview with completions (#24709)
Release Notes: - N/A
Michael Sloan created
7545608
edit predictions: Refine the settings migration banner (#24706)
Just a slight design touch-up on the settings migration banner. Release Notes: - N/A
Danilo Leal created
65934ae
migrator: In-memory migration and improved UX (#24621)
This PR adds: - Support for deprecated keymap and settings (In-memory migration) - Migration prompt only shown in `settings.json` / `keymap.json`. Release Notes: - The migration banner will only appear in `settings.json` and `keymap.json` if you have deprecated settings or keybindings, allowing you to migrate them to work with the new version on Zed.
smit created
498bb51
Require `alt-tab` for `AcceptEditPrediction` when `tab` inserting whitespace is desired (#24705)
Moves tab whitespace insertion logic out of `AcceptEditPrediction` handler. `edit_prediction_requires_modifier` context will now be true when on a line with leading whitespace, so that `alt-tab` is used to accept predictions in this case. This way leading indentation can be typed when edit predictions are visible Release Notes: - N/A Co-authored-by: Ben <ben@zed.dev> Co-authored-by: Joao <joao@zed.dev>
Michael Sloan , Ben , and Joao created
df9b0f3
Merge branch 'main' into v0.173.x
Joseph T. Lyons created
2e7a89c
edit predictions: Improve copywriting (#24689)
Danilo Leal created
f5fd3d9
Fix project diff focus (#24691)
Release Notes: - N/A
Conrad Irwin created
9a9fdce
Fixes for accept edit popovers (#24703)
Follow-up to #24700 Release Notes: - N/A --------- Co-authored-by: danilo-leal <daniloleal09@gmail.com> Co-authored-by: agu-z <hi@aguz.me>
Max Brunsfeld , danilo-leal , and agu-z created
cc931a8
theme: Add support for setting light/dark icon themes (#24702)
This PR adds support for configuring both a light and dark icon theme in
`settings.json`.
In addition to accepting just an icon theme name, the `icon_theme` field
now also accepts an object in the following form:
```jsonc
{
"icon_theme": {
"mode": "system",
"light": "Zed (Default)",
"dark": "Zed (Default)"
}
}
```
Both `light` and `dark` are required, and indicate which icon theme
should be used when the system is in light mode and dark mode,
respectively.
The `mode` field is optional and indicates which icon theme should be
used:
- `"system"` - Use the icon theme that corresponds to the system's
appearance.
- `"light"` - Use the icon theme indicated by the `light` field.
- `"dark"` - Use the icon theme indicated by the `dark` field.
Closes https://github.com/zed-industries/zed/issues/24695.
Release Notes:
- Added support for configuring both a light and dark icon theme and
switching between them based on system preference.
Marshall Bowers created
148547e
Rework edit prediction preview mode (#24700)
Don't animate the cursor when previewing jumps. Instead, display the jump popover with a line that resembles a cursor, indicating the jump destination. If the jump destination is outside of the view port, there is an extra step in which `tab` scrolls the viewport to reveal the jump destination. Release Notes: - N/A --------- Co-authored-by: danilo-leal <daniloleal09@gmail.com> Co-authored-by: agu-z <hi@aguz.me>
Max Brunsfeld , danilo-leal , and agu-z created
8095e60
Merge branch 'main' into v0.173.x
Joseph T. Lyons created
5293f57
Add a script that sets up a trusted MITM proxy (#24698)
In an effort to squash bugs like: https://github.com/zed-industries/zed/issues/19620, and improve confidence on PRs like: https://github.com/zed-industries/zed/pull/24656, I created this little test script using `mitmproxy` to simulate the situation. Unfortunately, I don't see any issues with our current usage of the local certificate store using this script. But I'd like to have it as a base to build off of. Release Notes: - N/A
Mikayla Maki created
73b32a2
Fix `editor::GoToDiagnostics` cycle (#24697)
Re-lands https://github.com/zed-industries/zed/pull/24446 with a more appropriate fix https://github.com/user-attachments/assets/45f665f0-473a-49bd-b013-b9d1bdb902bd After activating 2nd diagnostics group, `find_map` code for next diagnostics did not skip the previous group for the same place. This time, instead of fiddling with the diagnostics group comparison, the code splits the diagnostics by search place, looks up the active group (if any) in both split parts, and selects the entries after the group elements. Release Notes: - Fixed `editor::GoToDiagnostics` action stuck when multiple diagnostics groups belong to the same place
Kirill Bulatov created
7da913c
collab: Update user email and name when signing in (#24694)
This PR updates the `GET /user` endpoint to update the user's email and name from the provided GitHub profile information on sign-in. Currently, these fields were only set when the user was first created. Release Notes: - N/A
Marshall Bowers created
a2592a3
Clean up edit predictions settings (#24692)
This PR does some clean up for the edit predictions settings: - Removed `editor.show_edit_predictions_in_menu` - Renamed `edit_predictions.inline_preview` to `edit_predictions.mode` Release Notes: - N/A --------- Co-authored-by: Agus Zubiaga <agus@zed.dev>
Marshall Bowers and Agus Zubiaga created
636253d
Prefer names over github logins when filling co-authors (#24693)
Follow-up of https://github.com/zed-industries/zed/pull/24575 Release Notes: - N/A
Kirill Bulatov created
e851abd
migrator: Do some cleanup (#24687)
This PR does some clean up of the `migrator` crate: - Remove `.unwrap`s - Don't suppress `rustfmt` Release Notes: - N/A
Marshall Bowers created
b3814ce
Fix "Project Diff Opened" event name (#24686)
Release Notes: - N/A
Joseph T. Lyons created
2d71733
ui: Update Label component (#24653)
- Standardize style methods - Convert label story to a component preview - update component preview styles Release Notes: - N/A
Nate Butler created
2a2dbdf
Merge branch 'main' into v0.173.x
Joseph T. Lyons created
aab3e04
inline_completion_button: Add menu option to toggle "Eager Preview"s for edit predictions (#24685)
This PR adds a menu option to the edit prediction menu to toggle the "Eager Preview" behavior: <img width="252" alt="Screenshot 2025-02-11 at 2 44 52 PM" src="https://github.com/user-attachments/assets/232e879b-3c11-4edd-a549-f284e2bca391" /> Release Notes: - N/A
Marshall Bowers created
12163c9
Add `Editor &&` to accept edit contexts in vim keymap (#24684)
Without this, these default vim bindings were taking precedence over user keybindings Release Notes: - N/A
Michael Sloan created