Skip to content

Fix edit prediction provider checkmark (#56250) (cherry-pick to preview) - #56291

Merged
zed-zippy[bot] merged 1 commit into
v1.2.xfrom
cherry-pick-v1.2.x-ef65b5a2
May 9, 2026
Merged

Fix edit prediction provider checkmark (#56250) (cherry-pick to preview)#56291
zed-zippy[bot] merged 1 commit into
v1.2.xfrom
cherry-pick-v1.2.x-ef65b5a2

Conversation

@zed-zippy

@zed-zippy zed-zippy Bot commented May 9, 2026

Copy link
Copy Markdown
Contributor

Cherry-pick of #56250 to preview


Resolves #56129

The edit prediction status bar menu only showed a checkmark for the
active provider when that provider was Zed AI. Non-Zed providers such as
Mercury could be selected and active, but the Providers section rendered
them as unchecked because the toggle condition required provider = EditPredictionProvider::Zed.

This updates the menu condition to show the checkmark for any active
provider, while preserving the existing exception that hides the Zed AI
checkmark when Zed AI is disabled by organization policy.

Screenshot 2026-05-08 at 11 27 49 PM

Release Notes:

  • Fixed edit prediction provider menu checkmarks for active non-Zed
    providers.

Resolves #56129

The edit prediction status bar menu only showed a checkmark for the
active provider when that provider was Zed AI. Non-Zed providers such as
Mercury could be selected and active, but the Providers section rendered
them as unchecked because the toggle condition required `provider =
EditPredictionProvider::Zed`.

This updates the menu condition to show the checkmark for any active
provider, while preserving the existing exception that hides the Zed AI
checkmark when Zed AI is disabled by organization policy.

<div align="center">
<img width="371" height="187" alt="Screenshot 2026-05-08 at 11 27 49 PM"
src="https://github.com/user-attachments/assets/5278a102-bd7d-44a5-a655-74c6ed90b0f9"
/>
</div>

Release Notes:
- Fixed edit prediction provider menu checkmarks for active non-Zed
providers.
@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label May 9, 2026
@zed-community-bot zed-community-bot Bot added the bot Pull requests authored by a bot label May 9, 2026
@zed-zippy
zed-zippy Bot merged commit b40c8cc into v1.2.x May 9, 2026
39 checks passed
@zed-zippy
zed-zippy Bot deleted the cherry-pick-v1.2.x-ef65b5a2 branch May 9, 2026 19:20
@zed-zippy zed-zippy Bot added the PR state:needs review Used to label PRs that are in need of a post-merge approval label May 12, 2026
@probably-neb

Copy link
Copy Markdown
Collaborator

@zed-zippy approve

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bot Pull requests authored by a bot cla-signed The user has signed the Contributor License Agreement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants