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

Blocking :wq

Browse source
This commit is contained in:
Shafkath Shuhan 2021-06-23 22:30:21 -04:00 committed by Blaž Hrastnik
parent 8935e7a879
commit 629df6124d
1 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
helix-term/src/commands.rs
View file

@ -1061,7 +1061,7 @@ mod cmd {
view: &View,
doc: &mut Document,
path: Option<P>,
) -> Result<(), anyhow::Error> {
) -> Result<tokio::task::JoinHandle<Result<(), anyhow::Error>>, anyhow::Error> {
use anyhow::anyhow;
if let Some(path) = path {
@ -1079,8 +1079,7 @@ mod cmd {
if autofmt {
doc.format(view.id); // TODO: merge into save
}
helix_lsp::block_on(tokio::spawn(doc.save()));
Ok(())
Ok(tokio::spawn(doc.save()))
}
fn write(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) {
@ -1203,15 +1202,35 @@ mod cmd {
fn write_quit(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) {
let (view, doc) = current!(cx.editor);
if let Err(e) = write_impl(view, doc, args.first()) {
cx.editor.set_error(e.to_string());
return;
match write_impl(view, doc, args.first()) {
Ok(handle) => {
if let Err(e) = helix_lsp::block_on(handle) {
cx.editor.set_error(e.to_string());
return;
}
}
Err(e) => {
cx.editor.set_error(e.to_string());
return;
}
};
quit(cx, &[], event)
}
fn force_write_quit(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) {
write(cx, args, event);
let (view, doc) = current!(cx.editor);
match write_impl(view, doc, args.first()) {
Ok(handle) => {
if let Err(e) = helix_lsp::block_on(handle) {
cx.editor.set_error(e.to_string());
return;
}
}
Err(e) => {
cx.editor.set_error(e.to_string());
return;
}
};
force_quit(cx, &[], event);
}