Commit log

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)

Click to expand commit body
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)

Click to expand commit body
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)

Click to expand commit body
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)

Click to expand commit body
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)

Click to expand commit body
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)

Click to expand commit body
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)

Click to expand commit body
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)

Click to expand commit body
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)

Click to expand commit body
## 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)

Click to expand commit body
Release Notes:

- N/A

Michael Sloan created

7545608 edit predictions: Refine the settings migration banner (#24706)

Click to expand commit body
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)

Click to expand commit body
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)

Click to expand commit body
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)

Click to expand commit body
Release Notes:

- N/A

Conrad Irwin created

9a9fdce Fixes for accept edit popovers (#24703)

Click to expand commit body
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)

Click to expand commit body
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)

Click to expand commit body
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)

Click to expand commit body
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)

Click to expand commit body
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)

Click to expand commit body
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)

Click to expand commit body
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)

Click to expand commit body
Follow-up of https://github.com/zed-industries/zed/pull/24575

Release Notes:

- N/A

Kirill Bulatov created

e851abd migrator: Do some cleanup (#24687)

Click to expand commit body
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)

Click to expand commit body
Release Notes:

- N/A

Joseph T. Lyons created

2d71733 ui: Update Label component (#24653)

Click to expand commit body
- 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)

Click to expand commit body
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)

Click to expand commit body
Without this, these default vim bindings were taking precedence over
user keybindings

Release Notes:

- N/A

Michael Sloan created

477cec0 Add more view tracking (#24683)

Click to expand commit body
This should fix a panic in `Window::current_view()`

Release Notes:

- N/A

Mikayla Maki created

0a14679 vim: Prevent around word operations from selecting indentation (#24635)

Click to expand commit body
Closes https://github.com/zed-industries/zed/issues/15323

Changes:
Added check for first word on line

Tested `v/c/d/y aw`. Matches standard neovim.

|initial|old|new|
|---|---|---|

|![image](https://github.com/user-attachments/assets/725b74e6-3aa0-40dc-9fd2-4d2b593e9926)|![image](https://github.com/user-attachments/assets/eeebd267-b4c6-4ea6-bb9a-fb913614754c)|![image](https://github.com/user-attachments/assets/fb695e54-b4c2-44a6-a588-909c1fd415e0)



Release Notes:

- vim: Prevent around word operations from selecting indentation

5brian created

7378ab9 Correctly handle `[[` autoclosing in Markdown (#24662)

Peter Tripp created

3a3b7b5 Merge branch 'main' into v0.173.x

Joseph T. Lyons created

759ea0e Touch up stale hunks fix (#24669)

Click to expand commit body
Release Notes:

- N/A

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

Cole Miller and Max created

7c00eec edit predictions: Fix popover hint not scrolling horizontally (#24602)

Click to expand commit body
Release Notes:

- N/A

João Marcos created

eaab7da zeta: Add ability to change predict edits URL via environment variable (#24668)

Click to expand commit body
This PR adds the ability to change the predict edits URL using the
`ZED_PREDICT_EDITS_URL` environment variable.

This allows for easily pointing Zed to a development version of the
Cloudflare Worker.

Release Notes:

- N/A

Marshall Bowers created

14d9788 edit predictions: Don't animate cursor when jumping in eager mode without LSP completions (#24664)

Click to expand commit body
We should only do this in "holding modifier" mode OR when there's a
language server completions menu.

Release Notes:

- N/A

Agus Zubiaga created

b395bea file_icons: Add Stylelint file icon associations (#24605)

Click to expand commit body
This PR adds file associations for stylelint files.

This is how it looks like in Zed (the icon doesn't exist):
![default javascript file icon is shown for
stylelint.config.js](https://github.com/user-attachments/assets/a873d7fc-1b8a-4a9c-8e92-1be56d5b01b1)

In a dev version of an icon theme it looks like this (icon sourced from:
https://github.com/vscode-icons/vscode-icons/blob/master/icons/file_type_stylelint.svg
):
![stylelint file icon is shown for
stylelint.config.js](https://github.com/user-attachments/assets/ddbb068d-7986-43de-94f8-9c844cb6b96f)

Release Notes:

- Icon themes: Added Stylelint file icon associations.

---------

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

Cameron Radmore and Marshall Bowers created

6e7416e Fix stale hunks after commit (#24663)

Click to expand commit body
Fixes a regression introduced in #24475.

Release Notes:

- N/A

Cole Miller created

bbea3a2 editor: Fix crash caused by `editor::SelectPrevious` (#24660)

Click to expand commit body
Closes #24345

Release Notes:

- Fixed a crash caused by calling `editor::SelectPrevious` twice in a
row.

Co-authored-by: conrad <conrad@zed.dev>

smit and conrad created

7950368 file_icons: Add missing React file icon associations (#24659)

Click to expand commit body
The `.mjsx`, `.cjsx`, `.mtsx`, and `.ctsx` file extensions are also
designed to contain JSX code.

Release Notes:

- Added file icon associations for more React files (`.mjsx`, `.cjsx`,
`.mtsx`, `.ctsx`).

Twilight created

7fe6943 Add command to copy current file name (#22174)

Click to expand commit body
Closes #21967

Add actions `CopyFileName` and `CopyFileNameWithoutExtension` to be used in the command palette.

Release Notes:

- Added commands `editor: copy file name` and `editor: copy file name without extensions`.

ANKDDEV created

8fa85c4 edit prediction: Try to fix panic in `Buffer::preview_edits` (#24654)

Click to expand commit body
We've seen a few crashes in `SyntaxSnapshot::reparse_with_ranges` during
`Buffer::preview_edits`, where an offset conversion fails because it is
out of range.
We are not sure how exactly this is happening. 
Our theory is that the syntax snapshot is using an outdated state when
edits happen in the meantime (while interpolating). This is an attempt
to see if it helps with the panics, hopefully we can revisit this when
we have a better understanding of the issue.


Co-Authored-by: Antonio <antonio@zed.dev>

Release Notes:

- N/A

Co-authored-by: Antonio <antonio@zed.dev>

Bennet Bo Fenner and Antonio created

ca3b780 Merge branch 'main' into v0.173.x

Joseph T. Lyons created