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

revert for loop change and store matched actions in a sorted set instead

Browse source
This commit is contained in:
Kay Simmons 2023-02-18 13:42:28 -08:00
parent 04df00b221
commit 3fb6e31b92
1 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

40
crates/gpui/src/keymap_matcher.rs
View file

@ -5,7 +5,7 @@ mod keystroke;
use std::{any::TypeId, fmt::Debug}; use std::{any::TypeId, fmt::Debug};
use collections::HashMap; use collections::{BTreeMap, HashMap};
use smallvec::SmallVec; use smallvec::SmallVec;
use crate::Action; use crate::Action;
@ -66,7 +66,10 @@ impl KeymapMatcher {
mut dispatch_path: Vec<(usize, KeymapContext)>, mut dispatch_path: Vec<(usize, KeymapContext)>,
) -> MatchResult { ) -> MatchResult {
let mut any_pending = false; let mut any_pending = false;
let mut matched_bindings: Vec<(usize, Box<dyn Action>)> = Vec::new(); // Collect matched bindings into an ordered list using the position in the bindings
// list as the precedence
let mut matched_bindings: BTreeMap<usize, Vec<(usize, Box<dyn Action>)>> =
Default::default();
let first_keystroke = self.pending_keystrokes.is_empty(); let first_keystroke = self.pending_keystrokes.is_empty();
self.pending_keystrokes.push(keystroke.clone()); self.pending_keystrokes.push(keystroke.clone());
@ -76,27 +79,28 @@ impl KeymapMatcher {
.extend(dispatch_path.iter_mut().map(|e| std::mem::take(&mut e.1))); .extend(dispatch_path.iter_mut().map(|e| std::mem::take(&mut e.1)));
// Find the bindings which map the pending keystrokes and current context // Find the bindings which map the pending keystrokes and current context
// Iterate over the bindings in precedence order before the dispatch path so that for (i, (view_id, _)) in dispatch_path.iter().enumerate() {
// users have more control over precedence rules // Don't require pending view entry if there are no pending keystrokes
for binding in self.keymap.bindings().iter().rev() { if !first_keystroke && !self.pending_views.contains_key(view_id) {
for (i, (view_id, _)) in dispatch_path.iter().enumerate() { continue;
// Don't require pending view entry if there are no pending keystrokes }
if !first_keystroke && !self.pending_views.contains_key(view_id) {
// If there is a previous view context, invalidate that view if it
// has changed
if let Some(previous_view_context) = self.pending_views.remove(view_id) {
if previous_view_context != self.contexts[i] {
continue; continue;
} }
}
// If there is a previous view context, invalidate that view if it for (order, binding) in self.keymap.bindings().iter().rev().enumerate() {
// has changed
if let Some(previous_view_context) = self.pending_views.remove(view_id) {
if previous_view_context != self.contexts[i] {
continue;
}
}
match binding.match_keys_and_context(&self.pending_keystrokes, &self.contexts[i..]) match binding.match_keys_and_context(&self.pending_keystrokes, &self.contexts[i..])
{ {
BindingMatchResult::Complete(action) => { BindingMatchResult::Complete(action) => {
matched_bindings.push((*view_id, action)) matched_bindings
.entry(order)
.or_default()
.push((*view_id, action));
} }
BindingMatchResult::Partial => { BindingMatchResult::Partial => {
self.pending_views self.pending_views
@ -113,7 +117,7 @@ impl KeymapMatcher {
} }
if !matched_bindings.is_empty() { if !matched_bindings.is_empty() {
MatchResult::Matches(matched_bindings) MatchResult::Matches(matched_bindings.into_values().flatten().collect())
} else if any_pending { } else if any_pending {
MatchResult::Pending MatchResult::Pending
} else { } else {