c955eaa · helix · git.iko.soy

git.iko.soy/helix

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.

commitc955eaa6cd607621d8be091564b2fd6bf30f54c3 authorBlaž Hrastnik <blaz@mxxn.io> dateWed 1 Dec 2021, 13:40 (5 years ago) parent662ecf0

2 files changed+4−28

compare with master

unifiedsplit

helix-term/src/commands.rs+4−15 helix-term/src/ui/editor.rs−13

helix-term/src/commands.rs+4−15

@@ -173,10 +173,6 @@ impl Command {

173173 self.doc

174174 }

175175

176− pub fn fun(&self) -> fn(&mut Context) {

177− self.fun

178− }

179−

180176 #[rustfmt::skip]

181177 commands!(

182178 no_op, "Do nothing",

@@ -607,15 +603,8 @@ fn kill_to_line_end(cx: &mut Context) {

607603

608604 let selection = doc.selection(view.id).clone().transform(|range| {

609605 let line = range.cursor_line(text);

610− let line_end_pos = line_end_char_index(&text, line);

611− let pos = range.cursor(text);

612−

613− let mut new_range = range.put_cursor(text, line_end_pos, true);

614− // don't want to remove the line separator itself if the cursor doesn't reach the end of line.

615− if pos != line_end_pos {

616− new_range.head = line_end_pos;

617− }

618− new_range

606+ let pos = line_end_char_index(&text, line);

607+ range.put_cursor(text, pos, true)

619608 });

620609 delete_selection_insert_mode(doc, view, &selection);

621610}

@@ -3512,12 +3501,12 @@ fn open(cx: &mut Context, open: Open) {

35123501}

35133502

35143503// o inserts a new line after each line with a selection

3515−pub(crate) fn open_below(cx: &mut Context) {

3504+fn open_below(cx: &mut Context) {

35163505 open(cx, Open::Below)

35173506}

35183507

35193508// O inserts a new line before each line with a selection

3520−pub(crate) fn open_above(cx: &mut Context) {

3509+fn open_above(cx: &mut Context) {

35213510 open(cx, Open::Above)

35223511}

35233512

helix-term/src/ui/editor.rs−13

@@ -1026,19 +1026,6 @@ impl Component for EditorView {

10261026 (Mode::Insert, Mode::Normal) => {

10271027 // if exiting insert mode, remove completion

10281028 self.completion = None;

1029−

1030− let last_cmd = self.last_insert.0.fun();

1031− const OPEN_BELOW_FUN: fn(&mut commands::Context) = commands::open_below;

1032− const OPEN_ABOVE_FUN: fn(&mut commands::Context) = commands::open_above;

1033− // For user friendly,

1034− // Remove whitespaces if we go from insert mode(through open below/above) to normal mode without any keys in between.

1035− // Example: `o<esc>`.

1036− if matches!(last_cmd, OPEN_BELOW_FUN | OPEN_ABOVE_FUN)

1037− && self.last_insert.1.len() == 1

1038− {

1039− commands::Command::goto_line_start.execute(&mut cxt);

1040− commands::Command::kill_to_line_end.execute(&mut cxt);

1041− }

10421029 }

10431030 _ => (),

10441031 }