Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

keymap_ui: Don't panic on KeybindSource::from_meta (#34652)

Browse source 
Closes #ISSUE

Log error instead of panicking when `from_meta` is passed an invalid
value

Release Notes:

- N/A *or* Added/Fixed/Improved ...
This commit is contained in:
Ben Kunkle 2025-07-17 19:03:10 -05:00 • committed by GitHub
parent ed4deaa738
commit 4314b35288
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/settings/src/keymap_file.rs
View file

@ -992,13 +992,17 @@ impl KeybindSource {
} }
pub fn from_meta(index: KeyBindingMetaIndex) -> Self { pub fn from_meta(index: KeyBindingMetaIndex) -> Self {
match index { Self::try_from_meta(index).unwrap()
}
pub fn try_from_meta(index: KeyBindingMetaIndex) -> Result<Self> {
Ok(match index {
Self::USER => KeybindSource::User, Self::USER => KeybindSource::User,
Self::BASE => KeybindSource::Base, Self::BASE => KeybindSource::Base,
Self::DEFAULT => KeybindSource::Default, Self::DEFAULT => KeybindSource::Default,
Self::VIM => KeybindSource::Vim, Self::VIM => KeybindSource::Vim,
_ => unreachable!(), _ => anyhow::bail!("Invalid keybind source {:?}", index),
} })
} }
} }

5
crates/settings_ui/src/keybindings.rs
View file

@ -567,7 +567,10 @@ impl KeymapEditor {
let mut string_match_candidates = Vec::new(); let mut string_match_candidates = Vec::new();
for key_binding in key_bindings { for key_binding in key_bindings {
let source = key_binding.meta().map(settings::KeybindSource::from_meta); let source = key_binding
.meta()
.map(settings::KeybindSource::try_from_meta)
.and_then(|source| source.log_err());
let keystroke_text = ui::text_for_keystrokes(key_binding.keystrokes(), cx); let keystroke_text = ui::text_for_keystrokes(key_binding.keystrokes(), cx);
let ui_key_binding = Some( let ui_key_binding = Some(