diff options
Diffstat (limited to 'helix-term/src/keymap')
-rw-r--r-- | helix-term/src/keymap/default.rs | 10 | ||||
-rw-r--r-- | helix-term/src/keymap/macros.rs | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs index d80ab1ff..c84c616c 100644 --- a/helix-term/src/keymap/default.rs +++ b/helix-term/src/keymap/default.rs @@ -1,10 +1,10 @@ use std::collections::HashMap; use super::macros::keymap; -use super::{Keymap, Mode}; +use super::{KeyTrie, Mode}; use helix_core::hashmap; -pub fn default() -> HashMap<Mode, Keymap> { +pub fn default() -> HashMap<Mode, KeyTrie> { let normal = keymap!({ "Normal mode" "h" | "left" => move_char_left, "j" | "down" => move_visual_line_down, @@ -380,8 +380,8 @@ pub fn default() -> HashMap<Mode, Keymap> { "end" => goto_line_end_newline, }); hashmap!( - Mode::Normal => Keymap::new(normal), - Mode::Select => Keymap::new(select), - Mode::Insert => Keymap::new(insert), + Mode::Normal => normal, + Mode::Select => select, + Mode::Insert => insert, ) } diff --git a/helix-term/src/keymap/macros.rs b/helix-term/src/keymap/macros.rs index b2822069..15d2aa53 100644 --- a/helix-term/src/keymap/macros.rs +++ b/helix-term/src/keymap/macros.rs @@ -62,12 +62,11 @@ macro_rules! alt { }; } -/// Macro for defining the root of a `Keymap` object. Example: +/// Macro for defining a `KeyTrie`. Example: /// /// ``` /// # use helix_core::hashmap; /// # use helix_term::keymap; -/// # use helix_term::keymap::Keymap; /// let normal_mode = keymap!({ "Normal mode" /// "i" => insert_mode, /// "g" => { "Goto" @@ -76,7 +75,7 @@ macro_rules! alt { /// }, /// "j" | "down" => move_line_down, /// }); -/// let keymap = Keymap::new(normal_mode); +/// let keymap = normal_mode; /// ``` #[macro_export] macro_rules! keymap { |