suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: clean up code and remove debugging statements

pull/12514/head
Nikita Revenco 2025-01-12 20:10:23 +00:00
parent 2b76e839ad
commit 30b592fed9
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
helix-term/src/ui/editor.rs
View File

@ -1174,27 +1174,16 @@ impl EditorView {
let editor = &mut cxt.editor; let editor = &mut cxt.editor;
if let Some((pos, view_id)) = pos_and_view(editor, row, column, true) { 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 prev_view_id = view!(editor).id;
let doc = doc_mut!(editor, &view!(editor, view_id).doc); let doc = doc_mut!(editor, &view!(editor, view_id).doc);
match click_type { match editor.mouse_clicks.register_click(pos) {
MouseClick::Triple => { MouseClick::Triple => {}
message = format!("triple click: {:?}, {}", editor.mouse_clicks, pos); MouseClick::Double => {}
}
MouseClick::Double => {
message = format!("double click: {:?}, {}", editor.mouse_clicks, pos);
}
MouseClick::Single => { MouseClick::Single => {
if modifiers == KeyModifiers::ALT { if modifiers == KeyModifiers::ALT {
let selection = doc.selection(view_id).clone(); let selection = doc.selection(view_id).clone();
doc.set_selection(view_id, selection.push(Range::point(pos))); 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 { } else if editor.mode == Mode::Select {
// Discards non-primary selections for consistent UX with normal mode // Discards non-primary selections for consistent UX with normal mode
let primary = doc.selection(view_id).primary().put_cursor( let primary = doc.selection(view_id).primary().put_cursor(
@ -1202,20 +1191,12 @@ impl EditorView {
pos, pos,
true, true,
); );
message = format!(
"(select) single click: {:?}, {}",
editor.mouse_clicks, pos
);
editor.mouse_down_range = Some(primary); editor.mouse_down_range = Some(primary);
doc.set_selection( doc.set_selection(
view_id, view_id,
Selection::single(primary.anchor, primary.head), Selection::single(primary.anchor, primary.head),
); );
} else { } else {
message =
format!("single click: {:?}, {}", editor.mouse_clicks, pos);
doc.set_selection(view_id, Selection::point(pos)); doc.set_selection(view_id, Selection::point(pos));
} }
} }
@ -1228,8 +1209,6 @@ impl EditorView {
editor.focus(view_id); editor.focus(view_id);
editor.ensure_cursor_in_view(view_id); editor.ensure_cursor_in_view(view_id);
editor.set_status(message);
return EventResult::Consumed(None); return EventResult::Consumed(None);
} }

1
helix-view/src/editor.rs
View File

@ -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 { pub fn register_click(&mut self, char_idx: usize) -> MouseClick {
let click_type = if self.is_triple_click(char_idx) { let click_type = if self.is_triple_click(char_idx) {
MouseClick::Triple MouseClick::Triple