From 30b592fed944ed624d9ddab9fdf248e24cfcfd50 Mon Sep 17 00:00:00 2001 From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com> Date: Sun, 12 Jan 2025 20:10:23 +0000 Subject: [PATCH] refactor: clean up code and remove debugging statements --- helix-term/src/ui/editor.rs | 27 +++------------------------ helix-view/src/editor.rs | 1 + 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs index e8ba1d409..f86de5b81 100644 --- a/helix-term/src/ui/editor.rs +++ b/helix-term/src/ui/editor.rs @@ -1174,27 +1174,16 @@ impl EditorView { let editor = &mut cxt.editor; if let Some((pos, view_id)) = pos_and_view(editor, row, column, true) { - let click_type = editor.mouse_clicks.register_click(pos); - - let message; let prev_view_id = view!(editor).id; let doc = doc_mut!(editor, &view!(editor, view_id).doc); - match click_type { - MouseClick::Triple => { - message = format!("triple click: {:?}, {}", editor.mouse_clicks, pos); - } - MouseClick::Double => { - message = format!("double click: {:?}, {}", editor.mouse_clicks, pos); - } + match editor.mouse_clicks.register_click(pos) { + MouseClick::Triple => {} + MouseClick::Double => {} MouseClick::Single => { if modifiers == KeyModifiers::ALT { let selection = doc.selection(view_id).clone(); doc.set_selection(view_id, selection.push(Range::point(pos))); - message = format!( - "(alt) single click: {:?}, {}", - editor.mouse_clicks, pos - ); } else if editor.mode == Mode::Select { // Discards non-primary selections for consistent UX with normal mode let primary = doc.selection(view_id).primary().put_cursor( @@ -1202,20 +1191,12 @@ impl EditorView { pos, true, ); - message = format!( - "(select) single click: {:?}, {}", - editor.mouse_clicks, pos - ); - editor.mouse_down_range = Some(primary); doc.set_selection( view_id, Selection::single(primary.anchor, primary.head), ); } else { - message = - format!("single click: {:?}, {}", editor.mouse_clicks, pos); - doc.set_selection(view_id, Selection::point(pos)); } } @@ -1228,8 +1209,6 @@ impl EditorView { editor.focus(view_id); editor.ensure_cursor_in_view(view_id); - editor.set_status(message); - return EventResult::Consumed(None); } diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs index 9c54b02dd..f09fedb1d 100644 --- a/helix-view/src/editor.rs +++ b/helix-view/src/editor.rs @@ -105,6 +105,7 @@ impl MouseClicks { } } + /// Registers a click for a certain character, and returns the type of this click pub fn register_click(&mut self, char_idx: usize) -> MouseClick { let click_type = if self.is_triple_click(char_idx) { MouseClick::Triple