Yet another attempt at helix-editor#402.

jneem · Jul 6, 2021 · 8315a8a · 8315a8a
1 parent 906cfd5
commit 8315a8a
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
@@ -34,7 +34,7 @@ num_cpus = "1"
 tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
 crossterm = { version = "0.20", features = ["event-stream"] }
 
-futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
+futures-util = { version = "0.3", features = ["std", "async-await", "async-await-macro"], default-features = false }
 
 # Logging
 fern = "0.6"

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
@@ -159,11 +159,7 @@ impl Application {
                         last_render = Instant::now();
                     }
                 }
-                Some(callback) = self.jobs.futures.next() => {
-                    self.jobs.handle_callback(&mut self.editor, &mut self.compositor, callback);
-                    self.render();
-                }
-                Some(callback) = self.jobs.wait_futures.next() => {
+                Some(callback) = self.jobs.next_job() => {
                     self.jobs.handle_callback(&mut self.editor, &mut self.compositor, callback);
                     self.render();
                 }

diff --git a/helix-term/src/job.rs b/helix-term/src/job.rs
@@ -78,9 +78,12 @@ impl Jobs {
     }
 
     pub async fn next_job(&mut self) -> Option<anyhow::Result<Option<Callback>>> {
-        tokio::select! {
-            event = self.futures.next() => {  event }
-            event = self.wait_futures.next() => { event }
+        loop {
+            futures_util::select! {
+                event = self.futures.select_next_some() => { return Some(event); }
+                event = self.wait_futures.select_next_some() => { return Some(event); }
+                complete => { return None; }
+            };
         }
     }