diff --git a/crates/edit_prediction/src/edit_prediction.rs b/crates/edit_prediction/src/edit_prediction.rs index 0ff03de6154878ef685988b9c583e1fc17d6d26a..34ca867f7de02ead39146b93989a8638064f3fb8 100644 --- a/crates/edit_prediction/src/edit_prediction.rs +++ b/crates/edit_prediction/src/edit_prediction.rs @@ -35,7 +35,7 @@ use project::{Project, ProjectPath, WorktreeId}; use release_channel::AppVersion; use semver::Version; use serde::de::DeserializeOwned; -use settings::{EditPredictionProvider, SettingsStore, update_settings_file}; +use settings::{EditPredictionProvider, update_settings_file}; use std::collections::{VecDeque, hash_map}; use text::Edit; use workspace::Workspace; @@ -168,7 +168,6 @@ pub struct EditPredictionStore { llm_token: LlmApiToken, _llm_token_subscription: Subscription, projects: HashMap, - use_context: bool, options: ZetaOptions, update_required: bool, #[cfg(feature = "cli-support")] @@ -640,12 +639,11 @@ impl EditPredictionStore { }) .detach(); - let mut this = Self { + let this = Self { projects: HashMap::default(), client, user_store, options: DEFAULT_OPTIONS, - use_context: false, llm_token, _llm_token_subscription: cx.subscribe( &refresh_llm_token_listener, @@ -688,19 +686,6 @@ impl EditPredictionStore { }, }; - this.configure_context_retrieval(cx); - let weak_this = cx.weak_entity(); - cx.on_flags_ready(move |_, cx| { - weak_this - .update(cx, |this, cx| this.configure_context_retrieval(cx)) - .ok(); - }) - .detach(); - cx.observe_global::(|this, cx| { - this.configure_context_retrieval(cx); - }) - .detach(); - this } @@ -734,10 +719,6 @@ impl EditPredictionStore { self.options = options; } - pub fn set_use_context(&mut self, use_context: bool) { - self.use_context = use_context; - } - pub fn clear_history(&mut self) { for project_state in self.projects.values_mut() { project_state.events.clear(); @@ -1774,11 +1755,7 @@ impl EditPredictionStore { let diagnostic_search_range = Point::new(diagnostic_search_start, 0)..Point::new(diagnostic_search_end, 0); - let related_files = if self.use_context { - self.context_for_project(&project, cx) - } else { - Vec::new() - }; + let related_files = self.context_for_project(&project, cx); let inputs = EditPredictionModelInput { project: project.clone(), @@ -2142,13 +2119,11 @@ impl EditPredictionStore { cursor_position: language::Anchor, cx: &mut Context, ) { - if self.use_context { - self.get_or_init_project(project, cx) - .context - .update(cx, |store, cx| { - store.refresh(buffer.clone(), cursor_position, cx); - }); - } + self.get_or_init_project(project, cx) + .context + .update(cx, |store, cx| { + store.refresh(buffer.clone(), cursor_position, cx); + }); } #[cfg(feature = "cli-support")] @@ -2264,11 +2239,6 @@ impl EditPredictionStore { self.client.telemetry().flush_events().detach(); cx.notify(); } - - fn configure_context_retrieval(&mut self, cx: &mut Context<'_, EditPredictionStore>) { - self.use_context = cx.has_flag::() - && all_language_settings(None, cx).edit_predictions.use_context; - } } pub(crate) fn filter_redundant_excerpts( diff --git a/crates/edit_prediction_cli/src/retrieve_context.rs b/crates/edit_prediction_cli/src/retrieve_context.rs index 8d9a5b072920527884d3b83e727551efa2ffb985..9a8f0d6f504993757ea0cd7eeef2cfcb81eeeec4 100644 --- a/crates/edit_prediction_cli/src/retrieve_context.rs +++ b/crates/edit_prediction_cli/src/retrieve_context.rs @@ -47,7 +47,6 @@ pub async fn run_context_retrieval( let mut events = ep_store.update(&mut cx, |store, cx| { store.register_buffer(&state.buffer, &project, cx); - store.set_use_context(true); store.refresh_context(&project, &state.buffer, state.cursor_position, cx); store.debug_info(&project, cx) }); diff --git a/crates/edit_prediction_ui/src/edit_prediction_button.rs b/crates/edit_prediction_ui/src/edit_prediction_button.rs index 08c51d1ed5134241fdb9410e62c2d011af4d273a..cdd69c9f4a1bb009eff3372871107e04048545fb 100644 --- a/crates/edit_prediction_ui/src/edit_prediction_button.rs +++ b/crates/edit_prediction_ui/src/edit_prediction_button.rs @@ -1127,30 +1127,6 @@ impl EditPredictionButton { menu = self.build_language_settings_menu(menu, window, cx); - if cx.has_flag::() { - let settings = all_language_settings(None, cx); - let context_retrieval = settings.edit_predictions.use_context; - menu = menu.separator().header("Context Retrieval").item( - ContextMenuEntry::new("Enable Context Retrieval") - .toggleable(IconPosition::Start, context_retrieval) - .action(workspace::ToggleEditPrediction.boxed_clone()) - .handler({ - let fs = self.fs.clone(); - move |_, cx| { - update_settings_file(fs.clone(), cx, move |settings, _| { - settings - .project - .all_languages - .features - .get_or_insert_default() - .experimental_edit_prediction_context_retrieval = - Some(!context_retrieval) - }); - } - }), - ); - } - menu = self.add_provider_switching_section(menu, provider, cx); menu = menu.separator().item( ContextMenuEntry::new("Configure Providers") diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs index 750487452301014226eee8bb6ffe45b79f378d0d..050d75b30d1c7c0e5185706e2454bf30630b47e1 100644 --- a/crates/language/src/language_settings.rs +++ b/crates/language/src/language_settings.rs @@ -377,8 +377,6 @@ impl InlayHintSettings { pub struct EditPredictionSettings { /// The provider that supplies edit predictions. pub provider: settings::EditPredictionProvider, - /// Whether to use the experimental edit prediction context retrieval system. - pub use_context: bool, /// A list of globs representing files that edit predictions should be disabled for. /// This list adds to a pre-existing, sensible default set of globs. /// Any additional ones you add are combined with them. @@ -634,11 +632,6 @@ impl settings::Settings for AllLanguageSettings { .features .as_ref() .and_then(|f| f.edit_prediction_provider); - let use_edit_prediction_context = all_languages - .features - .as_ref() - .and_then(|f| f.experimental_edit_prediction_context_retrieval) - .unwrap_or_default(); let edit_predictions = all_languages.edit_predictions.clone().unwrap(); let edit_predictions_mode = edit_predictions.mode.unwrap(); @@ -689,7 +682,6 @@ impl settings::Settings for AllLanguageSettings { } else { EditPredictionProvider::None }, - use_context: use_edit_prediction_context, disabled_globs: disabled_globs .iter() .filter_map(|g| { diff --git a/crates/settings/src/settings_content/language.rs b/crates/settings/src/settings_content/language.rs index fb0502c4aa8dc1c332bf60adb1c29e8535fcf406..15d9b2821aeda81c526393cfd6e4ad597d143b2e 100644 --- a/crates/settings/src/settings_content/language.rs +++ b/crates/settings/src/settings_content/language.rs @@ -62,8 +62,6 @@ impl merge_from::MergeFrom for AllLanguageSettingsContent { pub struct FeaturesContent { /// Determines which edit prediction provider to use. pub edit_prediction_provider: Option, - /// Enables the experimental edit prediction context retrieval system. - pub experimental_edit_prediction_context_retrieval: Option, } /// The provider that supplies edit predictions.