d706194597
The way that document writes are handled are by submitting them to the async job pool, which are all executed opportunistically out of order. It was discovered that this can lead to write inconsistencies when there are multiple writes to the same file in quick succession. This seeks to fix this problem by removing document writes from the general pool of jobs and into its own specialized event. Now when a user submits a write with one of the write commands, a request is simply queued up in a new mpsc channel that each Document makes to handle its own writes. This way, if multiple writes are submitted on the same document, they are executed in order, while still allowing concurrent writes for different documents.
167 lines
4.1 KiB
Rust
167 lines
4.1 KiB
Rust
use std::{
|
|
io::{Read, Write},
|
|
ops::RangeInclusive,
|
|
};
|
|
|
|
use helix_core::diagnostic::Severity;
|
|
use helix_term::application::Application;
|
|
use helix_view::doc;
|
|
|
|
use super::*;
|
|
|
|
#[tokio::test]
|
|
async fn test_write() -> anyhow::Result<()> {
|
|
let mut file = tempfile::NamedTempFile::new()?;
|
|
|
|
test_key_sequence(
|
|
&mut helpers::app_with_file(file.path())?,
|
|
Some("ithe gostak distims the doshes<ret><esc>:w<ret>"),
|
|
None,
|
|
false,
|
|
)
|
|
.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!(
|
|
helpers::platform_line("the gostak distims the doshes"),
|
|
file_content
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_write_quit() -> anyhow::Result<()> {
|
|
let mut file = tempfile::NamedTempFile::new()?;
|
|
|
|
test_key_sequence(
|
|
&mut helpers::app_with_file(file.path())?,
|
|
Some("ithe gostak distims the doshes<ret><esc>:wq<ret>"),
|
|
None,
|
|
true,
|
|
)
|
|
.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!(
|
|
helpers::platform_line("the gostak distims the doshes"),
|
|
file_content
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_write_concurrent() -> anyhow::Result<()> {
|
|
let mut file = tempfile::NamedTempFile::new()?;
|
|
let mut command = String::new();
|
|
const RANGE: RangeInclusive<i32> = 1..=5000;
|
|
|
|
for i in RANGE {
|
|
let cmd = format!("%c{}<esc>:w<ret>", i);
|
|
command.push_str(&cmd);
|
|
}
|
|
|
|
test_key_sequence(
|
|
&mut helpers::app_with_file(file.path())?,
|
|
Some(&command),
|
|
None,
|
|
false,
|
|
)
|
|
.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(())
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_write_fail_mod_flag() -> anyhow::Result<()> {
|
|
let file = helpers::new_readonly_tempfile()?;
|
|
|
|
test_key_sequences(
|
|
&mut helpers::app_with_file(file.path())?,
|
|
vec![
|
|
(
|
|
None,
|
|
Some(&|app| {
|
|
let doc = doc!(app.editor);
|
|
assert!(!doc.is_modified());
|
|
}),
|
|
),
|
|
(
|
|
Some("ihello<esc>"),
|
|
Some(&|app| {
|
|
let doc = doc!(app.editor);
|
|
assert!(doc.is_modified());
|
|
}),
|
|
),
|
|
(
|
|
Some(":w<ret>"),
|
|
Some(&|app| {
|
|
assert_eq!(&Severity::Error, app.editor.get_status().unwrap().1);
|
|
|
|
let doc = doc!(app.editor);
|
|
assert!(doc.is_modified());
|
|
}),
|
|
),
|
|
],
|
|
false,
|
|
)
|
|
.await?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test]
|
|
#[ignore]
|
|
async fn test_write_fail_new_path() -> anyhow::Result<()> {
|
|
let file = helpers::new_readonly_tempfile()?;
|
|
|
|
test_key_sequences(
|
|
&mut Application::new(Args::default(), Config::default())?,
|
|
vec![
|
|
(
|
|
None,
|
|
Some(&|app| {
|
|
let doc = doc!(app.editor);
|
|
assert_ne!(
|
|
Some(&Severity::Error),
|
|
app.editor.get_status().map(|status| status.1)
|
|
);
|
|
assert_eq!(None, doc.path());
|
|
}),
|
|
),
|
|
(
|
|
Some(&format!(":w {}<ret>", file.path().to_string_lossy())),
|
|
Some(&|app| {
|
|
let doc = doc!(app.editor);
|
|
assert_eq!(
|
|
Some(&Severity::Error),
|
|
app.editor.get_status().map(|status| status.1)
|
|
);
|
|
assert_eq!(None, doc.path());
|
|
}),
|
|
),
|
|
],
|
|
false,
|
|
)
|
|
.await?;
|
|
|
|
Ok(())
|
|
}
|