TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

update write-quit to wait for saves

Browse source
This commit is contained in:
Skyler Hawthorne 2022-05-10 23:41:44 -04:00
parent e1f7bdb1d2
commit 69c9e44ef2
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
helix-term/src/commands/typed.rs
View file

@ -518,8 +518,12 @@ fn write_quit(
} }
write_impl(cx, args.first(), false)?; write_impl(cx, args.first(), false)?;
// TODO: change to use document close let doc = doc_mut!(cx.editor);
helix_lsp::block_on(cx.jobs.finish())?;
tokio::task::block_in_place(|| helix_lsp::block_on(doc.try_flush_saves()))
.map(|result| result.map(|_| ()))
.unwrap_or(Ok(()))?;
quit(cx, &[], event) quit(cx, &[], event)
} }

7
helix-term/tests/test/commands.rs
View file

@ -8,7 +8,7 @@ use helix_term::application::Application;
use super::*; use super::*;
#[tokio::test] #[tokio::test(flavor = "multi_thread")]
async fn test_write_quit_fail() -> anyhow::Result<()> { async fn test_write_quit_fail() -> anyhow::Result<()> {
let file = helpers::new_readonly_tempfile()?; let file = helpers::new_readonly_tempfile()?;
@ -16,6 +16,11 @@ async fn test_write_quit_fail() -> anyhow::Result<()> {
&mut helpers::app_with_file(file.path())?, &mut helpers::app_with_file(file.path())?,
Some("ihello<esc>:wq<ret>"), Some("ihello<esc>:wq<ret>"),
Some(&|app| { Some(&|app| {
let mut docs: Vec<_> = app.editor.documents().collect();
assert_eq!(1, docs.len());
let doc = docs.pop().unwrap();
assert_eq!(Some(file.path()), doc.path().map(PathBuf::as_path));
assert_eq!(&Severity::Error, app.editor.get_status().unwrap().1); assert_eq!(&Severity::Error, app.editor.get_status().unwrap().1);
}), }),
false, false,