kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Temporary fix for #402

Browse source
This commit is contained in:
Blaž Hrastnik 2021-07-03 12:30:13 +09:00
parent c68fe1f2a3
commit 83e7dd8602
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
helix-term/src/application.rs
View file

@ -160,7 +160,11 @@ impl Application {
}
self.render();
}
Some(callback) = self.jobs.next_job() => {
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() => {
self.jobs.handle_callback(&mut self.editor, &mut self.compositor, callback);
self.render();
}

14
helix-term/src/job.rs
View file

@ -16,9 +16,9 @@ pub struct Job {
#[derive(Default)]
pub struct Jobs {
futures: FuturesUnordered<JobFuture>,
pub futures: FuturesUnordered<JobFuture>,
/// These are the ones that need to complete before we exit.
wait_futures: FuturesUnordered<JobFuture>,
pub wait_futures: FuturesUnordered<JobFuture>,
}
impl Job {
@ -77,11 +77,11 @@ impl Jobs {
}
}
pub fn next_job(
&mut self,
) -> impl Future<Output = Option<anyhow::Result<Option<Callback>>>> + '_ {
future::select(self.futures.next(), self.wait_futures.next())
.map(|either| either.factor_first().0)
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 }
}
}
pub fn add(&mut self, j: Job) {