aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJJ2023-11-01 01:19:02 +0000
committerJJ2023-11-01 04:08:47 +0000
commit7260812a720336111dc4643c9852e34820745338 (patch)
treed8398e3779b4aaad3c6cc749673a1b55ef44df7f
parent368995b51f2b0b8574a87ebe04749cb556b4c538 (diff)
Add unbind-default-keys config option
ref: https://github.com/helix-editor/helix/issues/2720 ref: https://github.com/helix-editor/helix/pull/2733 Co-authored-by: Linden Krouse <ztaticnull@gmail.com>
-rw-r--r--book/src/remapping.md19
-rw-r--r--helix-term/src/config.rs12
-rw-r--r--helix-term/src/keymap.rs7
3 files changed, 34 insertions, 4 deletions
diff --git a/book/src/remapping.md b/book/src/remapping.md
index d762c6ad..cc27eed7 100644
--- a/book/src/remapping.md
+++ b/book/src/remapping.md
@@ -75,5 +75,24 @@ Ctrl, Shift and Alt modifiers are encoded respectively with the prefixes
Keys can be disabled by binding them to the `no_op` command.
+
+To remove all default bindings, `unbind-default-keys = true` can be added to the top level configuration.
+
+```toml
+unbind-default-keys = true
+
+# Only these normal mode bindings will be used
+[keys.normal]
+n = "normal_mode"
+t = "goto_definition"
+
+# remember to add bindings to return to normal mode
+[keys.select]
+esc = "normal_mode"
+
+[keys.insert]
+esc = "normal_mode"
+```
+
A list of commands is available in the [Keymap](https://docs.helix-editor.com/keymap.html) documentation
and in the source code at [`helix-term/src/commands.rs`](https://github.com/helix-editor/helix/blob/master/helix-term/src/commands.rs) at the invocation of `static_commands!` macro and the `TypableCommandList`.
diff --git a/helix-term/src/config.rs b/helix-term/src/config.rs
index bcba8d8e..ace10821 100644
--- a/helix-term/src/config.rs
+++ b/helix-term/src/config.rs
@@ -20,6 +20,8 @@ pub struct Config {
#[serde(deny_unknown_fields)]
pub struct ConfigRaw {
pub theme: Option<String>,
+ #[serde(default)]
+ pub unbind_default_keys: bool,
pub keys: Option<HashMap<Mode, KeyTrie>>,
pub editor: Option<toml::Value>,
}
@@ -66,7 +68,10 @@ impl Config {
local.and_then(|file| toml::from_str(&file).map_err(ConfigLoadError::BadConfig));
let res = match (global_config, local_config) {
(Ok(global), Ok(local)) => {
- let mut keys = keymap::default();
+ let mut keys = match local.unbind_default_keys {
+ true => HashMap::default(),
+ false => keymap::default(),
+ };
if let Some(global_keys) = global.keys {
merge_keys(&mut keys, global_keys)
}
@@ -96,7 +101,10 @@ impl Config {
return Err(ConfigLoadError::BadConfig(err))
}
(Ok(config), Err(_)) | (Err(_), Ok(config)) => {
- let mut keys = keymap::default();
+ let mut keys = match config.unbind_default_keys {
+ true => HashMap::default(),
+ false => keymap::default(),
+ };
if let Some(keymap) = config.keys {
merge_keys(&mut keys, keymap);
}
diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index 598be55b..c5d188d5 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -309,7 +309,10 @@ impl Keymaps {
pub fn get(&mut self, mode: Mode, key: KeyEvent) -> KeymapResult {
// TODO: remove the sticky part and look up manually
let keymaps = &*self.map();
- let keymap = &keymaps[&mode];
+ let keymap = match keymaps.get(&mode) {
+ Some(keymap) => keymap,
+ None => return KeymapResult::NotFound,
+ };
if key!(Esc) == key {
if !self.state.is_empty() {
@@ -364,7 +367,7 @@ impl Default for Keymaps {
}
}
-/// Merge default config keys with user overwritten keys for custom user config.
+/// Merge existing config keys with user overwritten keys.
pub fn merge_keys(dst: &mut HashMap<Mode, KeyTrie>, mut delta: HashMap<Mode, KeyTrie>) {
for (mode, keys) in dst {
keys.merge_nodes(