c147b58
Remove redundant checks in `do_stage_or_unstage_and_next` (#26364)
Click to expand commit body
Release Notes: - N/A
João Marcos created
c147b58
Remove redundant checks in `do_stage_or_unstage_and_next` (#26364)
Release Notes: - N/A
João Marcos created
84fe1bf
Recognize ixx as part of the cpp suffix (#26333)
Adds "ixx" as path suffix to be recognized for c++. > ixx documentation https://learn.microsoft.com/en-us/cpp/cpp/modules-cpp?view=msvc- I've also added it to the icon file. Release Notes: - N/A
Devzeth created
657d7a9
Add logo for `wgsl` (WebGPU Shading Language) (#26360)
Was dabbling on the shaders these past few days and felt like we could have the WGSL logo. This is based on the logo found on the GPU Web repository: https://github.com/gpuweb/gpuweb/tree/main/logo Release Notes: - N/A
Danilo Leal created
ee05cc3
Add a line numbers toggle to the editor controls menu (#26318)
Closes https://github.com/zed-industries/zed/issues/26305 <img src="https://github.com/user-attachments/assets/795029ad-128a-471f-9adf-c0ef26319bbf" width="400px" /> Release Notes: - N/A
Danilo Leal created
5ed144f
macOS: Add support for external file managers to open directory in Zed (#26357)
Closes #25421 This PR adds support for external file managers to show Zed as an option in the "Open With" context menu for directories on macOS. <img width="350" alt="image" src="https://github.com/user-attachments/assets/c52acd48-73c4-47be-8683-6950e0371b73" /> Release Notes: - Added support for opening folders in Zed from third-party macOS file managers like Path Finder and Super Charge through their "Open With" menu.
Smit Barmase created
2a862b3
nix: Disable checks and remove crane workaround (#26356)
The checkPhase was failing for me in darwin so I turned it off. I think eventually we'll want to use a separate derivation for tests (which crane has a helper for). Crane also solved our issue with spaces in paths so I bumped the flake to pick up that fix and removed our workaround: ipetkov/crane#808. Release Notes: - N/A
Julia Ryan created
4a7c84f
Fix nix build (#26270)
This PR includes lots of small fixes to get our `build.nix` and `shell.nix` back to a working state. I've tested this by running `cargo run` (inside the devshell) and `nix run` on x86 nixos and arm64 darwin machines. I'd appreciate it if others could test building inside the devshell to double-check that it's not just working because I happen to have some system-level packages installed, as well as seeing if it works on other platforms (non-nixos linux, arm linux, x86 darwin). I couldn't get the full test suite (`cargo nextest run --workspace`) passing in the devshell on darwin, but they _are_ all passing on nixos. nixpkgs [disables some of our tests](https://github.com/NixOS/nixpkgs/blob/92d11f06d5cfa80901ef8eea11ee294520fae485/pkgs/by-name/ze/zed-editor/package.nix#L226-L234) that apparently fail or are flakey on hydra, but they don't know why. I'm going to punt on debugging those for now, especially given that they seem to be working for me. I'm also unsure of whether we actually want the nix checkPhase to run the full test suite (it's currently not passing `--workspace`) given that we have separate CI that should enforce that those pass on all PRs. Here's an overview of the changes made: - Fix our `generate-licenses` script - Relaxes the `cargo-about` version requirement slightly so it doesn't try to install an older binary when the nixpkgs one is newer than our requirement - Add a workaround for [this cargo-about issue](https://github.com/zed-industries/zed/issues/19971) obviating the need for the patching done in the nixpkgs package - Set the new `--frozen` flag to avoid network access/mutating the lockfile - Use dynamic webrtc lib from nixpkgs, and fixes up the build script in webrtc-sys that hardcodes it to be statically linked. - Use `inputsFrom` in `shell.nix` and avoid duplicating everything from `build.nix` - Add a temporary workaround for an [upstream crane bug](https://github.com/ipetkov/crane/issues/808). - Fix shebangs in our `script` dir to not hard-code `/bin/bash` There are still a bunch of issues that aren't resolved here, I'll make a tracking issue for those and try to land this first just to get back to an unbroken state. Eventually among other things I'd like to use a `libgit2` from `staticPkgs` and musl cross compilation to build the remote server under nix, and then add that as a separate flake output and include it in the shell's `inputsFrom` list. Thanks @niklaskorz, @GaetanLepage, @bbigras and all the other nixpkgs maintainers that have kept the `zed-editor` package working and up to date! I seriously considered just making our flake `overrideAttrs` the package in nixpkgs given how well maintained it is. Thanks @WeetHet for your volunteer maintinance of this flake. I referenced #24953 while working on these fixes, and I'd love to collaborate on adding some of those pieces like treefmt and a github action. If you're interested I'd really appreciate some help debugging why crane's `buildDepsOnly` isn't working for us. I'm assuming it'd make our `nix build` times go way down from the improved dep caching if we could get it working. Thanks @rrbutani for all the help on this PR 💙. Release Notes: - N/A --------- Co-authored-by: Rahul Butani <rrbutani@users.noreply.github.com> Co-authored-by: Rahul Butani <rr.butani@gmail.com>
Julia Ryan , Rahul Butani , and Rahul Butani created
230e2e4
Restore git panel header (#26354)
Let's play around with it. This should not be added to tomorrow's preview. Release Notes: - Git Beta: Added a panel header with an open diff and stage/unstage all buttons.
Mikayla Maki created
d732b8b
git: Disable commit message generation when commit not possible (#26329)
## Issue: - `Generate Commit Message` will generate a random message if there are no changes. <img width="614" alt="image" src="https://github.com/user-attachments/assets/c16cadac-01af-47c0-a2db-a5bbf62f84bb" /> ## After Fixed: - `Generate Commit Message` will be disabled if commit is not possible <img width="610" alt="image" src="https://github.com/user-attachments/assets/5ea9ca70-6fa3-4144-ab4e-be7a986d5496" /> ## Release Notes: - Fixed: Disable commit message generation when commit is not possible
Richard Hao created
7c3eecc
Add support for querying file outline in assistant script (#26351)
Release Notes: - N/A
Michael Sloan created
fff37ab
Follow-up fixes for recent multi buffer optimizations (#26345)
I realized that the optimization broke multi buffer syncing after buffer reparses. Release Notes: - N/A
Max Brunsfeld created
8a7a78f
Avoid modifying the LSP message before resolving it (#26347)
Closes https://github.com/zed-industries/zed/issues/21277 To the left is current Zed, right is the improved version. 3rd message, from Zed, to resolve the item, does not have `textEdit` on the right side, and has one on the left. Seems to not influence the end result though, but at least Zed behaves more appropriate now. <img width="1727" alt="image" src="https://github.com/user-attachments/assets/ca1236fd-9ce2-41ba-88fe-1f3178cdcbde" /> Instead of modifying the original LSP completion item, store completion list defaults and apply them when the item is requested (except `data` defaults, needed for resolve). Now, the only place that can modify the completion items is this method, and Python impl seems to be the one doing it: https://github.com/zed-industries/zed/blob/ca9c3af56ffb05a789c2b946489f4406af2c8281/crates/languages/src/python.rs#L182-L204 Seems ok to leave untouched for now. Release Notes: - Fixed LSP completion items modified before resolve request
Kirill Bulatov created
6de3ac3
Revert "Highlight `super` and `this` as keywords in JS/TS/TSX" (#26342)
Reverts zed-industries/zed#25135 This approach was not the best as explained in the response to the original PR. Likely, the better approach is to create a newer specific scope for these kinds of variables under the `@variable` prefix so that themes can control these pseudo-keywords specifically
Ben Kunkle created
5aae3bd
copilot: Fix missing sign-out button when Zed is the edit prediction provider (#26340)
Closes #25884 Added a sign-out button for Copilot in Assistant settings, allowing sign-out even when copilot is disabled. <img width="500" alt="image" src="https://github.com/user-attachments/assets/43fc97ad-f73c-49e1-a7b6-a3910434d661" /> Release Notes: - Added a sign-out button for Copilot in Assistant settings.
Smit Barmase created
e298301
assistant: Make scripting a first-class concept instead of a tool (#26338)
This PR makes refactors the scripting functionality to be a first-class concept of the assistant instead of a generic tool, which will allow us to build a more customized experience. - The tool prompt has been slightly tweaked and is now included as a system message in all conversations. I'm getting decent results, but now that it isn't in the tools framework, it will probably require more refining. - The model will now include an `<eval ...>` tag at the end of the message with the script. We parse this tag incrementally as it streams in so that we can indicate that we are generating a script before we see the closing `</eval>` tag. Later, this will help us interpret the script as it arrives also. - Threads now hold a `ScriptSession` entity which manages the state of all scripts (from parsing to exited) in a centralized way, and will later collect all script operations so they can be displayed in the UI. - `script_tool` has been renamed to `assistant_scripting` - Script source now opens in a regular read-only buffer Note: We still need to handle persistence properly Release Notes: - N/A --------- Co-authored-by: Marshall Bowers <git@maxdeviant.com>
Agus Zubiaga and Marshall Bowers created
ed6bf7f
diagnostics: Fix losing focus when activating from diagnostics view (#25517)
Closes #25509
Changes:
- If active item is already diagnostics, don't try to focus it again.
Instead of not focusing, should it just not activate instead? Something
like:
if !workspace
.active_item(cx)
.map(|item| item.item_id() == existing.item_id())
.unwrap_or(false)
{
workspace.activate_item(&existing, true, true, window, cx);
}
Release Notes:
- N/A
brian tan created
f14d667
copilot: Fix onboarding into Copilot requires Zed restart (#26330)
Closes #25594 This PR fixes an issue where signing into Copilot required restarting Zed. Copilot depends on an OAuth token that comes from either `hosts.json` or `apps.json`. Initially, both files don't exist. If neither file is found, we fallback to watching `hosts.json` for updates. However, if the auth process creates `apps.json`, we won't receive updates from it, causing the UI to remain outdated. This PR fixes that by watching the parent `github-copilot` directory instead, which will always contain one of those files along with an additional version file. I have tested this on macOS and Linux Wayland. Release Notes: - Fixed an issue where signing into Copilot required restarting Zed.
Smit Barmase created
22d9b5d
Update key binding documentation (#26321)
Release Notes: - N/A
Joseph T. Lyons created
6ed6e8b
git: Refine diff hunk controls visuals (#26317)
You may need to zoom in hard to see this 😅 but the main addition of this PR is just ensuring there's also horizontal border instead of just on the bottom. Also added some box-shadow here to make it pop out of the diff a bit more. | Before | After | |--------|--------| |  |  | Release Notes: - N/A
Danilo Leal created
4846e6f
Fix performance bottlenecks when multi buffers have huge numbers of buffers (#26308)
This is motivated by trying to make the Project Diff view usable with huge Git change sets. Release Notes: - Improved performance of rendering multibuffers with very large numbers of buffers
Max Brunsfeld created
cb543f9
Git UI papercuts (#26316)
Release Notes: - Git Beta: added `git:Add` as an alias for the existing `git::Diff` - Git Beta: Fixed a bug where the 'generate commit message' keybinding wasn't working. - Git Beta: Made the empty project diff state a little more helpful with a button to push, and a button to close the item.
Mikayla Maki created
450d727
Fixes to excerpt movement actions and bindings + add `multibuffer` and `singleton_buffer` key contexts (#26264)
Closes #26002 Release Notes: - Added `multibuffer` key context. - `cmd-down` and `cmd-shift-down` on Mac now moves to the end of the last line of a singleton buffer instead of the beginning. In multibuffers, these now move to the start of the next excerpt. - Fixed `vim::PreviousSectionEnd` (bound to `[ ]`) to move to the beginning of the line, matching the behavior of `vim::NextSectionEnd`. - Added `editor::MoveToStartOfNextExcerpt` and `editor::MoveToEndOfPreviousExcerpt`.
Michael Sloan created
60b3eb3
Add git branch switching aliases (#26315)
This gives us _very_ rudimentary support for `git switch` and `git checkout` now, by making them aliases for our existing `git::branch` call. Release Notes: - Git Beta: Added `git::Switch` and `git::CheckoutBranch` as aliases for the existing `git::Branch`
Mikayla Maki created
bbe7c9a
assistant2: Factor out `Thread::all_tools_finished` method (#26314)
This PR factors out a new `Thread::all_tools_finished` method to encapsulate some of the boilerplate in the `ThreadEvent::ToolFinished` event handler. This should make this event handler easier to replicate for the eval use-case. Release Notes: - N/A
Marshall Bowers created
f6345a6
Improve when the commit suggestions would show (#26313)
Release Notes: - Git Beta: Fixed a few bugs where the suggested commit text wouldn't show in certain cases, or would update slowly.
Mikayla Maki created
e70d0ed
assistant_tool: Pass an `Entity<Project>` to `Tool::run` (#26312)
This PR updates the `Tool::run` method to take an `Entity<Project>` instead of a `WeakEntity<Project>`. Release Notes: - N/A
Marshall Bowers created
921c24e
assistant2: Add helper methods to `Thread` for dealing with tool use (#26310)
This PR adds two new helper methods to the `Thread` for dealing with tool use: - `use_pending_tools` - This uses all of the tools that are pending - The reason we aren't calling this directly in `stream_completion` is that we still might need to have a way for users to confirm that they want tools to be run, which would need to happen at the UI layer in the `ActiveThread`. - `send_tool_results_to_model` - This encapsulates inserting a new user message that contains the tool results and sending them up to the model. Release Notes: - N/A
Marshall Bowers created
18f3f80
assistant_tool: Decouple `Tool` from `Workspace` (#26309)
This PR decouples the `Tool` trait from the `Workspace` (and from the UI, in general). `Tool::run` now takes a `WeakEntity<Project>` instead of a `WeakEntity<Workspace>` and a `Window`. Release Notes: - N/A
Marshall Bowers created
4f6682c
haskell: Extract to zed-extensions/haskell repository (#26306)
This PR extracts the Haskell extension to the [zed-extensions/haskell](https://github.com/zed-extensions/haskell) repository. Release Notes: - N/A
Marshall Bowers created
f57dece
git: Fix errors not showing in the toast notification (#26303)
Release Notes: - Resolved an issue where error messages from Git were not being displayed in toast notifications. <img width="1702" alt="Screenshot 2025-03-08 at 1 11 30 AM" src="https://github.com/user-attachments/assets/a46517db-4e64-4c5e-a64e-96e820ca9aec" />
Kiran_Peraka created
103ad63
Refactor Completions to allow non-LSP ones better (#26300)
A preparation for https://github.com/zed-industries/zed/issues/4957 that pushes all LSP-related data out from the basic completion item, so that it's possible to create completion items without any trace of LSP clearly. Release Notes: - N/A
Kirill Bulatov created
ec5e7a2
Change the default staging and unstaging state display (#26299)
This adds a setting for the "border" hunk display mode, as discussed, and makes it the default. Here's how it looks in light mode: <img width="1512" alt="Screenshot 2025-03-07 at 11 39 25 AM" src="https://github.com/user-attachments/assets/a934faa3-ec69-47e1-ad46-535e48b98e9f" /> And dark mode: <img width="1511" alt="Screenshot 2025-03-07 at 11 39 56 AM" src="https://github.com/user-attachments/assets/43c9afd1-22bb-4bd8-96ce-82702a6cbc80" /> Release Notes: - Git Beta: Adjusted the default hunk styling for staged and unstaged changes Co-authored-by: Conrad <conrad@zed.dev> Co-authored-by: Nate <nate@zed.dev>
Mikayla Maki , Conrad , and Nate created
05d3ee8
extension: Require that grammar names are written in snake_case (#26295)
This PR updates the `ExtensionBuilder` to require that grammar names are written in snake_case. The grammar names are used to construct identifiers, so we need them to be valid C identifiers. Release Notes: - N/A
Marshall Bowers created
1b34437
component_preview: Add component pages (#26284)
This PR adds pages to component preview when clicking on a given component in the sidebar. This will let us create richer previews & better docs for using components in the future. Release Notes: - N/A
Nate Butler created
3ff2c8f
Add file icon for Luau (#26293)
Closes https://github.com/zed-industries/zed/issues/14948 Release Notes: - N/A
Danilo Leal created
b0b0b00
worktree: Add some info-level logging about added and removed repository entries (#26291)
Trying to track down a user's reported issue with parent repositories not getting picked up. Release Notes: - N/A
Cole Miller created
80fb885
Remove worktree and project notifies (#26244)
This reduces the number of multibuffer syncs from 100,000 to 20,000. Before this change each editor individually observed the project, so literally any project change was amplified by the number of editors you had open. Now editors listen to their buffers instead of the project, and other users of `cx.observe` on the project have been updated to use specific events to reduce churn. Follow up to #26237 Release Notes: - Improved performance of Zed in large repos with lots of file system events. --------- Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
Conrad Irwin and Max Brunsfeld created
aef84d4
Update Linux Graphics troubleshooting (#26263)
Try to re-order the tips for clarity, and make it clear that /etc/prime could be wrong either way around. Also remove section on FIPS now we nolonger bundle openssl Updates #15629 Release Notes: - N/A
Conrad Irwin created
e06d010
Test folded buffers navigation (#26286)
#25944 but now with Vim mode off. Release Notes: - N/A
João Marcos created
14148f5
scripting_tool: Move description into a separate file (#26283)
This PR moves the `scripting_tool` description into a separate file so it's a bit easier to work with. Release Notes: - N/A
Marshall Bowers created
efde5aa
Extract a `Session` struct to hold state about a given thread's scripting session (#26282)
We're still recreating a session for every tool call, but the idea is to have a long-lived `Session` per assistant thread. Release Notes: - N/A --------- Co-authored-by: Agus Zubiaga <hi@aguz.me>
Antonio Scandurra and Agus Zubiaga created
fcc5e27
Fix hotkey for toggle filters in project search (#25917)
Closes #24741 Adjusted the shortcut key handling to properly toggle filters in the project search feature. Release Notes: - linux: Fixed `ctrl-alt-f` not correctly toggling search filters in project search. --------- Co-authored-by: Peter Tripp <peter@zed.dev>
Guilherme Gonçalves and Peter Tripp created
ed417da
git_ui: Try to prompt the model out of including the diff output (#26281)
This PR updates the prompt for generating commit messages to tell the model not to include the raw diff output in the message. Release Notes: - N/A
Marshall Bowers created
d1c6789
chore: Do not bust Rust build cache when opening projects with dev build (#26278)
## Problem Running `cargo run .` twice in Zed repository required a rebuild two times in a row. The second rebuild was triggered around libz-sys, which in practice caused a rebuild of the ~entire project. Some concrete examples: ``` cargo test -p project # Requires a rebuild (warranted) cargo run . cargo test -p project # Requires a rebuild (unwarranted) ``` or ``` cargo run . # Requires a rebuild (warranted) cargo run . # Requires a rebuild (unwarranted) ``` ## What's going on Zed build script on MacOS sets MACOSX_DEPLOYMENT_TARGET to 10.15. This is fine. However, **cargo propagates all environment variables to child processes during `cargo run`**. This then affects Rust Analyzer spawned by dev Zed - it clobbers build cache of whatever package it touches, because it's behavior is not same between running it with `cargo run` (where MACOS_DEPLOYMENT_TARGET gets propagated to child Zed) and running it directly via `target/debug/zed` or whatever (where the env variable is not set, so that build behaves roughly like Zed Dev.app). ## Solution ~We'll unset that env variable from user environment when we're reasonably confident that we're running under `cargo run` by exploiting other env variables set by cargo: https://doc.rust-lang.org/cargo/reference/environment-variables.html CARGO_PKG_NAME is always set to `zed` when running it via `cargo run`, as it's the value propagated from the build.~ ~The alternative I've considered is running [via a custom runner](https://doc.rust-lang.org/cargo/reference/config.html#targetcfgrunner), though the problem here is that we'd have to use a shell script to unset the env variable - that could be problematic with e.g. fish. I just didn't want to deal with that, though admittedly it would've been cleaner in other aspects.~ Redact all above. We'll just set MACOSX_DEPLOYMENT_TARGET regardless of whether you have it in your OG shell environment or not. Release Notes: - N/A
Piotr Osiewicz created
a887f3b
Remove plain text file type association from default settings (#25420)
Closes #20291 This PR removes the plain text file association from the default settings, as #21298 added a `LanguageMatcher` for Plain Text files, which now associates "Plain Text" with `txt`-files (see https://github.com/zed-industries/zed/blob/10053e2566c6c3312e2312088e40b757daeab189/crates/language/src/language.rs#L127-L137). Thus, the association via the default settings is not required anymore, which fixes #20291 as described in https://github.com/zed-industries/zed/issues/20291#issuecomment-2500731743 Release Notes: - Fixed default file type associations overriding associations provided by extensions for `txt`-files. Co-authored-by: Peter Tripp <peter@zed.dev>
Finn Evers and Peter Tripp created
f8deebc
Fix inline diagnostics in the project diff (#26275)
https://github.com/zed-industries/zed/blob/205f9a9f0391da47a87cac45a41f67d2a23f5a95/crates/editor/src/element.rs#L1643 Due to the snippet above, Zed is supposed to have `row` larger or equal to `start_row` here: https://github.com/zed-industries/zed/blob/205f9a9f0391da47a87cac45a41f67d2a23f5a95/crates/editor/src/element.rs#L1694 yet the panic were reported when clicking in the project diff. That project diff has a lot of highlighting happening already, so the PR disables inline diagnostics within a git diff view. Release Notes: - N/A
Kirill Bulatov created
205f9a9
Add lua script access to code using `cx` + reuse project search logic (#26269)
Access to `cx` will be needed for anything that queries entities. In this commit this is use of `WorktreeStore::find_search_candidates`. In the future it will be things like access to LSP / tree-sitter outlines / etc. Changes to support access to `cx` from functions provided to the Lua script: * Adds a channel of requests that require a `cx`. Work enqueued to this channel is run on the foreground thread. * Adds `async` and `send` features to `mlua` crate so that async rust functions can be used from Lua. * Changes uses of `Rc<RefCell<...>>` to `Arc<Mutex<...>>` so that the futures are `Send`. One benefit of reusing project search logic for search candidates is that it properly ignores paths. Release Notes: - N/A
Michael Sloan created
b0d1024
Silence a couple of noisy logs (#26262)
Closes #ISSUE Release Notes: - N/A
Cole Miller created
622ed8a
git: Fix git panel not using default width (#26220)
Closes #26062 Removing the width here causes zed to use the default value (inside default settings) after restart like other panels. Release Notes: - Fixed issue where git panel wasn't using default width after restart Co-authored-by: Mikayla Maki <mikayla@zed.dev>
loczek and Mikayla Maki created
09c51f9
assistant2: Fix font fallbacks (#26258)
Release Notes: - N/A
0x2CA created