79683eb
php: Add nowdoc language injection (#23532)
Click to expand commit body
We already have heredoc injection support, so this just extends it to also cover
[nowdoc](https://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.nowdoc).
Ollie Beckwith
created
0cb4175
llm: Sample ~10% of staff members inputs/outputs to LLM (#23537)
Click to expand commit body
Release Notes:
- N/A
Thorsten Ball
created
95c045a
Fix LSP violation when dismissing server notifications (#23531)
Click to expand commit body
Part of https://github.com/zed-industries/zed/issues/22606
Closes https://github.com/zed-industries/zed/issues/23509
When a user sees an odd notification from the language server like
<img width="508" alt="image"
src="https://github.com/user-attachments/assets/6f5ef1aa-0f09-4705-a02a-aaf81dd8620c"
/>
they usually dismiss that.
Zed uses channels to wait and handle user interactions with such
notifications, and, due to `?`, sends back
```json
{"jsonrpc":"2.0","id":1,"error":{"message":"receiving from an empty and closed channel"}}
```
which is not spec-compliant:
https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#window_showMessageRequest
> Response:
>
> * result: the selected
[MessageActionItem](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#messageActionItem)
| null if none got selected.
> * error: code and message set in case an exception happens during
showing a message.
Unfortunately, vtsls (and, potentially, others) crash if receive such
non-compliant requests, and do not get back.
After the fix, the message is correct:
```json
{"jsonrpc":"2.0","id":1,"result":null}
```
Release Notes:
- Fixed vtsls crashing on notification dismiss
Co-authored-by: Piotr Osiewicz <piotr@zed.dev>
Kirill Bulatov
and
Piotr Osiewicz
created
f9e354e
theme: Add version control colors (#23529)
Click to expand commit body
This PR adds version control-specific theme tokens to the them to allow
styling entries in the git ui and elsewhere.
Release Notes:
- N/A
Nate Butler
created
828b5ab
project: Reorder LSP Adapters within LanguageRegistry (#23528)
Click to expand commit body
Closes #ISSUE
Release Notes:
- N/A
Piotr Osiewicz
created
11bb906
terminal: Check for script existence properly before activating it (#23476)
Click to expand commit body
We were not covering a variant where the returned metadata was Ok(None)
Closes #ISSUE
Release Notes:
- Fixed venv activation script path showing up in terminal for
non-existant scripts.
Piotr Osiewicz
created
91b0ca0
Omit `tsdk_path` from the servers' options if it does not exist (#23525)
Click to expand commit body
Part of https://github.com/zed-industries/zed/issues/22606
Before, `tsdk_path` for vtsls and typescript-language-server
unconditionally set a `tsdk`/`tsserver` property for the corresponding
language server, even if there were no such directory at all.
Instead, make the corresponding code to omit such property if it was not
found on the FS.
Release Notes:
- Fixed "The path /.../tsserver.js doesn't point to a valid tsserver
install. Falling back to bundled TypeScript version." pop-up appearing
Kirill Bulatov
created
d1be419
Fix panics on opening repositories with empty remotes (#23520)
Click to expand commit body
Uses a newer `git2` version with
https://github.com/rust-lang/git2-rs/pull/1120 fix
Closes https://github.com/zed-industries/zed/issues/23453
Release Notes:
- Fixed panics on opening repositories with empty remotes
Kirill Bulatov
created
70f8224
Update cloudflare/wrangler-action digest to 7a5f8bb (#23487)
Click to expand commit body
This PR contains the following updates:
| Package | Type | Update | Change |
|---|---|---|---|
|
[cloudflare/wrangler-action](https://redirect.github.com/cloudflare/wrangler-action)
| action | digest | `6d58852` -> `7a5f8bb` |
---
### 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:eyJjcmVhdGVkSW5WZXIiOiIzOS4xMDcuMCIsInVwZGF0ZWRJblZlciI6IjM5LjEwNy4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate[bot]
and
renovate[bot]
created
29b57de
Update actions/stale digest to 5bef64f (#23486)
Click to expand commit body
This PR contains the following updates:
| Package | Type | Update | Change |
|---|---|---|---|
| [actions/stale](https://redirect.github.com/actions/stale) | action |
digest | `28ca103` -> `5bef64f` |
---
### 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:eyJjcmVhdGVkSW5WZXIiOiIzOS4xMDcuMCIsInVwZGF0ZWRJblZlciI6IjM5LjEwNy4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
This PR contains the following updates:
| Package | Type | Update | Change |
|---|---|---|---|
| [metal](https://redirect.github.com/gfx-rs/metal-rs) |
workspace.dependencies | minor | `0.30` -> `0.31` |
---
### 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:eyJjcmVhdGVkSW5WZXIiOiIzOS4xMDcuMCIsInVwZGF0ZWRJblZlciI6IjM5LjEwNy4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate[bot]
and
renovate[bot]
created
9d7199e
Update Rust crate convert_case to 0.7.0 (#23504)
Click to expand commit body
This PR contains the following updates:
| Package | Type | Update | Change |
|---|---|---|---|
| [convert_case](https://redirect.github.com/rutrum/convert-case) |
workspace.dependencies | minor | `0.6.0` -> `0.7.0` |
---
### 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:eyJjcmVhdGVkSW5WZXIiOiIzOS4xMDcuMCIsInVwZGF0ZWRJblZlciI6IjM5LjEwNy4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate[bot]
and
renovate[bot]
created
82cee9e
assistant2: Don't suggest thread context for inline assist without a `ThreadStore` (#23506)
Click to expand commit body
This PR makes it so we don't suggest threads as context in the inline
assist when we don't have a `ThreadStore` to pull from.
Release Notes:
- N/A
Marshall Bowers
created
ecf70db
Update Rust crate serde_json to v1.0.137 (#23498)
Click to expand commit body
This PR contains the following updates:
| Package | Type | Update | Change |
|---|---|---|---|
| [serde_json](https://redirect.github.com/serde-rs/json) | dependencies
| patch | `1.0.135` -> `1.0.137` |
| [serde_json](https://redirect.github.com/serde-rs/json) |
workspace.dependencies | patch | `1.0.135` -> `1.0.137` |
---
### Release Notes
<details>
<summary>serde-rs/json (serde_json)</summary>
###
[`v1.0.137`](https://redirect.github.com/serde-rs/json/releases/tag/v1.0.137)
[Compare
Source](https://redirect.github.com/serde-rs/json/compare/v1.0.136...v1.0.137)
- Turn on "float_roundtrip" and "unbounded_depth" features for
serde_json in play.rust-lang.org
([#​1231](https://redirect.github.com/serde-rs/json/issues/1231))
###
[`v1.0.136`](https://redirect.github.com/serde-rs/json/releases/tag/v1.0.136)
[Compare
Source](https://redirect.github.com/serde-rs/json/compare/v1.0.135...v1.0.136)
- Optimize serde_json::value::Serializer::serialize_map by using
Map::with_capacity
([#​1230](https://redirect.github.com/serde-rs/json/issues/1230),
thanks [@​goffrie](https://redirect.github.com/goffrie))
</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 these
updates again.
---
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box
---
Release Notes:
- N/A
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xMDcuMCIsInVwZGF0ZWRJblZlciI6IjM5LjEwNy4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate[bot]
and
renovate[bot]
created
848f298
Update Rust crate semver to v1.0.25 (#23497)
Click to expand commit body
This PR contains the following updates:
| Package | Type | Update | Change |
|---|---|---|---|
| [semver](https://redirect.github.com/dtolnay/semver) |
workspace.dependencies | patch | `1.0.24` -> `1.0.25` |
---
### Release Notes
<details>
<summary>dtolnay/semver (semver)</summary>
###
[`v1.0.25`](https://redirect.github.com/dtolnay/semver/releases/tag/1.0.25)
[Compare
Source](https://redirect.github.com/dtolnay/semver/compare/1.0.24...1.0.25)
- Enable serde impls on play.rust-lang.org
([#​330](https://redirect.github.com/dtolnay/semver/issues/330),
thanks [@​jofas](https://redirect.github.com/jofas))
</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:eyJjcmVhdGVkSW5WZXIiOiIzOS4xMDcuMCIsInVwZGF0ZWRJblZlciI6IjM5LjEwNy4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate[bot]
and
renovate[bot]
created
78a8c1a
git: No-op when trying to commit with nothing staged or no commit message (#23491)
Click to expand commit body
The buttons are disabled in this case, but users can still trigger a
commit via the actions directly, and an error toast seems a bit loud for
this.
cc @iamnbutler
Release Notes:
- N/A
Cole Miller
created
db65ee0
Update Rust crate etagere to v0.2.15 (#23493)
Click to expand commit body
This PR contains the following updates:
| Package | Type | Update | Change |
|---|---|---|---|
| [etagere](https://redirect.github.com/nical/etagere) | dependencies |
patch | `0.2.13` -> `0.2.15` |
---
### 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:eyJjcmVhdGVkSW5WZXIiOiIzOS4xMDcuMCIsInVwZGF0ZWRJblZlciI6IjM5LjEwNy4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate[bot]
and
renovate[bot]
created
8ed2a81
feature_flags: Enable `assistant2` for all staff (#23502)
Click to expand commit body
This PR makes it so the `assistant2` feature flag is automatically
enabled for all staff.
Previously all the staff members had been opted in to the feature flag
manually (to allow for opting out), but I think we're ready to
unconditionally ship it to all staff.
Release Notes:
- N/A
Marshall Bowers
created
01b57b1
assistant2: Only show thread context in picker when we have a `ThreadStore` (#23501)
Click to expand commit body
This PR fixes an issue with the context picker where it would show
thread context as an option even if there was no `ThreadStore`
available.
Release Notes:
- N/A
Marshall Bowers
created
a1077c6
assistant2: Add button to open the prompt library (#23500)
Click to expand commit body
This PR adds a button to open the prompt library from the configuration
view in Assistant2.
<img width="1309" alt="Screenshot 2025-01-22 at 5 38 08 PM"
src="https://github.com/user-attachments/assets/d514abca-53bc-4cde-bead-ab68a1994fb5"
/>
Release Notes:
- N/A
Marshall Bowers
created
51fcb71
Dedupe `PromptBuilder` construction (#23496)
Click to expand commit body
This PR dedupes the construction of the `PromptBuilder`.
Previously this was constructed by both `assistant` and `assistant2`,
but now we construct it outside and pass it in.
Release Notes:
- N/A
Marshall Bowers
created
aad04e0
Update Rust crate indexmap to v2.7.1 (#23494)
Click to expand commit body
This PR contains the following updates:
| Package | Type | Update | Change |
|---|---|---|---|
| [indexmap](https://redirect.github.com/indexmap-rs/indexmap) |
workspace.dependencies | patch | `2.7.0` -> `2.7.1` |
---
### Release Notes
<details>
<summary>indexmap-rs/indexmap (indexmap)</summary>
###
[`v2.7.1`](https://redirect.github.com/indexmap-rs/indexmap/blob/HEAD/RELEASES.md#271-2025-01-19)
[Compare
Source](https://redirect.github.com/indexmap-rs/indexmap/compare/2.7.0...2.7.1)
- Added `#[track_caller]` to functions that may panic.
- Improved memory reservation for `insert_entry`.
</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:eyJjcmVhdGVkSW5WZXIiOiIzOS4xMDcuMCIsInVwZGF0ZWRJblZlciI6IjM5LjEwNy4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate[bot]
and
renovate[bot]
created
3c0d05e
lsp: Use replace edits for completions (#23490)
Click to expand commit body
(Late) follow up to #9634.
Fixes #23395
Release Notes:
- Accepting completions while the cursor is in the middle of suggested
completion will now result in smaller edits being applied.
Piotr Osiewicz
created
55d99e0
git: Handle git status output for deleted-in-index state (#23483)
Click to expand commit body
When a file exists in HEAD, is deleted in the index, and exists again in
the working copy, git produces two lines for it, one reading `D `
(deleted in index, unmodified in working copy), and the other reading
`??` (untracked). Merge these two into the equivalent of `DA`.
Release Notes:
- Improved handling of files that are deleted in the git index but exist
in HEAD and the working copy
Cole Miller
created
08b3c03
project: Allow running multiple instances of a single language server within a single worktree (#23473)
Click to expand commit body
This PR introduces a new entity called Project Tree which is responsible
for finding subprojects within a worktree;
a subproject is a language-specific subset of a worktree which should be
accurately tracked on the language server side. We'll have an ability to
set multiple disjoint workspaceFolders on language server side OR spawn
multiple instances of a single language server (which will be the case
with e.g. Python language servers, as they need to interact with
multiple disjoint virtual environments).
Project Tree assumes that projects of the same LspAdapter kind cannot
overlap. Additionally project nesting is not allowed within the scope of
a single LspAdapter.
Closes https://github.com/zed-industries/zed/issues/5108
Re-lands #22182 which I had to revert due to merging it into todays
Preview.
Release Notes:
- Language servers now track their working directory more accurately.
---------
Co-authored-by: João <joao@zed.dev>
Piotr Osiewicz
and
João
created
2c2a3ef
assistant2: Handle LLM providers that do not emit `StartMessage` events (#23485)
Click to expand commit body
This PR updates Assistant2's response streaming to work with LLM
providers that do not emit `StartMessage` events.
Now if we get a `Text` event without having received a `StartMessage`
event we will still insert an Assistant message so we can stream in the
response from the model.
Release Notes:
- N/A
Marshall Bowers
created
6aab82c
docs: Mention PopOS 24.04 in Linux FAQ for /etc/prime-discrete (#23482)
Peter Tripp
created
a811979
git: Fix the panel's update debouncing (#23462)
Click to expand commit body
This PR replaces the update debouncing code in the git panel with a more
correct and conventional structure (holding a `Task` field instead of
spawning a task that runs a loop). I wrote the code that this replaces
without realizing that it doesn't implement debouncing properly.
Release Notes:
- N/A
This PR wires up the ability to configure Assistant2.
<img width="1309" alt="Screenshot 2025-01-22 at 1 52 56 PM"
src="https://github.com/user-attachments/assets/3de47797-7959-47af-bd93-51f105e87c28"
/>
Release Notes:
- N/A
Marshall Bowers
created
f770397
assistant: Extract `ConfigurationView` to its own module (#23480)
Click to expand commit body
This PR is a small refactoring that extracts the Assistant's
`ConfigurationView` into its own module.
Release Notes:
- N/A
Marshall Bowers
created
09fe1e7
Scroll completions menu to new selection on filter, fix corner case (#23478)
Click to expand commit body
In the future if `filter` was used more this would fix other issues. In
the current code paths, this just fixes the particular corner case of
edit prediction arriving async while `y_flipped = true` (in this case it
needs to be scrolled down to show item with index 0).
Release Notes:
- N/A
Michael Sloan
created
9f87145
title_bar: Simplify `git-ui` feature flag check (#23475)
Click to expand commit body
This PR is a follow-up to
https://github.com/zed-industries/zed/pull/23470 that simplifies the way
we check the `git-ui` feature flag in the title bar.
Release Notes:
- N/A
da406ae
Revert "project: Allow running multiple instances of a single language server within a single worktree" (#23472)
Click to expand commit body
Reverts zed-industries/zed#22182
I've merged the build too soon as I wanted it to be excluded from todays
Preview.
Piotr Osiewicz
created
706e46c
vim: Fix % not working for multi-char bracket pairs (#23471)
Click to expand commit body
Closes #23358
Demo/proof:
https://github.com/user-attachments/assets/2036d183-8830-415b-9155-0d3efe3d824c
Release Notes:
- Fixed `%` in Vim mode not working correctly for multi-char brackets,
such as `do/end` in Elixir or `\begin` and `\end` in LaTeX.
Co-authored-by: Conrad <conrad@zed.dev>
Thorsten Ball
and
Conrad
created
5be2784
git_ui: Feature flag repo selector (#23470)
Click to expand commit body
Fixes an issue where the repo selector showed for all users, not just
those in the git_ui feature flag.
This was meant to be included in the `git_ui` feature flag.
Release Notes:
- N/A
Nate Butler
created
bed917b
project: Allow running multiple instances of a single language server within a single worktree (#22182)
Click to expand commit body
This PR introduces a new entity called Project Tree which is responsible
for finding subprojects within a worktree;
a subproject is a language-specific subset of a worktree which should be
accurately tracked on the language server side. We'll have an ability to
set multiple disjoint `workspaceFolder`s on language server side OR
spawn multiple instances of a single language server (which will be the
case with e.g. Python language servers, as they need to interact with
multiple disjoint virtual environments).
Project Tree assumes that projects of the same LspAdapter kind cannot
overlap. Additionally **project nesting** is not allowed within the
scope of a single LspAdapter.
Closes #5108
Release Notes:
- Language servers now track their working directory more accurately.
---------
Co-authored-by: João <joao@zed.dev>
Piotr Osiewicz
and
João
created
d85fec5
Update "Book Onboarding" destination link (#23464)
Click to expand commit body
This PR updates the Book Onboarding links to point to a new form.
Release Notes:
- N/A
#23460 brought up we are showing the new "tab Accept" marker for single
line suggestions for non-zeta providers. We think this might be valid
for any provider, but we only want to enable it for zeta initially so it
doesn't affect an existing user base.
Release Notes:
- N/A
Agus Zubiaga
created
1e88e29
assistant2: Respect panel dock position (#23465)
Click to expand commit body
This PR fixes an issue where Assistant2 was not respecting the panel
dock position.
Release Notes:
- N/A
Marshall Bowers
created
636df12
Only show accept callout if suggestion is all insertions/deletions (#23461)
Click to expand commit body
Release Notes:
- N/A
Agus Zubiaga
created
55721c6
Fix single line edit prediction detection (#23456)
Click to expand commit body
#23411 introduced an "Accept" callout for single line edits, but the
logic to detect them was incorrect causing it to trigger for multiline
insertions, this PR fixes that.
Release Notes:
- N/A