From 448010af617fb8c237e0e4b7e9f89a3074e890a2 Mon Sep 17 00:00:00 2001 From: Liam Date: Fri, 8 May 2026 23:13:11 -0400 Subject: [PATCH 1/3] Fix edit prediction provider checkmark --- crates/edit_prediction_ui/src/edit_prediction_button.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/edit_prediction_ui/src/edit_prediction_button.rs b/crates/edit_prediction_ui/src/edit_prediction_button.rs index 43edcfb8910a03..194cad2b5d5101 100644 --- a/crates/edit_prediction_ui/src/edit_prediction_button.rs +++ b/crates/edit_prediction_ui/src/edit_prediction_button.rs @@ -601,8 +601,8 @@ impl EditPredictionButton { .toggleable( IconPosition::Start, is_current - && (provider == EditPredictionProvider::Zed - && !is_zed_provider_disabled), + && !(provider == EditPredictionProvider::Zed + && is_zed_provider_disabled), ) .disabled( provider == EditPredictionProvider::Zed && is_zed_provider_disabled, From ef60fe7ddadc47c2ffe5754eeb8bab97cfa6a079 Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 9 May 2026 11:44:52 -0400 Subject: [PATCH 2/3] Reuse provider disabled state --- .../src/edit_prediction_button.rs | 28 ++++++------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/crates/edit_prediction_ui/src/edit_prediction_button.rs b/crates/edit_prediction_ui/src/edit_prediction_button.rs index 194cad2b5d5101..377d7b8602f7b8 100644 --- a/crates/edit_prediction_ui/src/edit_prediction_button.rs +++ b/crates/edit_prediction_ui/src/edit_prediction_button.rs @@ -594,30 +594,20 @@ impl EditPredictionButton { continue; }; let is_current = provider == current_provider; + let is_provider_disabled = + provider == EditPredictionProvider::Zed && is_zed_provider_disabled; let fs = self.fs.clone(); menu = menu.item( ContextMenuEntry::new(name) - .toggleable( - IconPosition::Start, - is_current - && !(provider == EditPredictionProvider::Zed - && is_zed_provider_disabled), - ) - .disabled( - provider == EditPredictionProvider::Zed && is_zed_provider_disabled, - ) - .when( - provider == EditPredictionProvider::Zed && is_zed_provider_disabled, - |item| { - item.documentation_aside(DocumentationSide::Left, move |_cx| { - Label::new( - "Edit predictions are disabled for this organization.", - ) + .toggleable(IconPosition::Start, is_current && !is_provider_disabled) + .disabled(is_provider_disabled) + .when(is_provider_disabled, |item| { + item.documentation_aside(DocumentationSide::Left, move |_cx| { + Label::new("Edit predictions are disabled for this organization.") .into_any_element() - }) - }, - ) + }) + }) .handler(move |_, cx| { set_completion_provider(fs.clone(), cx, provider); }), From 1d43afada788cfc111e5f8e4e924f362a2a8c510 Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 9 May 2026 12:13:08 -0400 Subject: [PATCH 3/3] Clarify disabled Zed provider state --- crates/edit_prediction_ui/src/edit_prediction_button.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/edit_prediction_ui/src/edit_prediction_button.rs b/crates/edit_prediction_ui/src/edit_prediction_button.rs index 377d7b8602f7b8..2246f106e72af3 100644 --- a/crates/edit_prediction_ui/src/edit_prediction_button.rs +++ b/crates/edit_prediction_ui/src/edit_prediction_button.rs @@ -594,15 +594,15 @@ impl EditPredictionButton { continue; }; let is_current = provider == current_provider; - let is_provider_disabled = + let is_disabled_zed_provider = provider == EditPredictionProvider::Zed && is_zed_provider_disabled; let fs = self.fs.clone(); menu = menu.item( ContextMenuEntry::new(name) - .toggleable(IconPosition::Start, is_current && !is_provider_disabled) - .disabled(is_provider_disabled) - .when(is_provider_disabled, |item| { + .toggleable(IconPosition::Start, is_current && !is_disabled_zed_provider) + .disabled(is_disabled_zed_provider) + .when(is_disabled_zed_provider, |item| { item.documentation_aside(DocumentationSide::Left, move |_cx| { Label::new("Edit predictions are disabled for this organization.") .into_any_element()