Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add command to extend selection to line above #2117

Merged
merged 3 commits into from
Apr 17, 2022
Merged

Add command to extend selection to line above #2117

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8ee64b
added command to extend selection to line above
AntonioLucibello Apr 15, 2022
b6e4521
fixed view not scrolling up when reaching top of the screen
AntonioLucibello Apr 15, 2022
08a98c4
refactored shared code into separate impl
AntonioLucibello Apr 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions helix-term/src/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ impl MappableCommand {
search_selection, "Use current selection as search pattern",
global_search, "Global Search in workspace folder",
extend_line, "Select current line, if already selected, extend to next line",
extend_line_above, "Select current line, if already selected, extend to previous line",
extend_to_line_bounds, "Extend selection to line bounds (line-wise selection)",
delete_selection, "Delete selection",
delete_selection_noyank, "Delete selection, without yanking",
Expand Down Expand Up @@ -1875,6 +1876,27 @@ fn extend_line(cx: &mut Context) {
doc.set_selection(view.id, selection);
}

fn extend_line_above(cx: &mut Context) {
let count = cx.count();
let (view, doc) = current!(cx.editor);

let text = doc.text();
let selection = doc.selection(view.id).clone().transform(|range| {
let (start_line, end_line) = range.line_range(text.slice(..));

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

// go to previous line if current line is selected
if range.from() == start && range.to() == end {
start = text.line_to_char(start_line.saturating_sub(1));
}
Range::new(end, start)
});

doc.set_selection(view.id, selection);
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a lot of duplication for essentially changing two lines. Can you factor out the common implementation in a similar way we do for other commands like https://github.com/helix-editor/helix/blob/b6e452151196bf773874d266f9bf82e7386e56ef/helix-term/src/commands.rs#L4349-L4380=


fn extend_to_line_bounds(cx: &mut Context) {
let (view, doc) = current!(cx.editor);

Expand Down