andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-26 03:13:29 +04:00
Code Issues Projects Releases Wiki Activity

goto end of file if count is not present

Browse Source
This commit is contained in:
GiM 2023-09-01 13:26:51 +02:00
parent a38ec6d6ca
commit ced96cff2d
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
helix-term/src/commands.rs
View File

@ -3105,33 +3105,35 @@ fn push_jump(view: &mut View, doc: &Document) {
} }
fn goto_line(cx: &mut Context) { fn goto_line(cx: &mut Context) {
if cx.count.is_some() { let (view, doc) = current!(cx.editor);
let (view, doc) = current!(cx.editor); push_jump(view, doc);
push_jump(view, doc);
goto_line_without_jumplist(cx.editor, cx.count); goto_line_without_jumplist(cx.editor, cx.count);
}
} }
fn goto_line_without_jumplist(editor: &mut Editor, count: Option<NonZeroUsize>) { fn goto_line_without_jumplist(editor: &mut Editor, count: Option<NonZeroUsize>) {
if let Some(count) = count { let (view, doc) = current!(editor);
let (view, doc) = current!(editor); let text = doc.text().slice(..);
let text = doc.text().slice(..); let max_line = if text.line(text.len_lines() - 1).len_chars() == 0 {
let max_line = if text.line(text.len_lines() - 1).len_chars() == 0 { // If the last line is blank, don't jump to it.
// If the last line is blank, don't jump to it. text.len_lines().saturating_sub(2)
text.len_lines().saturating_sub(2) } else {
} else { text.len_lines() - 1
text.len_lines() - 1 };
};
let line_idx = std::cmp::min(count.get() - 1, max_line);
let pos = text.line_to_char(line_idx);
let selection = doc
.selection(view.id)
.clone()
.transform(|range| range.put_cursor(text, pos, editor.mode == Mode::Select));
doc.set_selection(view.id, selection); let line_idx = if let Some(count) = count {
} std::cmp::min(count.get() - 1, max_line)
} else {
max_line
};
let pos = text.line_to_char(line_idx);
let selection = doc
.selection(view.id)
.clone()
.transform(|range| range.put_cursor(text, pos, editor.mode == Mode::Select));
doc.set_selection(view.id, selection);
} }
fn goto_last_line(cx: &mut Context) { fn goto_last_line(cx: &mut Context) {