From 4996f1b4d380000bb2918b7f4a0dd8d6e06474f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Wed, 14 Oct 2020 12:09:55 +0900
Subject: [PATCH] Move insert mode commands to a separate namespace.

---
 helix-term/src/editor.rs   |  2 +-
 helix-view/src/commands.rs | 76 +++++++++++++++++++-------------------
 helix-view/src/keymap.rs   |  8 ++--
 3 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/helix-term/src/editor.rs b/helix-term/src/editor.rs
index 134dee50..3ebe5971 100644
--- a/helix-term/src/editor.rs
+++ b/helix-term/src/editor.rs
@@ -330,7 +330,7 @@ impl Editor {
                                     ..
                                 } = event
                                 {
-                                    commands::insert_char(view, c);
+                                    commands::insert::insert_char(view, c);
                                 }
                                 view.ensure_cursor_in_view();
 
diff --git a/helix-view/src/commands.rs b/helix-view/src/commands.rs
index 7fe9609e..2cc797f8 100644
--- a/helix-view/src/commands.rs
+++ b/helix-view/src/commands.rs
@@ -368,7 +368,6 @@ pub fn open_below(view: &mut View, _count: usize) {
     let transaction = Transaction::change(&view.state, changes).with_selection(selection);
 
     transaction.apply(&mut view.state);
-    // TODO: need to store into history if successful
 }
 
 // O inserts a new line before each line with a selection
@@ -420,48 +419,49 @@ pub fn goto_mode(view: &mut View, _count: usize) {
     view.state.mode = Mode::Goto;
 }
 
-// TODO: insert means add text just before cursor, on exit we should be on the last letter.
-pub fn insert_char(view: &mut View, c: char) {
-    let c = Tendril::from_char(c);
-    let transaction = Transaction::insert(&view.state, c);
+// NOTE: Transactions in this module get appended to history when we switch back to normal mode.
+pub mod insert {
+    use super::*;
+    // TODO: insert means add text just before cursor, on exit we should be on the last letter.
+    pub fn insert_char(view: &mut View, c: char) {
+        let c = Tendril::from_char(c);
+        let transaction = Transaction::insert(&view.state, c);
 
-    transaction.apply(&mut view.state);
-    // TODO: need to store into history if successful
-}
+        transaction.apply(&mut view.state);
+    }
 
-pub fn insert_tab(view: &mut View, _count: usize) {
-    insert_char(view, '\t');
-}
+    pub fn insert_tab(view: &mut View, _count: usize) {
+        insert_char(view, '\t');
+    }
 
-pub fn insert_newline(view: &mut View, _count: usize) {
-    insert_char(view, '\n');
-}
+    pub fn insert_newline(view: &mut View, _count: usize) {
+        insert_char(view, '\n');
+    }
 
-// TODO: handle indent-aware delete
-pub fn delete_char_backward(view: &mut View, count: usize) {
-    let text = &view.state.doc.slice(..);
-    let transaction = Transaction::change_by_selection(&view.state, |range| {
-        (
-            graphemes::nth_prev_grapheme_boundary(text, range.head, count),
-            range.head,
-            None,
-        )
-    });
-    transaction.apply(&mut view.state);
-    // TODO: need to store into history if successful
-}
+    // TODO: handle indent-aware delete
+    pub fn delete_char_backward(view: &mut View, count: usize) {
+        let text = &view.state.doc.slice(..);
+        let transaction = Transaction::change_by_selection(&view.state, |range| {
+            (
+                graphemes::nth_prev_grapheme_boundary(text, range.head, count),
+                range.head,
+                None,
+            )
+        });
+        transaction.apply(&mut view.state);
+    }
 
-pub fn delete_char_forward(view: &mut View, count: usize) {
-    let text = &view.state.doc.slice(..);
-    let transaction = Transaction::change_by_selection(&view.state, |range| {
-        (
-            range.head,
-            graphemes::nth_next_grapheme_boundary(text, range.head, count),
-            None,
-        )
-    });
-    transaction.apply(&mut view.state);
-    // TODO: need to store into history if successful
+    pub fn delete_char_forward(view: &mut View, count: usize) {
+        let text = &view.state.doc.slice(..);
+        let transaction = Transaction::change_by_selection(&view.state, |range| {
+            (
+                range.head,
+                graphemes::nth_next_grapheme_boundary(text, range.head, count),
+                None,
+            )
+        });
+        transaction.apply(&mut view.state);
+    }
 }
 
 // Undo / Redo
diff --git a/helix-view/src/keymap.rs b/helix-view/src/keymap.rs
index 1358827d..c3a4b8e7 100644
--- a/helix-view/src/keymap.rs
+++ b/helix-view/src/keymap.rs
@@ -186,19 +186,19 @@ pub fn default() -> Keymaps {
                 vec![Key {
                     code: KeyCode::Backspace,
                     modifiers: Modifiers::NONE
-                }] => commands::delete_char_backward,
+                }] => commands::insert::delete_char_backward,
                 vec![Key {
                     code: KeyCode::Delete,
                     modifiers: Modifiers::NONE
-                }] => commands::delete_char_forward,
+                }] => commands::insert::delete_char_forward,
                 vec![Key {
                     code: KeyCode::Enter,
                     modifiers: Modifiers::NONE
-                }] => commands::insert_newline,
+                }] => commands::insert::insert_newline,
                 vec![Key {
                     code: KeyCode::Tab,
                     modifiers: Modifiers::NONE
-                }] => commands::insert_tab,
+                }] => commands::insert::insert_tab,
             ),
             state::Mode::Goto => hashmap!(
                 vec![Key {