Move insert mode commands to a separate namespace.

imgbot
Blaž Hrastnik 4 years ago
parent 77ff51cef9
commit 4996f1b4d3

@ -330,7 +330,7 @@ impl Editor {
.. ..
} = event } = event
{ {
commands::insert_char(view, c); commands::insert::insert_char(view, c);
} }
view.ensure_cursor_in_view(); view.ensure_cursor_in_view();

@ -368,7 +368,6 @@ pub fn open_below(view: &mut View, _count: usize) {
let transaction = Transaction::change(&view.state, changes).with_selection(selection); let transaction = Transaction::change(&view.state, changes).with_selection(selection);
transaction.apply(&mut view.state); transaction.apply(&mut view.state);
// TODO: need to store into history if successful
} }
// O inserts a new line before each line with a selection // O inserts a new line before each line with a selection
@ -420,13 +419,15 @@ pub fn goto_mode(view: &mut View, _count: usize) {
view.state.mode = Mode::Goto; view.state.mode = Mode::Goto;
} }
// 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. // 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) { pub fn insert_char(view: &mut View, c: char) {
let c = Tendril::from_char(c); let c = Tendril::from_char(c);
let transaction = Transaction::insert(&view.state, c); let transaction = Transaction::insert(&view.state, c);
transaction.apply(&mut view.state); transaction.apply(&mut view.state);
// TODO: need to store into history if successful
} }
pub fn insert_tab(view: &mut View, _count: usize) { pub fn insert_tab(view: &mut View, _count: usize) {
@ -448,7 +449,6 @@ pub fn delete_char_backward(view: &mut View, count: usize) {
) )
}); });
transaction.apply(&mut view.state); transaction.apply(&mut view.state);
// TODO: need to store into history if successful
} }
pub fn delete_char_forward(view: &mut View, count: usize) { pub fn delete_char_forward(view: &mut View, count: usize) {
@ -461,7 +461,7 @@ pub fn delete_char_forward(view: &mut View, count: usize) {
) )
}); });
transaction.apply(&mut view.state); transaction.apply(&mut view.state);
// TODO: need to store into history if successful }
} }
// Undo / Redo // Undo / Redo

@ -186,19 +186,19 @@ pub fn default() -> Keymaps {
vec![Key { vec![Key {
code: KeyCode::Backspace, code: KeyCode::Backspace,
modifiers: Modifiers::NONE modifiers: Modifiers::NONE
}] => commands::delete_char_backward, }] => commands::insert::delete_char_backward,
vec![Key { vec![Key {
code: KeyCode::Delete, code: KeyCode::Delete,
modifiers: Modifiers::NONE modifiers: Modifiers::NONE
}] => commands::delete_char_forward, }] => commands::insert::delete_char_forward,
vec![Key { vec![Key {
code: KeyCode::Enter, code: KeyCode::Enter,
modifiers: Modifiers::NONE modifiers: Modifiers::NONE
}] => commands::insert_newline, }] => commands::insert::insert_newline,
vec![Key { vec![Key {
code: KeyCode::Tab, code: KeyCode::Tab,
modifiers: Modifiers::NONE modifiers: Modifiers::NONE
}] => commands::insert_tab, }] => commands::insert::insert_tab,
), ),
state::Mode::Goto => hashmap!( state::Mode::Goto => hashmap!(
vec![Key { vec![Key {

Loading…
Cancel
Save