Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow multi key remappings in config file #454

Merged
merged 18 commits into from
Jul 26, 2021
Merged

Allow multi key remappings in config file #454

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
76afb56
Use tree like structure to store keymaps
sudormrfbin Jul 11, 2021
47df8ce
Allow multi key keymaps in config file
sudormrfbin Jul 13, 2021
da83e46
Allow multi key keymaps in insert mode
sudormrfbin Jul 13, 2021
f427e6b
Make keymap state self contained
sudormrfbin Jul 19, 2021
03c6d25
Add keymap! macro for ergonomic declaration
sudormrfbin Jul 20, 2021
eed20ea
Add descriptions for editor commands
sudormrfbin Jul 21, 2021
039c0a2
Allow keymap! to take multiple keys
sudormrfbin Jul 21, 2021
d4ed5e3
Restore infobox display
sudormrfbin Jul 21, 2021
3095c45
Fix keymap merging and add infobox titles
sudormrfbin Jul 22, 2021
45eb8e1
Fix and add tests for keymaps
sudormrfbin Jul 23, 2021
4ee05d1
Clean up comments and apply suggestions
sudormrfbin Jul 24, 2021
652d1b6
Merge branch 'master' into keymap-refactor
sudormrfbin Jul 24, 2021
5b47cc8
Allow trailing commas in keymap!
sudormrfbin Jul 25, 2021
17b67c8
Remove mode suffixes from keymaps
sudormrfbin Jul 25, 2021
f4ad55a
Preserve order of keys when showing infobox
sudormrfbin Jul 25, 2021
ad7e412
Make command descriptions smaller
sudormrfbin Jul 26, 2021
0850e23
Strip infobox title prefix from items
sudormrfbin Jul 26, 2021
449d47b
Strip infobox title prefix from items
sudormrfbin Jul 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions helix-term/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ pub struct LspConfig {

#[test]
fn parsing_keymaps_config_file() {
use crate::keymap::{KeyTrie, Keymap};
use helix_core::hashmap;
use helix_view::{
document::Mode,
Expand All @@ -42,22 +43,22 @@ fn parsing_keymaps_config_file() {
toml::from_str::<Config>(sample_keymaps).unwrap(),
Config {
keys: Keymaps(hashmap! {
Mode::Insert => hashmap! {
Mode::Insert => Keymap::new(hashmap! {
sudormrfbin marked this conversation as resolved.
Show resolved Hide resolved
KeyEvent {
code: KeyCode::Char('y'),
modifiers: KeyModifiers::NONE,
} => Command::move_line_down,
} => KeyTrie::Leaf(Command::move_line_down),
KeyEvent {
code: KeyCode::Char('a'),
modifiers: KeyModifiers::SHIFT | KeyModifiers::CONTROL,
} => Command::delete_selection,
},
Mode::Normal => hashmap! {
} => KeyTrie::Leaf(Command::delete_selection),
}),
Mode::Normal => Keymap::new(hashmap! {
KeyEvent {
code: KeyCode::F(12),
modifiers: KeyModifiers::ALT,
} => Command::move_next_word_end,
},
} => KeyTrie::Leaf(Command::move_next_word_end),
}),
}),
..Default::default()
}
Expand Down
Loading