kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Kalle Carlbark 2024-12-27 21:39:29 +01:00
commit 018f64124f
No known key found for this signature in database
4 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
helix-term/src/application.rs
View file

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

2
helix-term/src/events.rs
View file

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

3
helix-view/src/editor.rs
View file

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

4
helix-view/src/events.rs
View file

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