From 60c0882fd2e6e942d5f90c5b026f5f53bfc7f132 Mon Sep 17 00:00:00 2001 From: Matt Paras Date: Tue, 25 Mar 2025 22:10:43 -0700 Subject: [PATCH] remove old document open/close events --- helix-term/src/commands/engine/steel.rs | 4 ++-- helix-term/src/events.rs | 3 +-- helix-view/src/editor.rs | 9 +-------- helix-view/src/events.rs | 2 -- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/helix-term/src/commands/engine/steel.rs b/helix-term/src/commands/engine/steel.rs index 263648c48..ac3f88b3b 100644 --- a/helix-term/src/commands/engine/steel.rs +++ b/helix-term/src/commands/engine/steel.rs @@ -17,7 +17,7 @@ use helix_view::{ GutterConfig, IndentGuidesConfig, LineEndingConfig, LineNumber, LspConfig, SearchConfig, SmartTabConfig, StatusLineConfig, TerminalConfig, WhitespaceConfig, }, - events::{DocumentFocusLost, DocumentOpened, SelectionDidChange}, + events::{DocumentDidOpen, DocumentFocusLost, SelectionDidChange}, extension::document_id_to_usize, input::KeyEvent, theme::Color, @@ -2198,7 +2198,7 @@ fn register_hook(event_kind: String, callback_fn: SteelVal) -> steel::UnRecovera "document-opened" => { // TODO: Share this code with the above since most of it is // exactly the same - register_hook!(move |event: &mut DocumentOpened<'_>| { + register_hook!(move |event: &mut DocumentDidOpen<'_>| { let cloned_func = rooted.value().clone(); let doc_id = event.doc; diff --git a/helix-term/src/events.rs b/helix-term/src/events.rs index 8709b7889..80f045cd7 100644 --- a/helix-term/src/events.rs +++ b/helix-term/src/events.rs @@ -2,7 +2,7 @@ use helix_event::{events, register_event}; use helix_view::document::Mode; use helix_view::events::{ DiagnosticsDidChange, DocumentDidChange, DocumentDidClose, DocumentDidOpen, DocumentFocusLost, - DocumentOpened, LanguageServerExited, LanguageServerInitialized, SelectionDidChange, + LanguageServerExited, LanguageServerInitialized, SelectionDidChange, }; use crate::commands; @@ -24,7 +24,6 @@ pub fn register() { register_event::(); register_event::(); register_event::(); - register_event::(); register_event::(); register_event::(); } diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs index 2a392699f..4819bb5c3 100644 --- a/helix-view/src/editor.rs +++ b/helix-view/src/editor.rs @@ -5,10 +5,7 @@ use crate::{ DocumentOpenError, DocumentSavedEvent, DocumentSavedEventFuture, DocumentSavedEventResult, Mode, SavePoint, }, - events::{ - DocumentClosed, DocumentDidClose, DocumentDidOpen, DocumentFocusLost, DocumentOpened, - DocumentSaved, - }, + events::{DocumentDidClose, DocumentDidOpen, DocumentFocusLost, DocumentSaved}, graphics::{CursorKind, Rect}, handlers::Handlers, info::Info, @@ -1896,10 +1893,6 @@ impl Editor { self._refresh(); - dispatch(DocumentClosed { - editor: self, - doc: doc_id, - }); helix_event::dispatch(DocumentDidClose { editor: self, doc }); Ok(()) diff --git a/helix-view/src/events.rs b/helix-view/src/events.rs index bcae30ec5..d32652443 100644 --- a/helix-view/src/events.rs +++ b/helix-view/src/events.rs @@ -24,8 +24,6 @@ events! { DiagnosticsDidChange<'a> { editor: &'a mut Editor, doc: DocumentId } // called **after** a document loses focus (but not when its closed) DocumentFocusLost<'a> { editor: &'a mut Editor, doc: DocumentId } - DocumentOpened<'a> { editor: &'a mut Editor, doc: DocumentId } - DocumentClosed<'a> { editor: &'a mut Editor, doc: DocumentId } DocumentSaved<'a> { editor: &'a mut Editor, doc: DocumentId } LanguageServerInitialized<'a> {