diff options
Diffstat (limited to 'src/input/key_bindings.rs')
| -rw-r--r-- | src/input/key_bindings.rs | 149 |
1 files changed, 116 insertions, 33 deletions
diff --git a/src/input/key_bindings.rs b/src/input/key_bindings.rs index e176416..66cb122 100644 --- a/src/input/key_bindings.rs +++ b/src/input/key_bindings.rs @@ -3,48 +3,107 @@ use crate::input::{Event, KeyCode, KeyEvent, KeyModifiers}; /// Represents a mapping between an input event and an action. #[derive(Debug)] #[non_exhaustive] -pub(crate) struct KeyBindings<CustomKeybinding: crate::input::CustomKeybinding, CustomEvent: crate::input::CustomEvent> -{ +pub(crate) struct KeyBindings { /// Key bindings for redoing a change. - pub(crate) redo: Vec<Event<CustomEvent>>, + pub(crate) redo: Vec<Event>, /// Key bindings for undoing a change. - pub(crate) undo: Vec<Event<CustomEvent>>, + pub(crate) undo: Vec<Event>, /// Key bindings for scrolling down. - pub(crate) scroll_down: Vec<Event<CustomEvent>>, + pub(crate) scroll_down: Vec<Event>, /// Key bindings for scrolling to the end. - pub(crate) scroll_end: Vec<Event<CustomEvent>>, + pub(crate) scroll_end: Vec<Event>, /// Key bindings for scrolling to the start. - pub(crate) scroll_home: Vec<Event<CustomEvent>>, + pub(crate) scroll_home: Vec<Event>, /// Key bindings for scrolling to the left. - pub(crate) scroll_left: Vec<Event<CustomEvent>>, + pub(crate) scroll_left: Vec<Event>, /// Key bindings for scrolling to the right. - pub(crate) scroll_right: Vec<Event<CustomEvent>>, + pub(crate) scroll_right: Vec<Event>, /// Key bindings for scrolling up. - pub(crate) scroll_up: Vec<Event<CustomEvent>>, + pub(crate) scroll_up: Vec<Event>, /// Key bindings for scrolling down a step. - pub(crate) scroll_step_down: Vec<Event<CustomEvent>>, + pub(crate) scroll_step_down: Vec<Event>, /// Key bindings for scrolling up a step. - pub(crate) scroll_step_up: Vec<Event<CustomEvent>>, + pub(crate) scroll_step_up: Vec<Event>, /// Key bindings for help. - pub(crate) help: Vec<Event<CustomEvent>>, + pub(crate) help: Vec<Event>, /// Key bindings for starting search. - pub(crate) search_start: Vec<Event<CustomEvent>>, + pub(crate) search_start: Vec<Event>, /// Key bindings for next search match. - pub(crate) search_next: Vec<Event<CustomEvent>>, + pub(crate) search_next: Vec<Event>, /// Key bindings for previous search match. - pub(crate) search_previous: Vec<Event<CustomEvent>>, + pub(crate) search_previous: Vec<Event>, - /// Custom keybindings - pub(crate) custom: CustomKeybinding, + /// Key bindings for aborting. + pub(crate) abort: Vec<Event>, + /// Key bindings for the break action. + pub(crate) action_break: Vec<Event>, + /// Key bindings for the drop action. + pub(crate) action_drop: Vec<Event>, + /// Key bindings for the edit action. + pub(crate) action_edit: Vec<Event>, + /// Key bindings for the fixup action. + pub(crate) action_fixup: Vec<Event>, + /// Key bindings for the pick action. + pub(crate) action_pick: Vec<Event>, + /// Key bindings for the reword action. + pub(crate) action_reword: Vec<Event>, + /// Key bindings for the squash action. + pub(crate) action_squash: Vec<Event>, + /// Key bindings for positive confirmation. + pub(crate) confirm_yes: Vec<Event>, + /// Key bindings for editing. + pub(crate) edit: Vec<Event>, + /// Key bindings for forcing an abort. + pub(crate) force_abort: Vec<Event>, + /// Key bindings for forcing a rebase. + pub(crate) force_rebase: Vec<Event>, + /// Key bindings for inserting a line. + pub(crate) insert_line: Vec<Event>, + /// Key bindings for moving down. + pub(crate) move_down: Vec<Event>, + /// Key bindings for moving down a step. + pub(crate) move_down_step: Vec<Event>, + /// Key bindings for moving to the end. + pub(crate) move_end: Vec<Event>, + /// Key bindings for moving to the start. + pub(crate) move_home: Vec<Event>, + /// Key bindings for moving to the left. + pub(crate) move_left: Vec<Event>, + /// Key bindings for moving to the right. + pub(crate) move_right: Vec<Event>, + /// Key bindings for moving the selection down. + pub(crate) move_selection_down: Vec<Event>, + /// Key bindings for moving the selection up. + pub(crate) move_selection_up: Vec<Event>, + /// Key bindings for moving up. + pub(crate) move_up: Vec<Event>, + /// Key bindings for moving up a step. + pub(crate) move_up_step: Vec<Event>, + /// Key bindings for opening the external editor. + pub(crate) open_in_external_editor: Vec<Event>, + /// Key bindings for rebasing. + pub(crate) rebase: Vec<Event>, + /// Key bindings for removing a line. + pub(crate) remove_line: Vec<Event>, + /// Key bindings for showing a commit. + pub(crate) show_commit: Vec<Event>, + /// Key bindings for showing a diff. + pub(crate) show_diff: Vec<Event>, + /// Key bindings for toggling visual mode. + pub(crate) toggle_visual_mode: Vec<Event>, + /// Key bindings for the fixup specific action to toggle the c option. + pub(crate) fixup_keep_message: Vec<Event>, + /// Key biding for the fixup specific action to toggle the C option. + pub(crate) fixup_keep_message_with_editor: Vec<Event>, } /// Map a keybinding to a list of events. #[must_use] #[allow(clippy::string_slice, clippy::missing_panics_doc)] -pub(crate) fn map_keybindings<CustomEvent: crate::input::CustomEvent>(bindings: &[String]) -> Vec<Event<CustomEvent>> { +pub(crate) fn map_keybindings(bindings: &[String]) -> Vec<Event> { bindings .iter() .map(|b| { @@ -91,9 +150,7 @@ pub(crate) fn map_keybindings<CustomEvent: crate::input::CustomEvent>(bindings: .collect() } -impl<CustomKeybinding: crate::input::CustomKeybinding, CustomEvent: crate::input::CustomEvent> - KeyBindings<CustomKeybinding, CustomEvent> -{ +impl KeyBindings { /// Create a new instance from the configuration keybindings. #[must_use] pub(crate) fn new(key_bindings: &crate::config::KeyBindings) -> Self { @@ -112,7 +169,37 @@ impl<CustomKeybinding: crate::input::CustomKeybinding, CustomEvent: crate::input search_start: map_keybindings(&key_bindings.search_start), search_next: map_keybindings(&key_bindings.search_next), search_previous: map_keybindings(&key_bindings.search_previous), - custom: CustomKeybinding::new(key_bindings), + abort: map_keybindings(&key_bindings.abort), + action_break: map_keybindings(&key_bindings.action_break), + action_drop: map_keybindings(&key_bindings.action_drop), + action_edit: map_keybindings(&key_bindings.action_edit), + action_fixup: map_keybindings(&key_bindings.action_fixup), + action_pick: map_keybindings(&key_bindings.action_pick), + action_reword: map_keybindings(&key_bindings.action_reword), + action_squash: map_keybindings(&key_bindings.action_squash), + edit: map_keybindings(&key_bindings.edit), + force_abort: map_keybindings(&key_bindings.force_abort), + force_rebase: map_keybindings(&key_bindings.force_rebase), + insert_line: map_keybindings(&key_bindings.insert_line), + move_down: map_keybindings(&key_bindings.move_down), + move_down_step: map_keybindings(&key_bindings.move_down_step), + move_end: map_keybindings(&key_bindings.move_end), + move_home: map_keybindings(&key_bindings.move_home), + move_left: map_keybindings(&key_bindings.move_left), + move_right: map_keybindings(&key_bindings.move_right), + move_selection_down: map_keybindings(&key_bindings.move_selection_down), + move_selection_up: map_keybindings(&key_bindings.move_selection_up), + move_up: map_keybindings(&key_bindings.move_up), + move_up_step: map_keybindings(&key_bindings.move_up_step), + open_in_external_editor: map_keybindings(&key_bindings.open_in_external_editor), + rebase: map_keybindings(&key_bindings.rebase), + remove_line: map_keybindings(&key_bindings.remove_line), + show_commit: map_keybindings(&key_bindings.show_commit), + show_diff: map_keybindings(&key_bindings.show_diff), + toggle_visual_mode: map_keybindings(&key_bindings.toggle_visual_mode), + confirm_yes: map_keybindings(&key_bindings.confirm_yes), + fixup_keep_message: map_keybindings(&key_bindings.fixup_keep_message), + fixup_keep_message_with_editor: map_keybindings(&key_bindings.fixup_keep_message_with_editor), } } } @@ -122,22 +209,20 @@ mod tests { use rstest::rstest; use super::*; - use crate::input::testutil::local::{TestEvent, TestKeybinding}; #[test] fn new() { - let _key_bindings = KeyBindings::<TestKeybinding, TestEvent>::new(&crate::config::KeyBindings::new()); + let _key_bindings = KeyBindings::new(&crate::config::KeyBindings::new()); } #[test] fn map_keybindings_with_modifiers() { - assert_eq!( - map_keybindings::<TestEvent>(&[String::from("ControlAltShiftUp")]), - vec![Event::Key(KeyEvent::new( + assert_eq!(map_keybindings(&[String::from("ControlAltShiftUp")]), vec![Event::Key( + KeyEvent::new( KeyCode::Up, KeyModifiers::CONTROL | KeyModifiers::ALT | KeyModifiers::SHIFT - ))] - ); + ) + )]); } #[rstest] @@ -160,8 +245,6 @@ mod tests { #[case::function_out_of_range("F10000", KeyCode::F(1))] #[case::char("a", KeyCode::Char('a'))] fn map_keybindings_key_code(#[case] binding: &str, #[case] key_code: KeyCode) { - assert_eq!(map_keybindings::<TestEvent>(&[String::from(binding)]), vec![ - Event::from(key_code) - ]); + assert_eq!(map_keybindings(&[String::from(binding)]), vec![Event::from(key_code)]); } } |