Commit log

ca4e804 Add branch to git panel (#24485)

Click to expand commit body
This PR adds the branch selector to the git panel and fixes a few bugs
in the repository selector.

Release Notes:

- N/A

---------

Co-authored-by: ConradIrwin <conrad.irwin@gmail.com>
Co-authored-by: Conrad <conrad@zed.dev>

Mikayla Maki , ConradIrwin , and Conrad created

d9183c7 vim: Escape to normal mode when visual surround operation pending (#24484)

Click to expand commit body
Closes #24382

Release Notes:
Added a default keymap that returns the user to `normal` mode after
pressing escape during a pending `visual-surround` operation.

- N/A

---------

Co-authored-by: roy.crippen4 <roy.crippen4@archarithms.com>
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>

roycrippen4 , roy.crippen4 , and Conrad Irwin created

7bddb39 vim: Preserve trailing whitespace in inner text object selections (#24481)

Click to expand commit body
Closes #24438

Changes: Adjusted loop to only trim whitespace between last newline and
closing marker, when using inner objects like `y/d/c i b`

| Start   | Fixed `vib`   | Previous `vib`   |
| ---------- | ---------- | ---------- |
|
![image](https://github.com/user-attachments/assets/3d64dd7d-ed3d-4a85-9f98-f2f83799a738)
|
![image](https://github.com/user-attachments/assets/841beb59-31b1-475e-93f0-f4deaf18939c)
|
![image](https://github.com/user-attachments/assets/736d4c6f-20e1-4563-9471-1e8195455df4)
|



Release Notes:

- vim: Preserve trailing whitespace in inner text object selections

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>

5brian and Conrad Irwin created

146b9c2 Sort and dedupe .gitignore files (#24491)

Click to expand commit body
Release Notes:

- N/A

Michael Sloan created

be26acc Cargo.lock update (#24486)

Click to expand commit body
Release Notes:

- N/A

Michael Sloan created

4be89ea title_bar: Add menu item to deploy icon theme selector (#24482)

Click to expand commit body
Added the icons option in the title bar between Themes and Extension.

| Before | After |
|
---------------------------------------------------------------------------------------------------------------------------------------------------
|
---------------------------------------------------------------------------------------------------------------------------------------------------
|
| <img width="215" alt="Screenshot 2025-02-07 at 5 18 10 PM"
src="https://github.com/user-attachments/assets/ff8bf5ce-c176-4d8c-8b0e-bb1cc65ec1d8"
/> | <img width="206" alt="Screenshot 2025-02-07 at 5 18 01 PM"
src="https://github.com/user-attachments/assets/c47a302e-98af-4530-a908-097b8306f2f0"
/> |

Release Notes:

- Added an option to open the icon theme selector from the user menu.

---------

Co-authored-by: Marshall Bowers <git@maxdeviant.com>

Beniamin Zagan and Marshall Bowers created

e17e838 Include prediction ID on edit prediction accepted/discarded events (#24480)

Click to expand commit body
This PR updates the edit predictions to include the prediction ID
returned from the server on the resulting telemetry events indicating
whether the prediction was accepted or discarded.

The `prediction_id` on the events can then be correlated with the
`request_id` on the server-side prediction events.

Release Notes:

- N/A

Marshall Bowers created

ed56568 inline_completion: Add missing punctuation (#24477)

Click to expand commit body
This PR adds some missing punctuation.

Release Notes:

- N/A

Marshall Bowers created

c4bcff1 edit predictions: Add binding to the prediction toggle (#24468)

Click to expand commit body
This PR primary goal is to add a keybinding to the (ephemeral)
prediction toggle. In doing that, we also standardized the keybinding to
open the status bar menu with it.

Release Notes:

- N/A

---------

Co-authored-by: Bennet Bo Fenner <53836821+bennetbo@users.noreply.github.com>

Danilo Leal and Bennet Bo Fenner created

07f1b61 edit predictions: Fix translucent "jump to edit" background color (#24473)

Click to expand commit body
This PR uses a pretty cool GPUI method called `blend` to make this
callout's background color not translucent.

| Before | Header |
|--------|--------|
| <img width="732" alt="Screenshot 2025-02-07 at 4 58 16 PM"
src="https://github.com/user-attachments/assets/2a5df61b-dfa0-4edc-bffa-a605a2aa491a"
/> | <img width="732" alt="Screenshot 2025-02-07 at 4 56 48 PM"
src="https://github.com/user-attachments/assets/5dee9fca-6239-4ae0-80f5-dcc6abf0e779"
/> |

Release Notes:

- N/A

Danilo Leal created

9e5bc81 zeta: Promote line comment to doc comment (#24476)

Click to expand commit body
This PR promotes a line comment for the `tos_accepted` field to a doc
comment.

Release Notes:

- N/A

Marshall Bowers created

7148092 Fix adding new git repos to a project (#24471)

Click to expand commit body
Release Notes:

- N/A

Conrad Irwin created

ead5a83 gpui: Add data table example (#24373)

Click to expand commit body
Release Notes:

- N/A

As https://github.com/zed-industries/zed/discussions/24260 I mentioned
issue.

Make a complex data table example to test the text rendering
performance.

This example also can be an example to show how to build a large data
table.

```bash
cargo run -p gpui --example data_table
```

<img width="2004" alt="image"
src="https://github.com/user-attachments/assets/653771e5-ef08-4d76-97b9-90ea4b78be59"
/>

----

I will try to do some test. 

For example: With a threshold for the hold number of caches in
`FrameCache`, and only when the threshold is greater than a certain
number, some caches are released, or when a certain time has passed. I
am not sure if this is feasible.

This example is added to help us to test.

Jason Lee created

3be8066 Newlines in commit editor (#24465)

Click to expand commit body
Release Notes:

- N/A

Conrad Irwin created

f6e3968 Re-introduce syntax-based context and use new model (#24469)

Click to expand commit body
Release Notes:

- N/A

---------

Co-authored-by: Marshall <marshall@zed.dev>

Antonio Scandurra and Marshall created

a47d5d3 v0.173.4

Marshall Bowers created

4b24411 Merge branch 'main' into v0.173.x

Marshall Bowers created

2197ccf Revert "edit prediction: Do not render jump cursor until line layout is ready (#24226)"

Click to expand commit body
This reverts commit 722fd59d9cbba1c4c109f571a44c551a43845fb1.

Marshall Bowers created

8fd2067 Revert "edit prediction: Fix jump cursor position when scrolled (#24230)"

Click to expand commit body
This reverts commit bc67f990ae374a96e81ab5e1afa8540a9bf1c13a.

Marshall Bowers created

598abb5 Revert "zed 0.173.1"

Click to expand commit body
This reverts commit 57d09d2fd3ec37745476251029372ef5f9762644.

Marshall Bowers created

be8a2b2 Revert "edit prediction: Allow enabling OSS data collection with no project open (#24265)"

Click to expand commit body
This reverts commit 1748fbeec86cd22fb9bbc87a7193680c59ba3cfc.

Marshall Bowers created

c2c9187 Revert "edit predictions: Onboarding funnel telemetry (#24237)"

Click to expand commit body
This reverts commit 45f9192137d6487e1f5e94aa86f0787ba7de7f96.

Marshall Bowers created

59b382a Revert "Accept edit predictions with `alt-tab` in addition to `tab` (#24272)"

Click to expand commit body
This reverts commit eafad7d9db9dead3561e19070ff71a93f26f602a.

Marshall Bowers created

c532d95 Revert "Fix panic when deleting an empty line after a deleted hunk (cherry-pick #24255) (#24282)"

Click to expand commit body
This reverts commit 79714fca98124d85b4f759196c4f5e8c75bcd4ca.

Marshall Bowers created

55720ff Revert "Implement character index for point (cherry-pick #23989) (#24284)"

Click to expand commit body
This reverts commit 8ed71b2dd0f1b595b235f56f0e720bbffc02e20d.

Marshall Bowers created

e893c32 Revert "edit prediction: Improve UX around `disabled_globs` and `show_inline_completions` (#24207)"

Click to expand commit body
This reverts commit 68b4f9ee1d8b8800b5adb885844d6111e387bc3b.

Marshall Bowers created

904c395 Revert "Revert recent anti-aliasing improvements (cherry-pick #24289) (#24291)"

Click to expand commit body
This reverts commit af0f36de7b5eeb2f7a068c9343efb3cb5fa9931a.

Marshall Bowers created

c00a1fb Revert "edit prediction: Fix license detection error logging + check for different spellings (#24281)"

Click to expand commit body
This reverts commit 9f825ca3cfd15a84f4aaae3a4153f650d1a991fa.

Marshall Bowers created

a9c33f3 Revert "Fix the worktree's repository_for_path (cherry-pick #24279) (#24292)"

Click to expand commit body
This reverts commit 0542019e2572a15b23fe5ad40586525ee04b423f.

Marshall Bowers created

91e99b3 Revert "zed 0.173.2"

Click to expand commit body
This reverts commit d54f6f97a760e2cf8a4880daa1145c3b5941c21e.

Marshall Bowers created

e280f96 Revert "gpui: Render SVGs at 2x size when rendered in an `img` (cherry-pick #24332) (#24336)"

Click to expand commit body
This reverts commit 58834b4e3a3543206edf9c55713521a6eb49e3e2.

Marshall Bowers created

997c121 Revert "Bump to 0.173.3 for @maxdeviant"

Click to expand commit body
This reverts commit 95062b363e71c1a10ef82560dc5e9b4891e7a432.

Marshall Bowers created

17a4705 Revert "assistant_context_editor: Fix patch block not rendering due to window reborrow (cherry-pick #24461) (#24463)"

Click to expand commit body
This reverts commit e7f64c7d98a289e0e6b11b86397ba90838738651.

Marshall Bowers created

ab392fc Revert "Bump to 0.173.4 for @maxdeviant"

Click to expand commit body
This reverts commit af67af86da1e417eb17ee8184a49c712c6c30f98.

Marshall Bowers created

fd7fa87 edit predictions: Restore red dot in status buttons when pending ToS (#24408)

Click to expand commit body
In one of the recent changes to the edit predictions status bar menu, we
lost the red dot that is displayed when the user has Zed as the provider
but hasn't accepted terms of service. Note: All the checks were still in
place, just the visual indicator was missing.

![CleanShot 2025-02-06 at 20 22
21@2x](https://github.com/user-attachments/assets/da8f25dd-5ed2-4bf9-8453-10b80f00bf63)


Release Notes:

- N/A

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>

Agus Zubiaga and Danilo Leal created

a7a14e5 edit predictions: Clarify `disabled_globs` documentation (#24460)

Click to expand commit body
This PR clarifies how the `disabled_globs` work.

Release Notes:

- N/A

---------

Co-authored-by: Bennet Bo Fenner <53836821+bennetbo@users.noreply.github.com>

Danilo Leal and Bennet Bo Fenner created

af67af8 Bump to 0.173.4 for @maxdeviant

Zed Bot created

e7f64c7 assistant_context_editor: Fix patch block not rendering due to window reborrow (cherry-pick #24461) (#24463)

Click to expand commit body
Cherry-picked assistant_context_editor: Fix patch block not rendering
due to window reborrow (#24461)

This PR fixes an issue where the Assistant patch block was not being
rendered when using "Suggest Edits".

The issue was that the `BlockContext` already has a borrow of the
`Window`, so we can't use `update_in` to reborrow the window.

The fix is to reuse the existing `&mut Window` reference from the
`BlockContext` so we don't need to `update_in`.

Closes #24169.

Release Notes:

- Assistant: Fixed an issue where the patch block was not being rendered
when using "Suggest Edits".

---------

Co-authored-by: Max <max@zed.dev>

Co-authored-by: Marshall Bowers <git@maxdeviant.com>
Co-authored-by: Max <max@zed.dev>

gcp-cherry-pick-bot[bot] , Marshall Bowers , and Max created

8ff8dbd assistant_context_editor: Fix patch block not rendering due to window reborrow (#24461)

Click to expand commit body
This PR fixes an issue where the Assistant patch block was not being
rendered when using "Suggest Edits".

The issue was that the `BlockContext` already has a borrow of the
`Window`, so we can't use `update_in` to reborrow the window.

The fix is to reuse the existing `&mut Window` reference from the
`BlockContext` so we don't need to `update_in`.

Closes #24169.

Release Notes:

- Assistant: Fixed an issue where the patch block was not being rendered
when using "Suggest Edits".

---------

Co-authored-by: Max <max@zed.dev>

Marshall Bowers and Max created

44c6a54 pane: Improve close active item to better handle pinned tabs (#23488)

Click to expand commit body
Closes #22247

- [x] Do not close pinned tab on keyboard shortcuts like `ctrl+w` or
`alt+f4`
- [x] Close pinned tab on context menu action, menu bar action, or vim
bang
- [x] While closing pinned tab via shortcut (where it won't close),
instead activate any other non-pinned tab in same pane
- [x] Else, if any other pane contains non-pinned tab, activate that
- [x] Tests

Co-authored-by: uncenter <47499684+uncenter@users.noreply.github.com>

Release Notes:

- Pinned tab now stay open when using close shortcuts, auto focuses to
any other non-pinned tab instead.

smit created

f0565b4 edit prediction: Do not show icon as disabled when there is no buffer open (#24458)

Click to expand commit body
Release Notes:

- N/A

Bennet Bo Fenner created

a6e15dd Make it a bit clearer when people are running dev builds (#24457)

Click to expand commit body
Release Notes:

- Include an indicator in About/CopySystemSpecs when running in debug mode

Conrad Irwin created

144487b theme: Implement icon theme reloading (#24449)

Click to expand commit body
Closes #24353 

This PR implements icon theme reload to ensure file icons are properly
updated whenever an icon theme extension is upgraded or uninstalled.

Currently, on both upgrade and uninstall of an icon theme extension the
file icons from the previously installed version will stay visibile and
will not be updated as shown in the linked issue. With this change, file
icons will properly be updated on extension upgrade or reinstall.

The code is primarily a copy for reloading the current color theme
adapted to work for icon themes. Happy for any feedback!


Release Notes:

- Fixed file icons not being properly updated upon icon theme upgrade or
uninstall.

Finn Evers created

2d57e43 docs: Emphasize that Rust must be installed via rustup (#24447)

Click to expand commit body
Just tried installing a dev extension and kept getting "error: failed to install dev extension".

Turns out this was because I had rust installed via homebrew and not rust. Once I switched to rustup, it worked perfectly fine.

Release Notes:

- N/A

Wilhelm Klopp created

c484374 Make OpenKeyContextView open to the right (#24452)

Click to expand commit body
Match the behavior of OpenSyntaxTreeView logs and OpenLanguageServerLogs

Release Notes:

- Make `debug::OpenSyntaxTreeView` automatically open in split to the
right

Peter Tripp created

8114d17 google_ai: Add support for Gemini 2.0 models (#24448)

Click to expand commit body
Add support for the newly released Gemini 2.0 models from Google announced this new family of models earlier this week (2025-02-05).

Release Notes:

- Added support for Google's new Gemini 2.0 models.

IaVashik created

c7cd5b0 file_icons: Use separate icon key for JSON files (#24432)

Click to expand commit body
This PR updates the file icon mappings for JSON (`.json`) file map to
the`json` key. Also, updates `.json` icon from `storage` to `code`.

This allows for the JSON file icons to be replaced in icon themes.

Release Notes:

- Icon themes: Added the ability to change the file icon for JSON
(`.json`) files.

---------

Co-authored-by: Marshall Bowers <git@maxdeviant.com>

Sanjeev Shrestha and Marshall Bowers created

0792922 migrator: Sort dependencies in `Cargo.toml` (#24455)

Click to expand commit body
This PR sorts the dependencies in the `Cargo.toml` for the `migrator`
crate.

Release Notes:

- N/A

Marshall Bowers created

00c2a30 Migrate keymap and settings + edit predictions rename (#23834)

Click to expand commit body
- [x] snake case keymap properties
- [x] flatten actions
- [x] keymap migration + notfication
- [x] settings migration + notification
- [x] inline completions -> edit predictions 

### future: 
- keymap notification doesn't show up on start up, only on keymap save.
this is existing bug in zed, will be addressed in seperate PR.

Release Notes:

- Added a notification for deprecated settings and keymaps, allowing you
to migrate them with a single click. A backup of your existing keymap
and settings will be created in your home directory.
- Modified some keymap actions and settings for consistency.

---------

Co-authored-by: Piotr Osiewicz <piotr@zed.dev>
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>

smit , Piotr Osiewicz , and Max Brunsfeld created

a1544f4 Fix incorrect assumption about `Path.extension()` (#24443)

Click to expand commit body
Release Notes:

- N/A

Ben Kunkle created