548a8d7
proto: Create indents.scm (#27730)
Click to expand commit body
Closes #27676 Release Notes: - N/A
Ben Kunkle created
548a8d7
proto: Create indents.scm (#27730)
Closes #27676 Release Notes: - N/A
Ben Kunkle created
73f77a7
Actually run git commands if no GIT_ASKPASS is set (#27729)
Follow up to #27681 Release Notes: - N/A
Conrad Irwin created
4970fe2
editor: Hide mouse cursor also for movements and selections (#27677)
This enables hiding mouse cursor even on cursor movements like up, down, etc. or selections made using keyboard, etc. Renamed existing boolean setting "hide_mouse_while_typing" to "hide_mouse". It can have three values: `on_typing_and_movement`, `on_typing`, `never`. Release Notes: - Now mouse cursor hides even when you navigate, or make selections using keyboard in editor. This behavior can be changed by setting `hide_mouse` to `on_typing_and_movement`, `on_typing` or `never`.
Smit Barmase created
7fe6188
Introduce "Keep All" and "Reject All" buttons when reviewing assistant edits (#27724)
Release Notes: - N/A
Antonio Scandurra created
8add90d
Set up Rust debugger code runner tasks (#27571)
## Summary This PR starts the process of adding debug task locators to Zed's debugger system. A task locator is a secondary resolution phase that allows a debug task to run a command before starting a debug session and then uses the output of the run command to configure itself. Locators are most applicable when debugging a compiled language but will be helpful for any language as well. ## Architecture At a high level, this works by adding a debug task queue to `Workspace`. Which add's a debug configuration associated with a `TaskId` whenever a resolved task with a debug config is added to `TaskInventory`'s queue. Then, when the `SpawnInTerminal` task finishes running, it emits its task_id and the result of the ran task. When a ran task exits successfully, `Workspace` tells `Project` to start a debug session using its stored debug config, then `DapStore` queries the `LocatorStore` to configure the debug configuration if it has a valid locator argument. Release Notes: - N/A
Anthony Eid created
141a6c3
Revert "terminal: Make IME work with tab and enter keys (#27572)" (#27719)
This reverts commit be657aefa38da0f63bedaea18621edcc0cc929d1. (#27572) Unfortunately this change broke other bindings in the terminal like `cmd-left` and `cmd-right`. We do need to redo the terminal IME handling at some point, but we'll need a bit more thought to find an approach that works. Release Notes: - N/A
Conrad Irwin created
b4254a3
gpui: Support window resizing for `PlatformWindow` (#27477)
Support resizing windows to a specified size. ## macOS https://github.com/user-attachments/assets/8c639bc2-ee5f-4adc-a850-576dac939574 ## Wayland [wayland.webm](https://github.com/user-attachments/assets/3d593604-83b4-488f-8f63-1cf4c0c0cb9a) ## X11 [x11.webm](https://github.com/user-attachments/assets/ce8fa62e-fb74-4641-abe8-70574011e630) ## Windows https://github.com/user-attachments/assets/abb03e48-f82a-4d62-90b3-2598a4866c3f Release Notes: - N/A
Floyd Wang created
f86977e
debugger: Touchups to log breakpoints (#27675)
This is a slight refactor that flattens Breakpoint struct in anticipation of condition/hit breakpoints. It also adds a slight delay before breakpoints are shown on gutter hover to make breakpoints less attention grabbing. Release Notes: - N/A
Piotr Osiewicz created
8ecf553
assistant2: Add a way to quickly configure tools for the current profile (#27714)
This PR adds a new entry to the profile selector to quickly access tool customization for the current profile: <img width="228" alt="Screenshot 2025-03-28 at 7 08 51 PM" src="https://github.com/user-attachments/assets/929ae5e7-5a16-4bf2-8043-6c09b621fc61" /> Release Notes: - N/A
Marshall Bowers created
e171d16
assistant2: Fix incorrect action when clicking on a profile (#27710)
This PR fixes an issue where clicking on a profile entry would fork it instead of viewing it. Release Notes: - N/A
Marshall Bowers created
35da9c0
assistant2: Move prompt editor item into dropdown menu (#27708)
This PR makes the plus icon button not a dropdown anymore, freeing it up to be always the new thread action. In consequence, I'm moving all of the other items into another dropdown, which now houses "new prompt editor", history, and settings, all of which there are keybindings for. <img src="https://github.com/user-attachments/assets/1d0d43da-9447-4218-8b9b-e692c0b74f61" width="700"/> Release Notes: - N/A
Danilo Leal created
8b3eb98
assistant2: Adjust elements in the message editor (#27696)
Most notable change in this PR is the changing the default profiles' names to just "Write" and "Ask". Everything else is mostly design-related. Here's how it looks like: <img src="https://github.com/user-attachments/assets/791948c9-2d63-4523-9d54-08b63a00be6a" width="600" /> Release Notes: - N/A
Danilo Leal created
d912b0d
Remove unused tasks-related config (#27707)
Release Notes: - N/A
Kirill Bulatov created
044508e
assistant2: Visually de-emphasize read-only tool calls (#27702)
<img src="https://github.com/user-attachments/assets/03961518-ae40-47d8-b84c-974c9b897eb3" width="500"/> Release Notes: - N/A --------- Co-authored-by: Agus Zubiaga <hi@aguz.me>
Danilo Leal and Agus Zubiaga created
d63658c
Remove duplicate message bubble icon (#27699)
Release Notes: - N/A
Danilo Leal created
790b56f
livekit_client: Sort dependencies in `Cargo.toml` (#27705)
This PR sorts the dependencies in the `Cargo.toml` for `livekit_client`. Release Notes: - N/A
Marshall Bowers created
4314200
Switch back to upstream `cargo_metadata` (#27706)
This PR switches us back to the upstream `cargo_metadata`. We had switched to a fork in #27126, but this shouldn't be necessary after #27117. Release Notes: - N/A
Marshall Bowers created
3e400a4
zed: Fix `package.metadata.bundle-dev` key (#27704)
This PR fixes the `package.metadata.bundle-dev` key in the `zed` crate's
`Cargo.toml`.
It seems this was inadvertently changed in
https://github.com/zed-industries/zed/pull/27126.
Nightly builds are currently failing with:
```
error: `cargo metadata` exited with an error: error: invalid table header
duplicate key `bundle` in table `package.metadata`
--> Cargo.toml:173:1
|
173 | [package.metadata.bundle]
| ^
|
0: backtrace::capture::Backtrace::create
1: error_chain::backtrace::imp::InternalBacktrace::new
2: <error_chain::State as core::default::Default>::default
3: cargo_bundle::bundle::settings::load_metadata
4: cargo_bundle::bundle::settings::Settings::new
5: cargo_bundle::main
6: std::sys::backtrace::__rust_begin_short_backtrace
7: std::rt::lang_start::{{closure}}
8: std::rt::lang_start_internal
9: _main
```
Release Notes:
- N/A
Marshall Bowers created
e11e7df
Restore editor state on reopen (#27672)
Closes https://github.com/zed-industries/zed/issues/11626 Part of https://github.com/zed-industries/zed/issues/12853 `"restore_on_file_reopen": true` in workspace settings can now be used to enable and disable editor data between file reopens in the same pane: https://github.com/user-attachments/assets/8d938ee1-d854-42a8-bbc3-2a4e4d7d5933 The settings are generic and panes' data store can be extended for further entities, beyond editors. --------------- Impl details: Currently, the project entry IDs seem to be stable across file reopens, unlike BufferIds, so those were used. Originally, the DB data was considered over in-memory one as editors serialize their state anyway, but managing and exposing PaneIds out of the DB is quite tedious and joining the DB data otherwise is not possible. Release Notes: - Started to restore editor state on reopen
Kirill Bulatov created
bbd1e62
Fix GPUI keyup events not firing on Windows and macOS (#27290)
While building my own application using GPUI, I found that the `key_up`
event doesn't fire on Windows or macOS, with each platform failing for
different reasons. These events aren't used anywhere in Zed yet, so it
makes sense that the issue hasn't already been caught.
I don't have a Linux machine set up right now, so I don't know if these
events fire correctly on Linux or not.
---
Without this fix, a simple layout like the following:
```rust
div()
.on_key_down(cx.listener(|_, event, _, _| println!("Key down: {:?}", event)))
.on_key_up(cx.listener(|_, event, _, _| println!("Key up: {:?}", event)));
```
...would result in the following logs if the 'a' key was pressed:
```text
Key down: KeyDownEvent { keystroke: Keystroke { modifiers: Modifiers { control: false, alt: false, shift: false, platform: false, function: false }, key: "a", key_char: Some("a") }, is_held: false }
<eof>
```
With this fix, the `key_up` event fires correctly, resulting in the
following logs:
```text
Key down: KeyDownEvent { keystroke: Keystroke { modifiers: Modifiers { control: false, alt: false, shift: false, platform: false, function: false }, key: "a", key_char: Some("a") }, is_held: false }
Key up: KeyUpEvent { keystroke: Keystroke { modifiers: Modifiers { control: false, alt: false, shift: false, platform: false, function: false }, key: "a", key_char: None } }
<eof>
```
---
I've made the assumption that the `key_char` field shouldn't be set on
the `key_up` event since, unlike the `key_down` event, it's not an event
that may produce a character.
Happy to make any changes to this PR as required. If it would be
preferable to test this on Linux as well before it's merged, let me know
and I'll sort something out.
Hopefully this makes the experience of building new applications on GPUI
smoother, and potentially saves the Zed team some time if this event is
ever used in the future.
Release Notes:
- N/A
Felix Packard created
01b400e
gpui: Implement From trait for Clipboard related structs (#27585)
Implement the From trait for some simple conversations between Clipboard
related structs.
This PR only adds the From trait implementations and doesn't touch any
code. In a future PR we can simplify usage throughout the codebase, such
as:
```rust
// impl ClipboardString
fn new(text: String) -> Self {
Self::from(text)
}
```
Release Notes:
- N/A *or* Added/Fixed/Improved ...
tidely created
9445005
Don't consider empty deleted files to be dirty or conflicting (#27701)
When a file is deleted outside of Zed, but it doesn't have any unsaved changes, it shouldn't be considered "dirty" (prompting you before you close it). Release Notes: - Fixed an bug where unchanged buffers were marked as conflicting if their files were deleted outside of Zed. --------- Co-authored-by: Antonio <antonio@zed.dev>
Max Brunsfeld and Antonio created
5c0adde
Correct other end visual block functionality (#27678)
Closes #27385 Builds on #27604 so that `vim::OtherEnd` works in visual block mode. This is accomplished by reversing the order of active selections in the buffer when the user hit `o`, so that the cursor moves diagonally across the selection. The current behavior is preserved for `shift-o`, which is how the cursors behave in vim. We'll close #27604 since this encapsulates that change, but if you'd prefer to take only the visual block motion component, we'll keep the branch for #27604 open. Test case: growing a box down and to the right, other ending, followed by growing and shrinking the box: https://github.com/user-attachments/assets/1df544e1-efce-4354-b354-bbfec007a7df Test case: growing a box up and to the left, other ending, followed by growing and shrinking the box: https://github.com/user-attachments/assets/2f6d7729-c63a-4486-960b-23474c2e507a Release Notes: - Improved visual block mode when cursor is at beginning of selection - Improved visual block mode so that `o` and `shift-o` reach parity with vim --------- Co-authored-by: KyleBarton <kjbarton4@gmail.com>
Peter Finn and KyleBarton created
4a5c492
If GIT_ASKPASS is already set, assume it will do the right thing (#27681)
Fixes running git push on a coder instance. Closes #ISSUE Release Notes: - Zed will now use `GIT_ASKPASS` if you already have one set instead of overriding with our own. Fixes `git push` in Coder.
Conrad Irwin created
4da987d
Delete test file (#27697)
Closes #ISSUE Release Notes: - N/A
Conrad Irwin created
be657ae
terminal: Make IME work with tab and enter keys (#27572)
… in the terminal. Closes #23003 Release Notes: - N/A ## Before fix: https://github.com/user-attachments/assets/249ec62d-1461-4551-87b2-4259dba171f2 ## After fix: https://github.com/user-attachments/assets/2db624a0-8035-4260-9b2e-0cee83662b84
Ishige created
d0ae604
collab: Switch to new encryption format for access tokens (#27691)
This PR switches collab over to start minting access tokens using the new OAEP-based encryption format. This is a follow-up to #15058 where we added support for this new encryption format. Clients that are newer than 8 months ago should be able to decrypt the new access tokens. It is only clients older than 8 months ago that will no longer be supported. Release Notes: - N/A
Marshall Bowers created
08bb17a
Allow Trash to fallback to Delete on failure (#27682)
This fixes trashing files from the git panel on SSH remotes that don't run a Desktop environment. Release Notes: - Fix trash to work on remotes with no desktop environment configured
Conrad Irwin created
55c1f9d
Debugger: Switch Breakpoint Anchor from left to right (#27688)
This fixes an edge case where some breakpoints would not render correctly when expanding a conflict git hunk. ## Before https://github.com/user-attachments/assets/4fd75ef6-8381-4f9e-9765-5eeb3a734df0 ## After https://github.com/user-attachments/assets/b2b49894-2dc2-42ba-8038-504a1b4c2665 Release Notes: - N/A Co-authored-by: Conrad <conrad@zed.dev>
Anthony Eid and Conrad created
28f0ba3
Debugger: Basic breakpoint improvements (#27687)
This PR does three things - Right clicking within the gutter outside of the gutter fold area bounds opens a breakpoint context menu - Disabled breakpoints are now outline with the debugger accent color instead of being fully colored at half opacity - Clicking a breakpoint acts differently now - Clicking a breakpoint while holding the platform modifier key will disable/enable it - Clicking a breakpoint hint while holding the platform modifier key will set a disabled breakpoint - Clicking a disabled breakpoint will enable it instead of deleting it Release Notes: - N/A
Anthony Eid created
b5dc09c
Remove unneeded anonymous lifetimes from `gpui::Context` (#27686)
This PR removes a number of unneeded anonymous lifetimes from usages of `gpui::Context`. Release Notes: - N/A
Marshall Bowers created
e90411e
gpui: Remove unneeded anonymous lifetime from `Render::render` (#27684)
This PR removes an unneeded anonymous lifetime from the `cx` parameter
to `Render::render`.
This makes it so the anonymous lifetime doesn't show up when
implementing the `Render` trait via a code action:
#### Before
```rs
struct Foo;
impl Render for Foo {
fn render(&mut self, window: &mut Window, cx: &mut Context<'_, Self>) -> impl IntoElement {
todo!()
}
}
```
#### After
```rs
struct Foo;
impl Render for Foo {
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
todo!()
}
}
```
Release Notes:
- N/A
Marshall Bowers created
fcadcbb
assistant2: Make context pills clickable (#27680)
Release Notes: - N/A
Bennet Bo Fenner created
94ed0b7
Allow reviewing of agent changes without Git (#27668)
Release Notes: - N/A
Antonio Scandurra created
8a307e7
Switch fully to Rust Livekit (redux) (#27126)
Swift bindings BEGONE Release Notes: - Switched from using the Swift LiveKit bindings, to the Rust bindings, fixing https://github.com/zed-industries/zed/issues/9396, a crash when leaving a collaboration session, and making Zed easier to build. --------- Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com> Co-authored-by: Michael Sloan <michael@zed.dev>
Mikayla Maki , Conrad Irwin , and Michael Sloan created
c8fb95c
assistant2: Add keybinding for profile selector (#27674)
This PR adds a keybinding to toggle the profile selector. Defaults to `Cmd-I` on macOS and `ctrl-I` on Linux/Windows. Release Notes: - N/A
Marshall Bowers created
55d934a
Show tool name for Unknown tool (#27667)
Right now we can't see what tool name the model was trying to run. Release Notes: - N/A
Richard Feldman created
a916bbf
assistant2: Add support for referencing symbols as context (#27513)
TODO Release Notes: - N/A
Bennet Bo Fenner created
da47013
assistant2: Agent notification improvements (#27638)
- Show thread's summary in notification title - Improve thread's summary prompt so it's more descriptive - Make whole notification clickable  Release Notes: - N/A
Agus Zubiaga created
82ce187
Preserve newlines in release notes email (#27670)
Release Notes: - N/A
Joseph T. Lyons created
e843790
assistant2: Rework profile list (#27669)
This PR reworks the profile list to make it match the designs more closely: https://github.com/user-attachments/assets/3cd9cad4-771c-4231-ba9b-ddca72ff617c We're no longer using a `Picker` and are instead using a custom navigable list. Also added an option to add a new profile. Release Notes: - N/A
Marshall Bowers created
83f3fbf
assistant2: Add header to fork profile modal (#27666)
This PR adds a header to the fork profile view in the profile management modal: <img width="575" alt="Screenshot 2025-03-28 at 10 29 10 AM" src="https://github.com/user-attachments/assets/8c0012e5-3297-4ba6-9603-0364f5b6f3b7" /> Release Notes: - N/A
Marshall Bowers created
60a7455
assistant2: Don't scroll down if user has scrolled up (#27614)
This caused undesirable and unnecessary scrolling, in that if you scroll up, then as new messages stream into the panel, they jump the scroll bar back down. @agu-z and I paired on this and we think this is unnecessary now that we don't see the Edit button in the UI, but @bennetbo we still see code for the button in there, so...maybe we do still want this? (If so, we can revert the second commit and go back to a more conditional way of scrolling. 😄) Release Notes: - N/A --------- Co-authored-by: Agus <agus@zed.dev>
Richard Feldman and Agus created
4315b2f
assistant2: Reload profile when making changes to the active profile's tools (#27664)
This PR makes it so the profile is reloaded when making changes to the active profile's tools. Release Notes: - N/A
Marshall Bowers created
68d453d
assistant: Remove `/search` (#27661)
This PR removes the `/search` command. This was feature-flagged and was never released to the general public. Release Notes: - N/A
Marshall Bowers created
20eab90
assistant: Remove `/project` (#27660)
This PR removes the `/project` command. This was feature-flagged and was never released to the general public. Release Notes: - N/A
Marshall Bowers created
a201263
storybook: Fix `auto_height_editor` story (#27653)
This is a fix for this error when trying to run `auto_height_editor` story: ```sh thread 'main' panicked at C:\Users\x\dev\zed\crates\settings\src\settings_store.rs:363:32: unregistered setting type workspace::workspace_settings::WorkspaceSettings ``` Release Notes: - N/A
loczek created
1a4ba59
docs: Fix `#windows` Discord channel name (#27659)
This PR fixes the name of the `#windows` Discord channel to match what the channel is actually called. Release Notes: - N/A
Marshall Bowers created
24ad970
language server: Fix restarts sometimes not working for buffers open in go-to-definition view (#27655)
Closes #ISSUE Release Notes: - Fixed language server restarts sometimes not restarting a language server.
Piotr Osiewicz created
f6c81a0
assistant2: Unify path rendering for file context (#27537)
This ensures that we render path matches the same in both the file context picker and the messag editor completion provider. Release Notes: - N/A
Bennet Bo Fenner created