29d6a5a · helix · git.iko.soy

on master help sign in

Perform extend line on every selection (#1804)

29d6a5aIvan Tham5 years ago

helix-term/src/commands.rs+11−8

@@ -1841,17 +1841,20 @@ fn extend_line(cx: &mut Context) {

1841 let (view, doc) = current!(cx.editor);

1842

1843 let text = doc.text();

1844− let range = doc.selection(view.id).primary();

1844+ let selection = doc.selection(view.id).clone().transform(|range| {

1845+ let (start_line, end_line) = range.line_range(text.slice(..));

1845

1846

1846− let (start_line, end_line) = range.line_range(text.slice(..));

1847− let start = text.line_to_char(start_line);

1847+ let start = text.line_to_char(start_line);

1848− let mut end = text.line_to_char((end_line + count).min(text.len_lines()));

1848+ let mut end = text.line_to_char((end_line + count).min(text.len_lines()));

1849

1850+ // go to next line if current line is selected

1850− if range.from() == start && range.to() == end {

1851+ if range.from() == start && range.to() == end {

1851− end = text.line_to_char((end_line + count + 1).min(text.len_lines()));

1852+ end = text.line_to_char((end_line + count + 1).min(text.len_lines()));

1853+ }

1854+ Range::new(start, end)

1852− }

1855+ });

1853

1856

1854− doc.set_selection(view.id, Selection::single(start, end));

1857+ doc.set_selection(view.id, selection);

1855}

1858}

1856

1859

1857fn extend_to_line_bounds(cx: &mut Context) {

1860fn extend_to_line_bounds(cx: &mut Context) {