From 3b9bb521f4a4ff53bab73afe4cf40ebba8b2c929 Mon Sep 17 00:00:00 2001 From: Ben Kunkle Date: Fri, 11 Jul 2025 08:51:21 -0500 Subject: [PATCH] keymap_ui: Only show conflicts between user bindings (#34284) Closes #ISSUE This makes it so conflicts are only shown between user bindings. User bindings that override bindings in the Vim, Base, and Default keymaps are not identified as conflicts Release Notes: - N/A *or* Added/Fixed/Improved ... Co-authored-by: Anthony --- crates/settings_ui/src/keybindings.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/crates/settings_ui/src/keybindings.rs b/crates/settings_ui/src/keybindings.rs index 56be9481e5bd577edb063a74743272263da5dc6c..c3d6ae7c3019c1c9138111e8431ef2089ce7abb5 100644 --- a/crates/settings_ui/src/keybindings.rs +++ b/crates/settings_ui/src/keybindings.rs @@ -193,7 +193,13 @@ impl ConflictState { key_bindings .iter() .enumerate() - .filter(|(_, binding)| !binding.keystroke_text.is_empty()) + .filter(|(_, binding)| { + !binding.keystroke_text.is_empty() + && binding + .source + .as_ref() + .is_some_and(|source| matches!(source.0, KeybindSource::User)) + }) .for_each(|(index, binding)| { action_keybind_mapping .entry(binding.get_action_mapping())