From 93e276cd9d7f121a4dcce6ea03d1c39fec4d3bc9 Mon Sep 17 00:00:00 2001 From: WindSoilder Date: Tue, 7 Dec 2021 00:44:04 +0800 Subject: [PATCH] Make kill_to_line_end behave like emacs (#1235) --- helix-term/src/commands.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index 3d583ba8..3e7ce712 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -670,8 +670,15 @@ fn kill_to_line_end(cx: &mut Context) { let selection = doc.selection(view.id).clone().transform(|range| { let line = range.cursor_line(text); - let pos = line_end_char_index(&text, line); - range.put_cursor(text, pos, true) + let line_end_pos = line_end_char_index(&text, line); + let pos = range.cursor(text); + + let mut new_range = range.put_cursor(text, line_end_pos, true); + // don't want to remove the line separator itself if the cursor doesn't reach the end of line. + if pos != line_end_pos { + new_range.head = line_end_pos; + } + new_range }); delete_selection_insert_mode(doc, view, &selection); }