From c955eaa6cd607621d8be091564b2fd6bf30f54c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Wed, 1 Dec 2021 13:40:54 +0900
Subject: [PATCH] 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.
---
 helix-term/src/commands.rs  | 19 ++++---------------
 helix-term/src/ui/editor.rs | 13 -------------
 2 files changed, 4 insertions(+), 28 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)
 }
 
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index a4fbca99..e1a6d178 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1026,19 +1026,6 @@ impl Component for EditorView {
                     (Mode::Insert, Mode::Normal) => {
                         // if exiting insert mode, remove completion
                         self.completion = None;
-
-                        let last_cmd = self.last_insert.0.fun();
-                        const OPEN_BELOW_FUN: fn(&mut commands::Context) = commands::open_below;
-                        const OPEN_ABOVE_FUN: fn(&mut commands::Context) = commands::open_above;
-                        // For user friendly,
-                        // Remove whitespaces if we go from insert mode(through open below/above) to normal mode without any keys in between.
-                        // Example: `o<esc>`.
-                        if matches!(last_cmd, OPEN_BELOW_FUN | OPEN_ABOVE_FUN)
-                            && self.last_insert.1.len() == 1
-                        {
-                            commands::Command::goto_line_start.execute(&mut cxt);
-                            commands::Command::kill_to_line_end.execute(&mut cxt);
-                        }
                     }
                     _ => (),
                 }