-
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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.
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
Add unbind-default-keys
config option
#2733
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -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, Keymap>>, | ||||||||||||||||||||
pub editor: Option<toml::Value>, | ||||||||||||||||||||
} | ||||||||||||||||||||
|
@@ -66,7 +68,11 @@ 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 => keys = HashMap::default(), | ||||||||||||||||||||
false => keys = keymap::default(), | ||||||||||||||||||||
} | ||||||||||||||||||||
if let Some(global_keys) = global.keys { | ||||||||||||||||||||
merge_keys(&mut keys, global_keys) | ||||||||||||||||||||
} | ||||||||||||||||||||
|
@@ -96,7 +102,11 @@ 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 => keys = HashMap::default(), | ||||||||||||||||||||
false => keys = keymap::default(), | ||||||||||||||||||||
} | ||||||||||||||||||||
Comment on lines
+105
to
+109
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||||
if let Some(keymap) = config.keys { | ||||||||||||||||||||
merge_keys(&mut keys, keymap); | ||||||||||||||||||||
} | ||||||||||||||||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -360,7 +360,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, | ||||||||||||
}; | ||||||||||||
Comment on lines
+363
to
+366
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
This is the style used elsewhere in the code. |
||||||||||||
|
||||||||||||
if key!(Esc) == key { | ||||||||||||
if !self.state.is_empty() { | ||||||||||||
|
@@ -415,10 +418,10 @@ 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, Keymap>, mut delta: HashMap<Mode, Keymap>) { | ||||||||||||
for (mode, keys) in dst { | ||||||||||||
keys.merge(delta.remove(mode).unwrap_or_default()) | ||||||||||||
for (mode, keys) in delta.drain() { | ||||||||||||
dst.entry(mode).or_default().merge(keys); | ||||||||||||
} | ||||||||||||
} | ||||||||||||
|
||||||||||||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.