zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 02:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add keystroke for menu item only when action is equal to binding

Browse Source 
This fixes a bug where we would show `cmd-e` instead of `cmd-f` for
`Edit -> Find` because both bindings would have the `buffer_search::Deploy`
action and we were mistakenly selecting the former.
This commit is contained in:
Antonio Scandurra 2022-06-06 09:18:58 +02:00
parent 3a69943df3
commit 22dd68fbfb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/gpui/src/keymap.rs
View File

@ -176,7 +176,7 @@ impl Matcher {
cx: &Context,
) -> Option<SmallVec<[Keystroke; 2]>> {
for binding in self.keymap.bindings.iter().rev() {
if binding.action.id() == action.id()
if binding.action.eq(action)
&& binding
.context_predicate
.as_ref()
@ -265,6 +265,10 @@ impl Binding {
pub fn keystrokes(&self) -> &[Keystroke] {
&self.keystrokes
}
pub fn action(&self) -> &dyn Action {
self.action.as_ref()
}
}
impl Keystroke {

2
crates/gpui/src/platform/mac/platform.rs
View File

@ -154,7 +154,7 @@ impl MacForegroundPlatform {
let mut keystroke = None;
if let Some(binding) = keystroke_matcher
.bindings_for_action_type(action.as_any().type_id())
.next()
.find(|binding| binding.action().eq(action.as_ref()))
{
if binding.keystrokes().len() == 1 {
keystroke = binding.keystrokes().first()