2 files changed, 28 insertions, 4 deletions
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index b4cc9ae9..0a2ecf9c 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -173,6 +173,10 @@ impl Command {
         self.doc
     }
 
+    pub fn fun(&self) -> fn(&mut Context) {
+        self.fun
+    }
+
     #[rustfmt::skip]
     commands!(
         no_op, "Do nothing",
@@ -603,8 +607,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);
 }
@@ -3503,12 +3514,12 @@ fn open(cx: &mut Context, open: Open) {
 }
 
 // o inserts a new line after each line with a selection
-fn open_below(cx: &mut Context) {
+pub(crate) fn open_below(cx: &mut Context) {
     open(cx, Open::Below)
 }
 
 // O inserts a new line before each line with a selection
-fn open_above(cx: &mut Context) {
+pub(crate) 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 83be816f..c6d0e71f 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1023,6 +1023,19 @@ 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);
+                        }
                     }
                     _ => (),
                 }