Skip to content

edit_prediction_ui: Fix edit prediction provider checkmark - #56250

Merged
MrSubidubi merged 3 commits into
zed-industries:mainfrom
terror:edit-prediction-provider
May 9, 2026
Merged

edit_prediction_ui: Fix edit prediction provider checkmark#56250
MrSubidubi merged 3 commits into
zed-industries:mainfrom
terror:edit-prediction-provider

Conversation

@terror

@terror terror commented May 9, 2026

Copy link
Copy Markdown
Contributor

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.

@cla-bot

cla-bot Bot commented May 9, 2026

Copy link
Copy Markdown

We require contributors to sign our Contributor License Agreement, and we don't have @terror on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'.

@zed-community-bot zed-community-bot Bot added the first contribution the author's first pull request to Zed. NOTE: the label application is automated via github actions label May 9, 2026
@terror
terror force-pushed the edit-prediction-provider branch from 6effe9d to 448010a Compare May 9, 2026 03:30
@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label May 9, 2026

@MrSubidubi MrSubidubi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for looking into this!

The fix itself looks good, could you do me the favor of moving provider == EditPredictionProvider::Zed && is_zed_provider_disabled into a variable with fitting name and use that everywhere here?

@MrSubidubi MrSubidubi self-assigned this May 9, 2026
@terror
terror requested a review from MrSubidubi May 9, 2026 15:45

@MrSubidubi MrSubidubi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, much better! Can we go for a better name here though? Like is_zed_provider_and_disabled or provider_is_zed_and_disabled? Not too big of a fan of either, if you have a better name (or disagree with me here), feel free to share!

@terror

terror commented May 9, 2026

Copy link
Copy Markdown
Contributor Author

Nice, much better! Can we go for a better name here though? Like is_zed_provider_and_disabled or provider_is_zed_and_disabled? Not too big of a fan of either, if you have a better name (or disagree with me here), feel free to share!

is_disabled_zed_provider seems informative enough 🤔

@MrSubidubi MrSubidubi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah good call indeed.

Treat yourself to some release notes as noted by the bot, otherwise looks good! Thanks for your contribution here, the quick follow-ups and congratulations to your first contribution! 🎉

@MrSubidubi MrSubidubi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@MrSubidubi
MrSubidubi added this pull request to the merge queue May 9, 2026
@MrSubidubi

Copy link
Copy Markdown
Member

/cherry-pick preview
/cherry-pick stable

Merged via the queue into zed-industries:main with commit ef65b5a May 9, 2026
32 checks passed
zed-zippy Bot added a commit that referenced this pull request May 9, 2026
…ew) (#56291)

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.

<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.

Co-authored-by: liam <liam@scalzulli.com>
@terror
terror deleted the edit-prediction-provider branch May 9, 2026 19:25
zed-zippy Bot added a commit that referenced this pull request May 9, 2026
…e) (#56292)

Cherry-pick of #56250 to stable

----
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.

Co-authored-by: liam <liam@scalzulli.com>
@terror terror changed the title Fix edit prediction provider checkmark edit_prediction_ui: Fix edit prediction provider checkmark May 23, 2026
jonx pushed a commit to jonx/zed-aros that referenced this pull request Jul 17, 2026
Resolves zed-industries#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.
jolutz pushed a commit to jolutz/zed that referenced this pull request Aug 8, 2026
Resolves zed-industries#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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement first contribution the author's first pull request to Zed. NOTE: the label application is automated via github actions

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Non-Zed edit prediction provider isn't checked in status bar menu

2 participants