TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Factor out goto t/m/b into a single function again

Browse source
This commit is contained in:
Blaž Hrastnik 2021-07-04 18:07:58 +09:00
parent 6ce303977c
commit ebccc96cd4
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
helix-term/src/commands.rs
View file

@ -441,35 +441,35 @@ fn goto_first_nonwhitespace(cx: &mut Context) {
doc.set_selection(view.id, selection); doc.set_selection(view.id, selection);
} }
fn goto_window_top(cx: &mut Context) { fn goto_window(cx: &mut Context, align: Align) {
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
let scrolloff = PADDING.min(view.area.height as usize / 2); // TODO: user pref let scrolloff = PADDING.min(view.area.height as usize / 2); // TODO: user pref
let line = (view.first_line + scrolloff).min(view.last_line(doc).saturating_sub(scrolloff));
let last_line = view.last_line(doc);
let line = match align {
Align::Top => (view.first_line + scrolloff),
Align::Center => (view.first_line + (view.area.height as usize / 2)),
Align::Bottom => last_line.saturating_sub(scrolloff),
}
.min(last_line.saturating_sub(scrolloff));
let pos = doc.text().line_to_char(line); let pos = doc.text().line_to_char(line);
doc.set_selection(view.id, Selection::point(pos)); doc.set_selection(view.id, Selection::point(pos));
} }
fn goto_window_top(cx: &mut Context) {
goto_window(cx, Align::Top)
}
fn goto_window_middle(cx: &mut Context) { fn goto_window_middle(cx: &mut Context) {
let (view, doc) = current!(cx.editor); goto_window(cx, Align::Center)
let scrolloff = PADDING.min(view.area.height as usize / 2); // TODO: user pref
let line = view.first_line + (view.area.height as usize / 2);
let line = line.min(view.last_line(doc).saturating_sub(scrolloff));
let pos = doc.text().line_to_char(line);
doc.set_selection(view.id, Selection::point(pos));
} }
fn goto_window_bottom(cx: &mut Context) { fn goto_window_bottom(cx: &mut Context) {
let (view, doc) = current!(cx.editor); goto_window(cx, Align::Bottom)
let scrolloff = PADDING.min(view.area.height as usize / 2); // TODO: user pref
let line = view.last_line(doc).saturating_sub(scrolloff);
let pos = doc.text().line_to_char(line);
doc.set_selection(view.id, Selection::point(pos));
} }
// TODO: move vs extend could take an extra type Extend/Move that would // TODO: move vs extend could take an extra type Extend/Move that would
@ -3722,7 +3722,7 @@ mode_info! {
"i" => goto_implementation, "i" => goto_implementation,
/// window top /// window top
"t" => goto_window_top, "t" => goto_window_top,
/// window center /// window middle
"m" => goto_window_middle, "m" => goto_window_middle,
/// window bottom /// window bottom
"b" => goto_window_bottom, "b" => goto_window_bottom,