aboutsummaryrefslogtreecommitdiff
path: root/helix-term/src
diff options
context:
space:
mode:
authorSkyler Hawthorne2022-04-19 05:21:31 +0000
committerSkyler Hawthorne2022-06-19 03:54:03 +0000
commitee705dcb3363aeb197f6125ab2f8285782333010 (patch)
treee045ef2a2c062f0e4df11ff50788b0e0b161e37a /helix-term/src
parent36e5809f638028644d8a51e1ed2467ea402de170 (diff)
use main application event loop
Use the Application's main event loop to allow LSP, file writes, etc
Diffstat (limited to 'helix-term/src')
-rw-r--r--helix-term/src/application.rs30
-rw-r--r--helix-term/src/job.rs1
-rw-r--r--helix-term/src/main.rs3
3 files changed, 23 insertions, 11 deletions
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 44025ea0..15026bb6 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -1,4 +1,5 @@
use arc_swap::{access::Map, ArcSwap};
+use futures_util::Stream;
use helix_core::{
config::{default_syntax_loader, user_syntax_loader},
pos_at_coords, syntax, Selection,
@@ -27,7 +28,7 @@ use std::{
use anyhow::Error;
use crossterm::{
- event::{DisableMouseCapture, EnableMouseCapture, Event, EventStream},
+ event::{DisableMouseCapture, EnableMouseCapture, Event},
execute, terminal,
tty::IsTty,
};
@@ -68,7 +69,7 @@ fn setup_integration_logging() {
message
))
})
- .level(log::LevelFilter::Info)
+ .level(log::LevelFilter::Debug)
.chain(std::io::stdout())
.apply();
}
@@ -225,8 +226,10 @@ impl Application {
}
}
- pub async fn event_loop(&mut self) {
- let mut reader = EventStream::new();
+ pub async fn event_loop<S>(&mut self, input_stream: &mut S)
+ where
+ S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
+ {
let mut last_render = Instant::now();
let deadline = Duration::from_secs(1) / 60;
@@ -242,7 +245,7 @@ impl Application {
tokio::select! {
biased;
- Some(event) = reader.next() => {
+ Some(event) = input_stream.next() => {
self.handle_terminal_events(event)
}
Some(signal) = self.signals.next() => {
@@ -749,7 +752,10 @@ impl Application {
Ok(())
}
- pub async fn run(&mut self) -> Result<i32, Error> {
+ pub async fn run<S>(&mut self, input_stream: &mut S) -> Result<i32, Error>
+ where
+ S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
+ {
self.claim_term().await?;
// Exit the alternate screen and disable raw mode before panicking
@@ -764,16 +770,20 @@ impl Application {
hook(info);
}));
- self.event_loop().await;
+ self.event_loop(input_stream).await;
+ self.close().await?;
+ self.restore_term()?;
+
+ Ok(self.editor.exit_code)
+ }
+ pub async fn close(&mut self) -> anyhow::Result<()> {
self.jobs.finish().await;
if self.editor.close_language_servers(None).await.is_err() {
log::error!("Timed out waiting for language servers to shutdown");
};
- self.restore_term()?;
-
- Ok(self.editor.exit_code)
+ Ok(())
}
}
diff --git a/helix-term/src/job.rs b/helix-term/src/job.rs
index a6a77021..d21099f7 100644
--- a/helix-term/src/job.rs
+++ b/helix-term/src/job.rs
@@ -95,6 +95,7 @@ impl Jobs {
/// Blocks until all the jobs that need to be waited on are done.
pub async fn finish(&mut self) {
let wait_futures = std::mem::take(&mut self.wait_futures);
+ log::debug!("waiting on jobs...");
wait_futures.for_each(|_| future::ready(())).await
}
}
diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs
index cd0b364b..7b26fb11 100644
--- a/helix-term/src/main.rs
+++ b/helix-term/src/main.rs
@@ -1,4 +1,5 @@
use anyhow::{Context, Error, Result};
+use crossterm::event::EventStream;
use helix_term::application::Application;
use helix_term::args::Args;
use helix_term::config::Config;
@@ -134,7 +135,7 @@ FLAGS:
// TODO: use the thread local executor to spawn the application task separately from the work pool
let mut app = Application::new(args, config).context("unable to create new application")?;
- let exit_code = app.run().await?;
+ let exit_code = app.run(&mut EventStream::new()).await?;
Ok(exit_code)
}