Execute spell check as a Job::Callback, removing hack

Author: connorlay

helix-term/src/application.rs

@@ -328,7 +328,7 @@ impl Application {
                     self.handle_idle_timeout();
                     // HACK: force rendering until I can figure out how
                     // async jobs work
-                    self.render();
+                    // self.render();
 
                     #[cfg(feature = "integration")]
                     {

helix-term/src/commands/typed.rs

@@ -340,12 +340,23 @@ fn spell_check(
     if event != PromptEvent::Validate {
         return Ok(());
     }
-    let doc = doc_mut!(cx.editor);
-    let mut diagnostics = doc.spell_check();
-    doc.add_diagnostics(diagnostics.as_mut());
+    let doc = doc!(cx.editor);
+    // TODO: could probably just be a job?
+    let callback = make_spell_check_callback(doc.id());
+    cx.jobs.callback(callback);
     Ok(())
 }
 
+async fn make_spell_check_callback(doc_id: DocumentId) -> anyhow::Result<job::Callback> {
+    let call: job::Callback = Box::new(move |editor, _compositor| {
+        if let Some(doc) = editor.document_mut(doc_id) {
+            let mut diagnostics = doc.spell_check();
+            doc.add_diagnostics(diagnostics.as_mut());
+        };
+    });
+    Ok(call)
+}
+
 fn set_indent_style(
     cx: &mut compositor::Context,
     args: &[Cow<str>],

helix-view/src/document.rs

@@ -1115,6 +1115,8 @@ impl Document {
 
     pub fn add_diagnostics(&mut self, diagnostics: &mut Vec<Diagnostic>) {
         self.diagnostics.append(diagnostics);
+        self.diagnostics
+            .sort_unstable_by_key(|diagnostic| diagnostic.range);
     }
 
     /// Get the document's auto pairs. If the document has a recognized