From 29d6a5a9b6fde7b9e82b6abceef892fba42d8da4 Mon Sep 17 00:00:00 2001 From: Ivan Tham Date: Mon, 14 Mar 2022 10:45:45 +0800 Subject: [PATCH] Perform extend line on every selection (#1804) Currently `x` only affect the current selection, but this will make it affect every selection so `x` can be more useful with multi-cursors. --- helix-term/src/commands.rs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index fc5dc16d..ff3fb925 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -1841,17 +1841,20 @@ fn extend_line(cx: &mut Context) { let (view, doc) = current!(cx.editor); let text = doc.text(); - let range = doc.selection(view.id).primary(); + let selection = doc.selection(view.id).clone().transform(|range| { + let (start_line, end_line) = range.line_range(text.slice(..)); - let (start_line, end_line) = range.line_range(text.slice(..)); - let start = text.line_to_char(start_line); - let mut end = text.line_to_char((end_line + count).min(text.len_lines())); + let start = text.line_to_char(start_line); + let mut end = text.line_to_char((end_line + count).min(text.len_lines())); - if range.from() == start && range.to() == end { - end = text.line_to_char((end_line + count + 1).min(text.len_lines())); - } + // go to next line if current line is selected + if range.from() == start && range.to() == end { + end = text.line_to_char((end_line + count + 1).min(text.len_lines())); + } + Range::new(start, end) + }); - doc.set_selection(view.id, Selection::single(start, end)); + doc.set_selection(view.id, selection); } fn extend_to_line_bounds(cx: &mut Context) {