git.iko.soy/helix
on master help sign in
factor editor event handling into function
8c667efSkyler Hawthorne
helix-term/src/application.rs+52−49
compare with master
unifiedsplit
@@ -287,9 +287,6 @@ impl Application {
287 where
287 where
288 S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
288 S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
289 {
289 {
290− #[cfg(feature = "integration")]
291− let mut idle_handled = false;
292−
293 loop {
290 loop {
294 if self.editor.should_close() {
291 if self.editor.should_close() {
295 return false;
292 return false;
@@ -315,56 +312,19 @@ impl Application {
315 self.render();
312 self.render();
316 }
313 }
317 event = self.editor.wait_event() => {
314 event = self.editor.wait_event() => {
318− log::debug!("received editor event: {:?}", event);
315+ let _idle_handled = self.handle_editor_event(event).await;
319
316
320− match event {
317+ // for integration tests only, reset the idle timer after every
321− EditorEvent::DocumentSave(event) => {
318+ // event to signal when test events are done processing
322− self.handle_document_write(event);
323− self.render();
324− }
325− EditorEvent::ConfigEvent(event) => {
326− self.handle_config_events(event);
327− self.render();
328− }
329− EditorEvent::LanguageServerMessage((id, call)) => {
330− self.handle_language_server_message(call, id).await;
331− // limit render calls for fast language server messages
332− let last = self.editor.language_servers.incoming.is_empty();
333−
334− if last || self.last_render.elapsed() > LSP_DEADLINE {
335− self.render();
336− self.last_render = Instant::now();
337− }
338− }
339− EditorEvent::DebuggerEvent(payload) => {
340− let needs_render = self.editor.handle_debugger_message(payload).await;
341− if needs_render {
342− self.render();
343− }
344− }
345− EditorEvent::IdleTimer => {
346− self.editor.clear_idle_timer();
347− self.handle_idle_timeout();
348−
349− #[cfg(feature = "integration")]
319+ #[cfg(feature = "integration")]
350− {
320+ {
351− log::debug!("idle handled");
321+ if _idle_handled {
352− idle_handled = true;
322+ return true;
353− }
354 }
323 }
355− }
356− }
357− }
358
324
359− // for integration tests only, reset the idle timer after every
325+ self.editor.reset_idle_timer();
360− // event to signal when test events are done processing
326+ }
361− #[cfg(feature = "integration")]
362− {
363− if idle_handled {
364− return true;
365 }
327 }
366−
367− self.editor.reset_idle_timer();
368 }
328 }
369 }
329 }
370 }
330 }
@@ -517,6 +477,49 @@ impl Application {
517 }
477 }
518 }
478 }
519
479
480+ #[inline(always)]
481+ pub async fn handle_editor_event(&mut self, event: EditorEvent) -> bool {
482+ log::debug!("received editor event: {:?}", event);
483+
484+ match event {
485+ EditorEvent::DocumentSave(event) => {
486+ self.handle_document_write(event);
487+ self.render();
488+ }
489+ EditorEvent::ConfigEvent(event) => {
490+ self.handle_config_events(event);
491+ self.render();
492+ }
493+ EditorEvent::LanguageServerMessage((id, call)) => {
494+ self.handle_language_server_message(call, id).await;
495+ // limit render calls for fast language server messages
496+ let last = self.editor.language_servers.incoming.is_empty();
497+
498+ if last || self.last_render.elapsed() > LSP_DEADLINE {
499+ self.render();
500+ self.last_render = Instant::now();
501+ }
502+ }
503+ EditorEvent::DebuggerEvent(payload) => {
504+ let needs_render = self.editor.handle_debugger_message(payload).await;
505+ if needs_render {
506+ self.render();
507+ }
508+ }
509+ EditorEvent::IdleTimer => {
510+ self.editor.clear_idle_timer();
511+ self.handle_idle_timeout();
512+
513+ #[cfg(feature = "integration")]
514+ {
515+ return true;
516+ }
517+ }
518+ }
519+
520+ false
521+ }
522+
520 pub fn handle_terminal_events(&mut self, event: Result<CrosstermEvent, crossterm::ErrorKind>) {
523 pub fn handle_terminal_events(&mut self, event: Result<CrosstermEvent, crossterm::ErrorKind>) {
521 let mut cx = crate::compositor::Context {
524 let mut cx = crate::compositor::Context {
522 editor: &mut self.editor,
525 editor: &mut self.editor,
helix-term/src/ui/mod.rs+3−3
@@ -14,7 +14,7 @@ mod statusline;
14mod text;
14mod text;
15
15
16use crate::compositor::{Component, Compositor};
16use crate::compositor::{Component, Compositor};
17−use crate::job;
17+use crate::job::{self, Callback};
18pub use completion::Completion;
18pub use completion::Completion;
19pub use editor::EditorView;
19pub use editor::EditorView;
20pub use markdown::Markdown;
20pub use markdown::Markdown;
@@ -121,7 +121,7 @@ pub fn regex_prompt(
121
121
122 if event == PromptEvent::Validate {
122 if event == PromptEvent::Validate {
123 let callback = async move {
123 let callback = async move {
124− let call: job::Callback = Box::new(
124+ let call: job::Callback = Callback::EditorCompositor(Box::new(
125 move |_editor: &mut Editor, compositor: &mut Compositor| {
125 move |_editor: &mut Editor, compositor: &mut Compositor| {
126 let contents = Text::new(format!("{}", err));
126 let contents = Text::new(format!("{}", err));
127 let size = compositor.size();
127 let size = compositor.size();
@@ -135,7 +135,7 @@ pub fn regex_prompt(
135
135
136 compositor.replace_or_push("invalid-regex", popup);
136 compositor.replace_or_push("invalid-regex", popup);
137 },
137 },
138− );
138+ ));
139 Ok(call)
139 Ok(call)
140 };
140 };
141
141