Compare commits

...

53 Commits

Author SHA1 Message Date
Joseph T. Lyons
805d5c96a8 zed 0.173.7 2025-02-12 19:50:57 -05:00
Joseph T. Lyons
cf03d4ef8c Merge branch 'main' into v0.173.x 2025-02-12 19:41:48 -05:00
Joseph T. Lyons
b7860ae22c zed 0.173.6 2025-02-12 13:09:00 -05:00
Joseph T. Lyons
38ee945b06 Merge branch 'main' into v0.173.x 2025-02-12 13:07:43 -05:00
Joseph T. Lyons
a3c8b0a079 Merge branch 'main' into v0.173.x 2025-02-12 12:25:24 -05:00
Joseph T. Lyons
56e6fb6e63 Merge branch 'main' into v0.173.x 2025-02-12 10:34:11 -05:00
Joseph T. Lyons
df9b0f3611 Merge branch 'main' into v0.173.x 2025-02-11 19:43:48 -05:00
Joseph T. Lyons
8095e60ba9 Merge branch 'main' into v0.173.x 2025-02-11 18:03:56 -05:00
Joseph T. Lyons
2a2dbdfef2 Merge branch 'main' into v0.173.x 2025-02-11 15:11:19 -05:00
Joseph T. Lyons
3a3b7b5b33 Merge branch 'main' into v0.173.x 2025-02-11 12:49:43 -05:00
Joseph T. Lyons
ca3b7806c3 Merge branch 'main' into v0.173.x 2025-02-11 10:25:46 -05:00
Joseph T. Lyons
4e5a8626fa zed 0.173.5 2025-02-10 18:52:16 -05:00
Joseph T. Lyons
d2d3ce3265 Merge branch 'main' into v0.173.x 2025-02-10 18:51:05 -05:00
Joseph T. Lyons
0ae8e9f654 Merge branch 'main' into v0.173.x 2025-02-10 18:08:16 -05:00
Joseph T. Lyons
3ffe0e24d6 Merge branch 'main' into v0.173.x 2025-02-10 15:25:54 -05:00
Joseph T. Lyons
6adef5748e Merge branch 'main' into v0.173.x 2025-02-10 12:44:01 -05:00
Marshall Bowers
a47d5d39ee v0.173.4 2025-02-07 14:01:04 -05:00
Marshall Bowers
4b244118c8 Merge branch 'main' into v0.173.x 2025-02-07 13:59:39 -05:00
Marshall Bowers
2197ccf319 Revert "edit prediction: Do not render jump cursor until line layout is ready (#24226)"
This reverts commit 722fd59d9c.
2025-02-07 13:59:33 -05:00
Marshall Bowers
8fd2067861 Revert "edit prediction: Fix jump cursor position when scrolled (#24230)"
This reverts commit bc67f990ae.
2025-02-07 13:59:32 -05:00
Marshall Bowers
598abb5d66 Revert "zed 0.173.1"
This reverts commit 57d09d2fd3.
2025-02-07 13:59:31 -05:00
Marshall Bowers
be8a2b20eb Revert "edit prediction: Allow enabling OSS data collection with no project open (#24265)"
This reverts commit 1748fbeec8.
2025-02-07 13:59:29 -05:00
Marshall Bowers
c2c91872e6 Revert "edit predictions: Onboarding funnel telemetry (#24237)"
This reverts commit 45f9192137.
2025-02-07 13:59:28 -05:00
Marshall Bowers
59b382a7d8 Revert "Accept edit predictions with alt-tab in addition to tab (#24272)"
This reverts commit eafad7d9db.
2025-02-07 13:59:27 -05:00
Marshall Bowers
c532d9506b Revert "Fix panic when deleting an empty line after a deleted hunk (cherry-pick #24255) (#24282)"
This reverts commit 79714fca98.
2025-02-07 13:59:26 -05:00
Marshall Bowers
55720ff0f8 Revert "Implement character index for point (cherry-pick #23989) (#24284)"
This reverts commit 8ed71b2dd0.
2025-02-07 13:59:25 -05:00
Marshall Bowers
e893c32dfc Revert "edit prediction: Improve UX around disabled_globs and show_inline_completions (#24207)"
This reverts commit 68b4f9ee1d.
2025-02-07 13:59:24 -05:00
Marshall Bowers
904c39545b Revert "Revert recent anti-aliasing improvements (cherry-pick #24289) (#24291)"
This reverts commit af0f36de7b.
2025-02-07 13:59:22 -05:00
Marshall Bowers
c00a1fbafa Revert "edit prediction: Fix license detection error logging + check for different spellings (#24281)"
This reverts commit 9f825ca3cf.
2025-02-07 13:59:21 -05:00
Marshall Bowers
a9c33f30dd Revert "Fix the worktree's repository_for_path (cherry-pick #24279) (#24292)"
This reverts commit 0542019e25.
2025-02-07 13:59:19 -05:00
Marshall Bowers
91e99b313c Revert "zed 0.173.2"
This reverts commit d54f6f97a7.
2025-02-07 13:59:18 -05:00
Marshall Bowers
e280f96d37 Revert "gpui: Render SVGs at 2x size when rendered in an img (cherry-pick #24332) (#24336)"
This reverts commit 58834b4e3a.
2025-02-07 13:59:17 -05:00
Marshall Bowers
997c12194e Revert "Bump to 0.173.3 for @maxdeviant"
This reverts commit 95062b363e.
2025-02-07 13:59:15 -05:00
Marshall Bowers
17a4705eaa Revert "assistant_context_editor: Fix patch block not rendering due to window reborrow (cherry-pick #24461) (#24463)"
This reverts commit e7f64c7d98.
2025-02-07 13:59:14 -05:00
Marshall Bowers
ab392fc582 Revert "Bump to 0.173.4 for @maxdeviant"
This reverts commit af67af86da.
2025-02-07 13:59:12 -05:00
Zed Bot
af67af86da Bump to 0.173.4 for @maxdeviant 2025-02-07 18:22:00 +00:00
gcp-cherry-pick-bot[bot]
e7f64c7d98 assistant_context_editor: Fix patch block not rendering due to window reborrow (cherry-pick #24461) (#24463)
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>
2025-02-07 13:18:35 -05:00
Zed Bot
95062b363e Bump to 0.173.3 for @maxdeviant 2025-02-06 01:48:01 +00:00
gcp-cherry-pick-bot[bot]
58834b4e3a gpui: Render SVGs at 2x size when rendered in an img (cherry-pick #24332) (#24336)
Cherry-picked gpui: Render SVGs at 2x size when rendered in an `img`
(#24332)

This PR adjusts the rendering of SVGs when used with the `img` element
such that they are rendered at 2x their displayed size.

This results in much crisper icons for icons loaded by icon themes:

<img width="1136" alt="Screenshot 2025-02-05 at 7 39 48 PM"

src="https://github.com/user-attachments/assets/47d1fcee-c54d-4717-8fca-9b9d2bc8da9a"
/>

<img width="1136" alt="Screenshot 2025-02-05 at 7 40 01 PM"

src="https://github.com/user-attachments/assets/3061157c-8c88-41c1-a5dc-83ef9cd341cb"
/>

Release Notes:

- Improved the resolution of icons rendered by icon themes.

Co-authored-by: Marshall Bowers <git@maxdeviant.com>
2025-02-05 20:28:25 -05:00
Joseph T. Lyons
d54f6f97a7 zed 0.173.2 2025-02-05 13:10:36 -05:00
gcp-cherry-pick-bot[bot]
0542019e25 Fix the worktree's repository_for_path (cherry-pick #24279) (#24292)
Cherry-picked Fix the worktree's repository_for_path (#24279)

Go back to a less optimized implementation for now since the custom
cursor target seems to have some bugs.

Release Notes:

- Fixed missing git blame and status output in some projects with
multiple git repositories

Co-authored-by: Cole Miller <cole@zed.dev>
2025-02-05 12:59:55 -05:00
Danilo Leal
9f825ca3cf edit prediction: Fix license detection error logging + check for different spellings (#24281)
Follow-up to https://github.com/zed-industries/zed/pull/24278

This PR ensures we're checking if there's a license-type file in both US
& UK English spelling, and fixes the error logging again, treating for
when the worktree contains just a single file or multiple.

Release Notes:

- N/A

Co-Authored-By: Bennet Bo Fenner <53836821+bennetbo@users.noreply.github.com>
2025-02-05 14:36:49 -03:00
gcp-cherry-pick-bot[bot]
af0f36de7b Revert recent anti-aliasing improvements (cherry-pick #24289) (#24291)
Cherry-picked Revert recent anti-aliasing improvements (#24289)

This reverts commit 31fa414422.
This reverts commit b9e0aae49f.

`lyon` commit revert:


![image](https://github.com/user-attachments/assets/0243f61c-0713-416d-b8db-47372e04abaa)

`MSAA` commit revert:


![image](https://github.com/user-attachments/assets/b1a4a9fe-0192-47ef-be6f-52e03c025724)


Release Notes:

- N/A

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
2025-02-05 19:35:25 +02:00
Bennet Bo Fenner
68b4f9ee1d edit prediction: Improve UX around disabled_globs and show_inline_completions (#24207)
Release Notes:

- N/A

---------

Co-authored-by: Danilo <danilo@zed.dev>
Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
2025-02-05 12:22:52 -05:00
gcp-cherry-pick-bot[bot]
8ed71b2dd0 Implement character index for point (cherry-pick #23989) (#24284)
Cherry-picked Implement character index for point (#23989)

Fixes #22939
Fixes #23970
Supersedes https://github.com/zed-industries/zed/pull/23469

Release Notes:

- Fixed a bug where Zed could crash with certain input sources on macOS

---------

Co-authored-by: Louis Brunner <louis.brunner.fr@gmail.com>
Co-authored-by: ben <ben@zed.dev>

Co-authored-by: Mikayla Maki <mikayla@zed.dev>
Co-authored-by: Louis Brunner <louis.brunner.fr@gmail.com>
Co-authored-by: ben <ben@zed.dev>
2025-02-05 11:15:25 -05:00
gcp-cherry-pick-bot[bot]
79714fca98 Fix panic when deleting an empty line after a deleted hunk (cherry-pick #24255) (#24282)
Cherry-picked Fix panic when deleting an empty line after a deleted hunk
(#24255)

Release Notes:

- Fix a panic when deleting text after a deletion hunk

Co-authored-by: Cole Miller <cole@zed.dev>
2025-02-05 11:07:04 -05:00
Agus Zubiaga
eafad7d9db Accept edit predictions with alt-tab in addition to tab (#24272)
When you have an edit prediction available, you can now also accept it
with `alt-tab` (or `alt-enter` on Linux) even if you don't have an LSP
completions menu open. This is meant to lower the mental load when going
from one mode to another.

Release Notes:

- N/A
2025-02-05 12:41:24 -03:00
Agus Zubiaga
45f9192137 edit predictions: Onboarding funnel telemetry (#24237)
Release Notes:

- N/A
2025-02-05 12:37:48 -03:00
Agus Zubiaga
1748fbeec8 edit prediction: Allow enabling OSS data collection with no project open (#24265)
This was an leftover from when we were persisting a per-project setting.

Release Notes:

- N/A
2025-02-05 12:15:38 -03:00
Agus Zubiaga
57d09d2fd3 zed 0.173.1 2025-02-04 18:50:01 -03:00
Agus Zubiaga
bc67f990ae edit prediction: Fix jump cursor position when scrolled (#24230)
We were looking up line layouts without subtracting start row so we
would get the wrong one when scrolled

Release Notes:

- N/A
2025-02-04 18:48:30 -03:00
Agus Zubiaga
722fd59d9c edit prediction: Do not render jump cursor until line layout is ready (#24226)
This is pretty rare but I found a case where `line_layouts` didn't have
the requested line yet, so we now skip rendering the cursor for that
period and avoid panicking.

Release Notes:

- N/A
2025-02-04 18:11:59 -03:00
Peter Tripp
cf4e294007 v0.173.x preview 2025-02-04 14:36:32 -05:00
3 changed files with 3 additions and 3 deletions

2
Cargo.lock generated
View File

@@ -16626,7 +16626,7 @@ dependencies = [
[[package]]
name = "zed"
version = "0.174.0"
version = "0.173.7"
dependencies = [
"activity_indicator",
"anyhow",

View File

@@ -2,7 +2,7 @@
description = "The fast, collaborative code editor."
edition.workspace = true
name = "zed"
version = "0.174.0"
version = "0.173.7"
publish.workspace = true
license = "GPL-3.0-or-later"
authors = ["Zed Team <hi@zed.dev>"]

View File

@@ -1 +1 @@
dev
preview