Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
open_path_prompt: Cancel in-flight tasks when dialog is dismissed (#59423)
Neelf4c621b78d17
diff --git a/crates/open_path_prompt/src/open_path_prompt.rs b/crates/open_path_prompt/src/open_path_prompt.rsindex 8cfcb115cd8..0b6989aca03 100644--- a/crates/open_path_prompt/src/open_path_prompt.rs+++ b/crates/open_path_prompt/src/open_path_prompt.rs@@ -694,6 +694,7 @@ impl PickerDelegate for OpenPathDelegate {}fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<Self>>) {+ self.cancel_flag.store(true, atomic::Ordering::Release);if let Some(tx) = self.tx.take() {tx.send(None).ok();}diff --git a/crates/open_path_prompt/src/open_path_prompt_tests.rs b/crates/open_path_prompt/src/open_path_prompt_tests.rsindex d89b657860e..cfb06631dd6 100644--- a/crates/open_path_prompt/src/open_path_prompt_tests.rs+++ b/crates/open_path_prompt/src/open_path_prompt_tests.rs@@ -1,4 +1,4 @@-use std::sync::Arc;+use std::sync::{Arc, atomic};use fuzzy::{StringMatch, StringMatchCandidate};use gpui::{AppContext, Entity, TestAppContext, VisualTestContext};@@ -441,6 +441,43 @@ async fn test_open_path_prompt_with_show_hidden(cx: &mut TestAppContext) {assert_eq!(collect_match_candidates(&picker, cx), vec![".hidden"]);}+#[gpui::test]+async fn test_dismiss_cancels_in_flight_match(cx: &mut TestAppContext) {+ let app_state = init_test(cx);+ app_state+ .fs+ .as_fake()+ .insert_tree(+ path!("/root"),+ json!({+ "a1": "A1",+ "a2": "A2",+ "a3": "A3",+ }),+ )+ .await;++ let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;+ let (picker, cx) = build_open_path_prompt(project, false, false, cx);++ insert_query(path!("/root/a"), &picker, cx).await;++ let cancel_flag = picker.read_with(cx, |picker, _| picker.delegate.cancel_flag.clone());+ assert!(+ !cancel_flag.load(atomic::Ordering::Acquire),+ "cancel flag should be clear while the prompt is active"+ );++ picker.update_in(cx, |picker, window, cx| {+ picker.delegate.dismissed(window, cx);+ });++ assert!(+ cancel_flag.load(atomic::Ordering::Acquire),+ "dismissing the prompt must cancel the in-flight fuzzy match"+ );+}+fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {cx.update(|cx| {let state = AppState::test(cx);