fix(command): write-quit: do not quit if write fails

During write-quit, if the file fails to be written for any reason, helix
will still quit without saving the changes. This fixes this behavior by
introducing fallibility to the asynchronous job queues. This will also
benefit all contexts which may depend on these job queues.

Fixes helix-editor#1575

helix-term/src/application.rs

@@ -759,7 +759,7 @@ impl Application {
     }
 
     pub async fn close(&mut self) -> anyhow::Result<()> {
-        self.jobs.finish().await;
+        self.jobs.finish().await?;
 
         if self.editor.close_language_servers(None).await.is_err() {
             log::error!("Timed out waiting for language servers to shutdown");

helix-term/src/commands/typed.rs

@@ -224,6 +224,7 @@ fn write_impl(
         doc.detect_language(cx.editor.syn_loader.clone());
         let _ = cx.editor.refresh_language_server(id);
     }
+
     Ok(())
 }
 
@@ -412,6 +413,7 @@ fn write_quit(
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     write_impl(cx, args.first(), false)?;
+    helix_lsp::block_on(cx.jobs.finish())?;
     quit(cx, &[], event)
 }
 

helix-term/src/job.rs

@@ -2,7 +2,7 @@ use helix_view::Editor;
 
 use crate::compositor::Compositor;
 
-use futures_util::future::{self, BoxFuture, Future, FutureExt};
+use futures_util::future::{BoxFuture, Future, FutureExt};
 use futures_util::stream::{FuturesUnordered, StreamExt};
 
 pub type Callback = Box<dyn FnOnce(&mut Editor, &mut Compositor) + Send>;
@@ -93,9 +93,21 @@ 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);
+    pub async fn finish(&mut self) -> anyhow::Result<()> {
         log::debug!("waiting on jobs...");
-        wait_futures.for_each(|_| future::ready(())).await
+        let mut wait_futures = std::mem::take(&mut self.wait_futures);
+        while let (Some(job), tail) = wait_futures.into_future().await {
+            match job {
+                Ok(_) => {
+                    wait_futures = tail;
+                }
+                Err(e) => {
+                    self.wait_futures = tail;
+                    return Err(e);
+                }
+            }
+        }
+
+        Ok(())
     }
 }