Remove project cache in edit prediction CLI (#49409)

Max Brunsfeld created 1 month ago

The cache isn't needed, now that we have a better way of reducing
resource consumption (disabling worktree scanning), and it adds race
conditions.

Release Notes:

- N/A

Change summary

crates/edit_prediction_cli/src/headless.rs     | 26 +------------------
crates/edit_prediction_cli/src/load_project.rs | 18 -------------
crates/edit_prediction_cli/src/main.rs         |  5 ---
3 files changed, 3 insertions(+), 46 deletions(-)

Detailed changes

crates/edit_prediction_cli/src/headless.rs

@@ -1,5 +1,4 @@
 use client::{Client, ProxySettings, UserStore};
-use collections::HashMap;
 use extension::ExtensionHostProxy;
 use fs::RealFs;
 use gpui::http_client::read_proxy_from_env;
@@ -8,12 +7,12 @@ use gpui_tokio::Tokio;
 use language::LanguageRegistry;
 use language_extension::LspAccess;
 use node_runtime::{NodeBinaryOptions, NodeRuntime};
-use project::{Project, project_settings::ProjectSettings};
+use project::project_settings::ProjectSettings;
 use release_channel::{AppCommitSha, AppVersion};
 use reqwest_client::ReqwestClient;
 use settings::{Settings, SettingsStore};
 use std::path::PathBuf;
-use std::sync::{Arc, Mutex};
+use std::sync::Arc;
 use util::ResultExt as _;
 
 /// Headless subset of `workspace::AppState`.
@@ -23,24 +22,6 @@ pub struct EpAppState {
     pub user_store: Entity<UserStore>,
     pub fs: Arc<dyn fs::Fs>,
     pub node_runtime: NodeRuntime,
-    pub project_cache: ProjectCache,
-}
-
-#[derive(Default)]
-pub struct ProjectCache(Mutex<HashMap<String, Entity<Project>>>);
-
-impl ProjectCache {
-    pub fn insert(&self, repository_url: String, project: Entity<Project>) {
-        self.0.lock().unwrap().insert(repository_url, project);
-    }
-
-    pub fn get(&self, repository_url: &String) -> Option<Entity<Project>> {
-        self.0.lock().unwrap().get(repository_url).cloned()
-    }
-
-    pub fn remove(&self, repository_url: &String) {
-        self.0.lock().unwrap().remove(repository_url);
-    }
 }
 
 pub fn init(cx: &mut App) -> EpAppState {
@@ -130,14 +111,11 @@ pub fn init(cx: &mut App) -> EpAppState {
     prompt_store::init(cx);
     terminal_view::init(cx);
 
-    let project_cache = ProjectCache::default();
-
     EpAppState {
         languages,
         client,
         user_store,
         fs,
         node_runtime,
-        project_cache,
     }
 }

crates/edit_prediction_cli/src/load_project.rs

@@ -190,20 +190,6 @@ async fn setup_project(
 
     let worktree_path = setup_worktree(example, step_progress).await?;
 
-    if let Some(project) = app_state.project_cache.get(&example.spec.repository_url) {
-        let buffer_store = project.read_with(cx, |project, _| project.buffer_store().clone());
-        let buffers = buffer_store.read_with(cx, |buffer_store, _| {
-            buffer_store.buffers().collect::<Vec<_>>()
-        });
-        for buffer in buffers {
-            buffer.update(cx, |buffer, cx| buffer.reload(cx)).await.ok();
-        }
-        ep_store.update(cx, |ep_store, _| {
-            ep_store.clear_history_for_project(&project);
-        });
-        return Ok(project);
-    }
-
     let project = cx.update(|cx| {
         Project::local(
             app_state.client.clone(),
@@ -227,10 +213,6 @@ async fn setup_project(
         })
         .await?;
 
-    app_state
-        .project_cache
-        .insert(example.spec.repository_url.clone(), project.clone());
-
     let buffer_store = project.read_with(cx, |project, _| project.buffer_store().clone());
     cx.subscribe(&buffer_store, {
         let project = project.downgrade();

crates/edit_prediction_cli/src/main.rs

@@ -1041,11 +1041,9 @@ fn main() {
                                 }
                             }
 
-                            let repo_url = &repo_examples.first().unwrap().spec.repository_url;
                             let project = repo_examples
                                 .iter()
-                                .find_map(|e| e.state.as_ref().map(|s| s.project.clone()))
-                                .or_else(|| app_state.project_cache.get(repo_url));
+                                .find_map(|e| e.state.as_ref().map(|s| s.project.clone()));
 
                             if let Some(project) = project {
                                 let mut cx = cx.clone();
@@ -1069,7 +1067,6 @@ fn main() {
                                 }
                             }
 
-                            app_state.project_cache.remove(repo_url);
                             for example in &mut repo_examples {
                                 example.state.take();
                             }