1 files changed, 37 insertions, 8 deletions
diff --git a/helix-core/src/commands.rs b/helix-core/src/commands.rs
index 70596045..c4e9f092 100644
--- a/helix-core/src/commands.rs
+++ b/helix-core/src/commands.rs
@@ -1,4 +1,7 @@
+use crate::selection::Range;
 use crate::state::{Direction, Granularity, Mode, State};
+use crate::transaction::{ChangeSet, Transaction};
+use crate::Tendril;
 
 /// A command is a function that takes the current state and a count, and does a side-effect on the
 /// state (usually by creating and applying a transaction).
@@ -49,22 +52,48 @@ pub fn move_line_down(state: &mut State, count: usize) {
     );
 }
 
+// avoid select by default by having a visual mode switch that makes movements into selects
+
+// insert mode:
+// first we calculate the correct cursors/selections
+// then we just append at each cursor
+// lastly, if it was append mode we shift cursor by 1?
+
+// inserts at the start of each selection
 pub fn insert_mode(state: &mut State, _count: usize) {
     state.mode = Mode::Insert;
+
+    state.selection = state
+        .selection
+        .clone()
+        .transform(|range| Range::new(range.to(), range.from()))
+}
+
+// inserts at the end of each selection
+pub fn append_mode(state: &mut State, _count: usize) {
+    state.mode = Mode::Insert;
+
+    // TODO: as transaction
+    state.selection = state.selection.clone().transform(|range| {
+        // TODO: to() + next char
+        Range::new(range.from(), range.to())
+    })
 }
 
+// I inserts at the start of each line with a selection
+// A inserts at the end of each line with a selection
+// o inserts a new line before each line with a selection
+// O inserts a new line after each line with a selection
+
 pub fn normal_mode(state: &mut State, _count: usize) {
     state.mode = Mode::Normal;
 }
 
 // TODO: insert means add text just before cursor, on exit we should be on the last letter.
-pub fn insert(state: &mut State, c: char) {
-    // TODO: needs to work with multiple cursors
-    use crate::transaction::ChangeSet;
+pub fn insert_char(state: &mut State, c: char) {
+    let c = Tendril::from_char(c);
+    let transaction = Transaction::insert(&state, c);
 
-    let pos = state.selection.primary().head;
-    let changes = ChangeSet::insert(&state.doc, pos, c);
-    // TODO: need to store history
-    changes.apply(&mut state.doc);
-    state.selection = state.selection.clone().map(&changes);
+    transaction.apply(state);
+    // TODO: need to store into history if successful
 }