Merge remote-tracking branch 'helix-pull/pull-diagnostics'

helix-term/src/application.rs

@@ -1048,7 +1048,6 @@ impl Application {
                         let result = self.handle_show_document(params, offset_encoding);
                         Ok(json!(result))
                     }
-
                     Ok(MethodCall::WorkspaceDiagnosticRefresh) => {
                         for document in self.editor.documents() {
                             let language_server = language_server!();

helix-term/src/events.rs

@@ -1,7 +1,7 @@
 use helix_event::{events, register_event};
 use helix_view::document::Mode;
 use helix_view::events::{
-    DiagnosticsDidChange, DocumentDidChange, DocumentDidOpen, SelectionDidChange, DocumentFocusLost,
+    DiagnosticsDidChange, DocumentDidChange, DocumentDidOpen, DocumentFocusLost, SelectionDidChange,
 };
 
 use crate::commands;

helix-view/src/editor.rs

@@ -4,8 +4,7 @@ use crate::{
     document::{
         DocumentOpenError, DocumentSavedEventFuture, DocumentSavedEventResult, Mode, SavePoint,
     },
-    events::DocumentDidOpen,
-    events::DocumentFocusLost,
+    events::{DocumentDidOpen, DocumentFocusLost},
     graphics::{CursorKind, Rect},
     handlers::Handlers,
     info::Info,

helix-view/src/events.rs

@@ -4,9 +4,6 @@ use helix_event::events;
 use crate::{Document, DocumentId, Editor, ViewId};
 
 events! {
-    // DocumentDidChange<'a> { doc: &'a mut Document, view: ViewId, old_text: &'a Rope  }
-    DocumentDidOpen<'a> { doc: &'a Document}
-    // DocumentDidChange<'a> { doc: &'a mut Document, view: ViewId, old_text: &'a Rope  }
     DocumentDidChange<'a> {
         doc: &'a mut Document,
         view: ViewId,
@@ -14,6 +11,7 @@ events! {
         changes: &'a ChangeSet,
         ghost_transaction: bool
     }
+    DocumentDidOpen<'a> { doc: &'a Document}
     SelectionDidChange<'a> { doc: &'a mut Document, view: ViewId }
     DiagnosticsDidChange<'a> { editor: &'a mut Editor, doc: DocumentId }
     // called **after** a document loses focus (but not when its closed)