diff options
author | Blaž Hrastnik | 2021-12-01 04:40:54 +0000 |
---|---|---|
committer | Blaž Hrastnik | 2021-12-01 04:40:54 +0000 |
commit | c955eaa6cd607621d8be091564b2fd6bf30f54c3 (patch) | |
tree | 05ca244e8158d7933d8180ec103c6d1bd8675767 /helix-term/src/commands.rs | |
parent | 662ecf0cd439bc850eee37717ecb49eebf497a24 (diff) |
Revert "Improve dedent behavior, make kill_to_line_end behave like emacs (#1173)"
1. pressing o on a line with no indentation will open a new line as
expected, but esc will then delete the line altogether
2. the kill_line behavior happens after insert mode changes are already
commited to history, and the change isn't commited. pressing u after
this will break highlighting & undo history
This reverts commit c08d2fae587a0a5dd2a1e2e44a1f385d142c9d59.
Diffstat (limited to 'helix-term/src/commands.rs')
-rw-r--r-- | helix-term/src/commands.rs | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index f938b719..93703953 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -173,10 +173,6 @@ impl Command { self.doc } - pub fn fun(&self) -> fn(&mut Context) { - self.fun - } - #[rustfmt::skip] commands!( no_op, "Do nothing", @@ -607,15 +603,8 @@ fn kill_to_line_end(cx: &mut Context) { let selection = doc.selection(view.id).clone().transform(|range| { let line = range.cursor_line(text); - 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 + let pos = line_end_char_index(&text, line); + range.put_cursor(text, pos, true) }); delete_selection_insert_mode(doc, view, &selection); } @@ -3512,12 +3501,12 @@ fn open(cx: &mut Context, open: Open) { } // o inserts a new line after each line with a selection -pub(crate) fn open_below(cx: &mut Context) { +fn open_below(cx: &mut Context) { open(cx, Open::Below) } // O inserts a new line before each line with a selection -pub(crate) fn open_above(cx: &mut Context) { +fn open_above(cx: &mut Context) { open(cx, Open::Above) } |