Skip to content

Commit

Permalink
Add shrink equivalent of extend_to_line_bounds
Browse files Browse the repository at this point in the history
  • Loading branch information
EpocSquadron committed May 10, 2022
1 parent 40647f0 commit 8bfe5ee
Showing 1 changed file with 41 additions and 0 deletions.
41 changes: 41 additions & 0 deletions helix-term/src/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ impl MappableCommand {
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)",
shrink_to_line_bounds, "Shrink selection to line bounds (line-wise selection)",
delete_selection, "Delete selection",
delete_selection_noyank, "Delete selection, without yanking",
change_selection, "Change selection (delete and enter insert mode)",
Expand Down Expand Up @@ -1937,6 +1938,46 @@ fn extend_to_line_bounds(cx: &mut Context) {
);
}

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

doc.set_selection(
view.id,
doc.selection(view.id).clone().transform(|range| {
let text = doc.text();

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

// Do nothing if the selection is within one line to prevent
// conditional logic for the behavior of this command
if start_line == end_line {
return range;
}

let mut start = text.line_to_char(start_line);

// line_to_char gives us the start position of the line, so
// we need to get the start position of the next line, then
// backtrack to get the end position of the last line.
let mut end = text.line_to_char(end_line + 1) - 1;

if start != range.from() {
start = text.line_to_char((start_line + 1).min(text.len_lines()));
}

if end != range.to() {
end = text.line_to_char(end_line).saturating_sub(1);
}

if range.anchor <= range.head {
Range::new(start, end)
} else {
Range::new(end, start)
}
}),
);
}

enum Operation {
Delete,
Change,
Expand Down

0 comments on commit 8bfe5ee

Please sign in to comment.