From 847bd35bd905ebb212e43b074a30c607aa8104f6 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 25 Jul 2024 09:00:53 -0600
Subject: [PATCH] vim remap 2 (#15193)

Release Notes:

- N/A
---
 crates/picker/src/picker.rs | 13 ++-----------
 crates/vim/src/test.rs      |  4 ++++
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/crates/picker/src/picker.rs b/crates/picker/src/picker.rs
index ba223e7f53..4c10220f37 100644
--- a/crates/picker/src/picker.rs
+++ b/crates/picker/src/picker.rs
@@ -22,15 +22,6 @@ enum ElementContainer {
 
 actions!(picker, [ConfirmCompletion]);
 
-// How long to give the command palette to return if a user
-// types j<enter> quickly.
-// Longer in debug builds to reduce flaky test on linux.
-#[cfg(debug_assertions)]
-static FINALIZE_TIMEOUT: Duration = Duration::from_millis(32);
-
-#[cfg(not(debug_assertions))]
-static FINALIZE_TIMEOUT: Duration = Duration::from_millis(16);
-
 /// ConfirmInput is an alternative editor action which - instead of selecting active picker entry - treats pickers editor input literally,
 /// performing some kind of action on it.
 #[derive(PartialEq, Clone, Deserialize, Default)]
@@ -333,7 +324,7 @@ impl<D: PickerDelegate> Picker<D> {
         if self.pending_update_matches.is_some()
             && !self
                 .delegate
-                .finalize_update_matches(self.query(cx), FINALIZE_TIMEOUT, cx)
+                .finalize_update_matches(self.query(cx), Duration::from_millis(16), cx)
         {
             self.confirm_on_update = Some(false)
         } else {
@@ -346,7 +337,7 @@ impl<D: PickerDelegate> Picker<D> {
         if self.pending_update_matches.is_some()
             && !self
                 .delegate
-                .finalize_update_matches(self.query(cx), FINALIZE_TIMEOUT, cx)
+                .finalize_update_matches(self.query(cx), Duration::from_millis(16), cx)
         {
             self.confirm_on_update = Some(true)
         } else {
diff --git a/crates/vim/src/test.rs b/crates/vim/src/test.rs
index 6729a20e41..5eed012b04 100644
--- a/crates/vim/src/test.rs
+++ b/crates/vim/src/test.rs
@@ -916,6 +916,8 @@ async fn test_rename(cx: &mut gpui::TestAppContext) {
     cx.assert_state("const afterˇ = 2; console.log(after)", Mode::Normal)
 }
 
+// TODO: this test is flaky on our linux CI machines
+#[cfg(target_os = "macos")]
 #[gpui::test]
 async fn test_remap(cx: &mut gpui::TestAppContext) {
     let mut cx = VimTestContext::new(cx, true).await;
@@ -956,6 +958,8 @@ async fn test_remap(cx: &mut gpui::TestAppContext) {
     cx.simulate_keystrokes("g x");
     cx.assert_state("1234fooˇ56789", Mode::Normal);
 
+    cx.executor().allow_parking();
+
     // test command
     cx.update(|cx| {
         cx.bind_keys([KeyBinding::new(