summaryrefslogtreecommitdiff
path: root/helix-term
diff options
context:
space:
mode:
Diffstat (limited to 'helix-term')
-rw-r--r--helix-term/src/application.rs30
-rw-r--r--helix-term/src/job.rs1
-rw-r--r--helix-term/src/main.rs3
-rw-r--r--helix-term/tests/integration.rs3
-rw-r--r--helix-term/tests/integration/auto_indent.rs3
-rw-r--r--helix-term/tests/integration/auto_pairs.rs6
-rw-r--r--helix-term/tests/integration/helpers.rs64
-rw-r--r--helix-term/tests/integration/movement.rs24
-rw-r--r--helix-term/tests/integration/write.rs69
9 files changed, 161 insertions, 42 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)
}
diff --git a/helix-term/tests/integration.rs b/helix-term/tests/integration.rs
index 4b0a2346..b2b78e63 100644
--- a/helix-term/tests/integration.rs
+++ b/helix-term/tests/integration.rs
@@ -17,7 +17,8 @@ mod integration {
Args::default(),
Config::default(),
("#[\n|]#", "ihello world<esc>", "hello world#[|\n]#"),
- )?;
+ )
+ .await?;
Ok(())
}
diff --git a/helix-term/tests/integration/auto_indent.rs b/helix-term/tests/integration/auto_indent.rs
index 18138cca..74d1ac58 100644
--- a/helix-term/tests/integration/auto_indent.rs
+++ b/helix-term/tests/integration/auto_indent.rs
@@ -18,7 +18,8 @@ async fn auto_indent_c() -> anyhow::Result<()> {
}
"},
),
- )?;
+ )
+ .await?;
Ok(())
}
diff --git a/helix-term/tests/integration/auto_pairs.rs b/helix-term/tests/integration/auto_pairs.rs
index 4da44d45..52fee55e 100644
--- a/helix-term/tests/integration/auto_pairs.rs
+++ b/helix-term/tests/integration/auto_pairs.rs
@@ -6,7 +6,8 @@ async fn auto_pairs_basic() -> anyhow::Result<()> {
Args::default(),
Config::default(),
("#[\n|]#", "i(<esc>", "(#[|)]#\n"),
- )?;
+ )
+ .await?;
test_key_sequence_text_result(
Args::default(),
@@ -18,7 +19,8 @@ async fn auto_pairs_basic() -> anyhow::Result<()> {
..Default::default()
},
("#[\n|]#", "i(<esc>", "(#[|\n]#"),
- )?;
+ )
+ .await?;
Ok(())
}
diff --git a/helix-term/tests/integration/helpers.rs b/helix-term/tests/integration/helpers.rs
index 5a853ad1..df662f07 100644
--- a/helix-term/tests/integration/helpers.rs
+++ b/helix-term/tests/integration/helpers.rs
@@ -1,9 +1,12 @@
-use std::io::Write;
+use std::{io::Write, time::Duration};
+use anyhow::bail;
use crossterm::event::{Event, KeyEvent};
use helix_core::{test, Selection, Transaction};
use helix_term::{application::Application, args::Args, config::Config};
use helix_view::{doc, input::parse_macro};
+use tokio::time::timeout;
+use tokio_stream::wrappers::UnboundedReceiverStream;
#[derive(Clone, Debug)]
pub struct TestCase {
@@ -29,10 +32,44 @@ impl<S: Into<String>> From<(S, S, S)> for TestCase {
}
}
-pub fn test_key_sequence<T: Into<TestCase>>(
+pub async fn test_key_sequence(
+ app: &mut Application,
+ in_keys: &str,
+ test_fn: Option<&dyn Fn(&Application)>,
+) -> anyhow::Result<()> {
+ let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
+
+ for key_event in parse_macro(&in_keys)?.into_iter() {
+ tx.send(Ok(Event::Key(KeyEvent::from(key_event))))?;
+ }
+
+ let mut rx_stream = UnboundedReceiverStream::new(rx);
+ let event_loop = app.event_loop(&mut rx_stream);
+ let result = timeout(Duration::from_millis(500), event_loop).await;
+
+ if result.is_ok() {
+ bail!("application exited before test function could run");
+ }
+
+ if let Some(test) = test_fn {
+ test(app);
+ };
+
+ for key_event in parse_macro("<esc>:q!<ret>")?.into_iter() {
+ tx.send(Ok(Event::Key(KeyEvent::from(key_event))))?;
+ }
+
+ let event_loop = app.event_loop(&mut rx_stream);
+ timeout(Duration::from_millis(5000), event_loop).await?;
+ app.close().await?;
+
+ Ok(())
+}
+
+pub async fn test_key_sequence_with_input_text<T: Into<TestCase>>(
app: Option<Application>,
test_case: T,
- test_fn: &dyn Fn(&mut Application),
+ test_fn: &dyn Fn(&Application),
) -> anyhow::Result<()> {
let test_case = test_case.into();
let mut app =
@@ -50,23 +87,13 @@ pub fn test_key_sequence<T: Into<TestCase>>(
view.id,
);
- let input_keys = parse_macro(&test_case.in_keys)?
- .into_iter()
- .map(|key_event| Event::Key(KeyEvent::from(key_event)));
-
- for key in input_keys {
- app.handle_terminal_events(Ok(key));
- }
-
- test_fn(&mut app);
-
- Ok(())
+ test_key_sequence(&mut app, &test_case.in_keys, Some(test_fn)).await
}
/// Use this for very simple test cases where there is one input
/// document, selection, and sequence of key presses, and you just
/// want to verify the resulting document and selection.
-pub fn test_key_sequence_text_result<T: Into<TestCase>>(
+pub async fn test_key_sequence_text_result<T: Into<TestCase>>(
args: Args,
config: Config,
test_case: T,
@@ -74,7 +101,7 @@ pub fn test_key_sequence_text_result<T: Into<TestCase>>(
let test_case = test_case.into();
let app = Application::new(args, config).unwrap();
- test_key_sequence(Some(app), test_case.clone(), &|app| {
+ test_key_sequence_with_input_text(Some(app), test_case.clone(), &|app| {
let doc = doc!(app.editor);
assert_eq!(&test_case.out_text, doc.text());
@@ -83,9 +110,8 @@ pub fn test_key_sequence_text_result<T: Into<TestCase>>(
let sel = selections.pop().unwrap();
assert_eq!(test_case.out_selection, sel);
- })?;
-
- Ok(())
+ })
+ .await
}
pub fn temp_file_with_contents<S: AsRef<str>>(content: S) -> tempfile::NamedTempFile {
diff --git a/helix-term/tests/integration/movement.rs b/helix-term/tests/integration/movement.rs
index fc2583c1..cac10852 100644
--- a/helix-term/tests/integration/movement.rs
+++ b/helix-term/tests/integration/movement.rs
@@ -14,25 +14,29 @@ async fn insert_mode_cursor_position() -> anyhow::Result<()> {
out_text: String::new(),
out_selection: Selection::single(0, 0),
},
- )?;
+ )
+ .await?;
test_key_sequence_text_result(
Args::default(),
Config::default(),
("#[\n|]#", "i", "#[|\n]#"),
- )?;
+ )
+ .await?;
test_key_sequence_text_result(
Args::default(),
Config::default(),
("#[\n|]#", "i<esc>", "#[|\n]#"),
- )?;
+ )
+ .await?;
test_key_sequence_text_result(
Args::default(),
Config::default(),
("#[\n|]#", "i<esc>i", "#[|\n]#"),
- )?;
+ )
+ .await?;
Ok(())
}
@@ -44,7 +48,8 @@ async fn insert_to_normal_mode_cursor_position() -> anyhow::Result<()> {
Args::default(),
Config::default(),
("#[f|]#oo\n", "vll<A-;><esc>", "#[|foo]#\n"),
- )?;
+ )
+ .await?;
test_key_sequence_text_result(
Args::default(),
@@ -60,7 +65,8 @@ async fn insert_to_normal_mode_cursor_position() -> anyhow::Result<()> {
#(|bar)#"
},
),
- )?;
+ )
+ .await?;
test_key_sequence_text_result(
Args::default(),
@@ -76,7 +82,8 @@ async fn insert_to_normal_mode_cursor_position() -> anyhow::Result<()> {
#(ba|)#r"
},
),
- )?;
+ )
+ .await?;
test_key_sequence_text_result(
Args::default(),
@@ -92,7 +99,8 @@ async fn insert_to_normal_mode_cursor_position() -> anyhow::Result<()> {
#(b|)#ar"
},
),
- )?;
+ )
+ .await?;
Ok(())
}
diff --git a/helix-term/tests/integration/write.rs b/helix-term/tests/integration/write.rs
new file mode 100644
index 00000000..47e56288
--- /dev/null
+++ b/helix-term/tests/integration/write.rs
@@ -0,0 +1,69 @@
+use std::{
+ io::{Read, Write},
+ ops::RangeInclusive,
+};
+
+use helix_term::application::Application;
+
+use super::*;
+
+#[tokio::test]
+async fn test_write() -> anyhow::Result<()> {
+ let mut file = tempfile::NamedTempFile::new().unwrap();
+
+ test_key_sequence(
+ &mut Application::new(
+ Args {
+ files: vec![(file.path().to_path_buf(), Position::default())],
+ ..Default::default()
+ },
+ Config::default(),
+ )?,
+ "ii can eat glass, it will not hurt me<ret><esc>:w<ret>",
+ None,
+ )
+ .await?;
+
+ file.as_file_mut().flush()?;
+ file.as_file_mut().sync_all()?;
+
+ let mut file_content = String::new();
+ file.as_file_mut().read_to_string(&mut file_content)?;
+ assert_eq!("i can eat glass, it will not hurt me\n", file_content);
+
+ Ok(())
+}
+
+#[tokio::test]
+async fn test_write_concurrent() -> anyhow::Result<()> {
+ let mut file = tempfile::NamedTempFile::new().unwrap();
+ let mut command = String::new();
+ const RANGE: RangeInclusive<i32> = 1..=1000;
+
+ for i in RANGE {
+ let cmd = format!("%c{}<esc>:w<ret>", i);
+ command.push_str(&cmd);
+ }
+
+ test_key_sequence(
+ &mut Application::new(
+ Args {
+ files: vec![(file.path().to_path_buf(), Position::default())],
+ ..Default::default()
+ },
+ Config::default(),
+ )?,
+ &command,
+ None,
+ )
+ .await?;
+
+ file.as_file_mut().flush()?;
+ file.as_file_mut().sync_all()?;
+
+ let mut file_content = String::new();
+ file.as_file_mut().read_to_string(&mut file_content)?;
+ assert_eq!(RANGE.end().to_string(), file_content);
+
+ Ok(())
+}
generated by cgit v1.2.3-70-g09d2 (git 2.47.1) at 2024-12-26 00:32:17 +0000