From 67017e533691e383363079dccbecbb2afb021be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Mon, 7 Sep 2020 17:17:14 +0900
Subject: [PATCH] append mode

---
 helix-core/src/commands.rs | 5 ++++-
 helix-term/src/keymap.rs   | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/helix-core/src/commands.rs b/helix-core/src/commands.rs
index c4e9f0926..37d59946a 100644
--- a/helix-core/src/commands.rs
+++ b/helix-core/src/commands.rs
@@ -1,3 +1,4 @@
+use crate::graphemes::next_grapheme_boundary;
 use crate::selection::Range;
 use crate::state::{Direction, Granularity, Mode, State};
 use crate::transaction::{ChangeSet, Transaction};
@@ -74,9 +75,10 @@ pub fn append_mode(state: &mut State, _count: usize) {
     state.mode = Mode::Insert;
 
     // TODO: as transaction
+    let text = &state.doc.slice(..);
     state.selection = state.selection.clone().transform(|range| {
         // TODO: to() + next char
-        Range::new(range.from(), range.to())
+        Range::new(range.from(), next_grapheme_boundary(text, range.to()))
     })
 }
 
@@ -86,6 +88,7 @@ pub fn append_mode(state: &mut State, _count: usize) {
 // O inserts a new line after each line with a selection
 
 pub fn normal_mode(state: &mut State, _count: usize) {
+    // TODO: if leaving append mode, move cursor back by 1
     state.mode = Mode::Normal;
 }
 
diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index ddbff3ea4..4b176b613 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -120,6 +120,10 @@ pub fn default() -> Keymap {
             code: KeyCode::Char('i'),
             modifiers: Modifiers::NONE
         } => commands::insert_mode as Command,
+        Key {
+            code: KeyCode::Char('a'),
+            modifiers: Modifiers::NONE
+        } => commands::append_mode as Command,
         Key {
             code: KeyCode::Esc,
             modifiers: Modifiers::NONE