8c3a5b1 · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

Add `goto_last_line` command, and bind it to `ge`.

8c3a5b1Nathan Vegdahl5 years ago

helix-term/src/commands.rs+22−1

compare with master

unifiedsplit

@@ -237,6 +237,7 @@ impl Command {

237 goto_window_bottom, "Goto window bottom",

238 goto_last_accessed_file, "Goto last accessed file",

239 goto_line, "Goto line",

240+ goto_last_line, "Goto last line",

240 goto_first_diag, "Goto first diagnostic",

241 goto_first_diag, "Goto first diagnostic",

241 goto_last_diag, "Goto last diagnostic",

242 goto_last_diag, "Goto last diagnostic",

242 goto_next_diag, "Goto next diagnostic",

243 goto_next_diag, "Goto next diagnostic",

@@ -2426,12 +2427,32 @@ fn goto_line(cx: &mut Context) {

2426 push_jump(cx.editor);

2427 push_jump(cx.editor);

2427

2428

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

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

2430+ let max_line = if doc.text().line(doc.text().len_lines() - 1).len_chars() == 0 {

2431+ // If the last line is blank, don't jump to it.

2432+ doc.text().len_lines().saturating_sub(2)

2433+ } else {

2434+ doc.text().len_lines() - 1

2435+ };

2429− let line_idx = std::cmp::min(count.get() - 1, doc.text().len_lines().saturating_sub(2));

2436+ let line_idx = std::cmp::min(count.get() - 1, max_line);

2430 let pos = doc.text().line_to_char(line_idx);

2437 let pos = doc.text().line_to_char(line_idx);

2431 doc.set_selection(view.id, Selection::point(pos));

2438 doc.set_selection(view.id, Selection::point(pos));

2432 }

2439 }

2433}

2440}

2434

2441

2442+fn goto_last_line(cx: &mut Context) {

2443+ push_jump(cx.editor);

2444+

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

2446+ let line_idx = if doc.text().line(doc.text().len_lines() - 1).len_chars() == 0 {

2447+ // If the last line is blank, don't jump to it.

2448+ doc.text().len_lines().saturating_sub(2)

2449+ } else {

2450+ doc.text().len_lines() - 1

2451+ };

2452+ let pos = doc.text().line_to_char(line_idx);

2453+ doc.set_selection(view.id, Selection::point(pos));

2454+}

2455+

2435fn goto_last_accessed_file(cx: &mut Context) {

2456fn goto_last_accessed_file(cx: &mut Context) {

2436 let alternate_file = view!(cx.editor).last_accessed_doc;

2457 let alternate_file = view!(cx.editor).last_accessed_doc;

2437 if let Some(alt) = alternate_file {

2458 if let Some(alt) = alternate_file {

helix-term/src/keymap.rs+2−2

@@ -359,7 +359,7 @@ impl Default for Keymaps {

359 "G" => goto_line,

360 "g" => { "Goto"

361 "g" => goto_file_start,

362− "e" => goto_file_end,

362+ "e" => goto_last_line,

363 "h" => goto_line_start,

364 "l" => goto_line_end,

365 "s" => goto_first_nonwhitespace,

@@ -617,7 +617,7 @@ fn merge_partial_keys() {

617 // Assumes that `ge` is in default keymap

618 assert_eq!(

619 keymap.root().search(&[key!('g'), key!('e')]).unwrap(),

620− &KeyTrie::Leaf(Command::goto_file_end),

620+ &KeyTrie::Leaf(Command::goto_last_line),

621 "Old leaves in subnode should be present in merged node"

622 );

623