From ddf70bc3217eb2f55f1bdf1d44d1f3d8719502e6 Mon Sep 17 00:00:00 2001 From: Ben Kunkle Date: Fri, 9 Jan 2026 10:42:00 -0600 Subject: [PATCH] Fix incorrect usages of `Zeta2FeatureFlag` (#46462) Closes #ISSUE Release Notes: - N/A *or* Added/Fixed/Improved ... --- .../settings_ui/src/pages/edit_prediction_provider_setup.rs | 6 +++--- crates/zed/src/zed/edit_prediction_registry.rs | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs b/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs index fb8f967613fa195080f62c5ab2ce76a43f3d1e22..0bab03a852cb29b6af0bf667ad3375d74014abee 100644 --- a/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs +++ b/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs @@ -1,5 +1,5 @@ use edit_prediction::{ - ApiKeyState, Zeta2FeatureFlag, + ApiKeyState, MercuryFeatureFlag, SweepFeatureFlag, mercury::{MERCURY_CREDENTIALS_URL, mercury_api_token}, sweep_ai::{SWEEP_CREDENTIALS_URL, sweep_api_token}, }; @@ -33,7 +33,7 @@ impl Render for EditPredictionSetupPage { let providers = [ Some(render_github_copilot_provider(window, cx).into_any_element()), - cx.has_flag::().then(|| { + cx.has_flag::().then(|| { render_api_key_provider( IconName::Inception, "Mercury", @@ -46,7 +46,7 @@ impl Render for EditPredictionSetupPage { ) .into_any_element() }), - cx.has_flag::().then(|| { + cx.has_flag::().then(|| { render_api_key_provider( IconName::SweepAi, "Sweep", diff --git a/crates/zed/src/zed/edit_prediction_registry.rs b/crates/zed/src/zed/edit_prediction_registry.rs index 51327bfc9ab715a1b11aa3c639ffd60b6b0a0ea8..0dcee753407c8ea8debabab386704bec9046d4e0 100644 --- a/crates/zed/src/zed/edit_prediction_registry.rs +++ b/crates/zed/src/zed/edit_prediction_registry.rs @@ -2,7 +2,9 @@ use client::{Client, UserStore}; use codestral::CodestralEditPredictionDelegate; use collections::HashMap; use copilot::{Copilot, CopilotEditPredictionDelegate}; -use edit_prediction::{SweepFeatureFlag, ZedEditPredictionDelegate, Zeta2FeatureFlag}; +use edit_prediction::{ + MercuryFeatureFlag, SweepFeatureFlag, ZedEditPredictionDelegate, Zeta2FeatureFlag, +}; use editor::Editor; use feature_flags::FeatureFlagAppExt; use gpui::{AnyWindowHandle, App, AppContext as _, Context, Entity, WeakEntity}; @@ -204,7 +206,7 @@ fn assign_edit_prediction_provider( { edit_prediction::EditPredictionModel::Zeta2 } else if name == EXPERIMENTAL_MERCURY_EDIT_PREDICTION_PROVIDER_NAME - && cx.has_flag::() + && cx.has_flag::() { edit_prediction::EditPredictionModel::Mercury } else {