Fixed test
This commit is contained in:
parent
27d4d727c3
commit
1728c4eacc
1 changed files with 8 additions and 19 deletions
|
@ -192,9 +192,8 @@ impl DispatchTree {
|
||||||
keymap
|
keymap
|
||||||
.bindings_for_action(action)
|
.bindings_for_action(action)
|
||||||
.filter(|binding| {
|
.filter(|binding| {
|
||||||
for i in 1..context_stack.len() {
|
for i in 0..context_stack.len() {
|
||||||
dbg!(i);
|
let context = &context_stack[0..=i];
|
||||||
let context = &context_stack[0..i];
|
|
||||||
if keymap.binding_enabled(binding, context) {
|
if keymap.binding_enabled(binding, context) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -333,36 +332,26 @@ mod tests {
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_keybinding_for_action_bounds() {
|
fn test_keybinding_for_action_bounds() {
|
||||||
dbg!("got here");
|
|
||||||
|
|
||||||
let keymap = Keymap::new(vec![KeyBinding::new(
|
let keymap = Keymap::new(vec![KeyBinding::new(
|
||||||
"cmd-n",
|
"cmd-n",
|
||||||
TestAction,
|
TestAction,
|
||||||
Some("ProjectPanel"),
|
Some("ProjectPanel"),
|
||||||
)]);
|
)]);
|
||||||
dbg!("got here");
|
|
||||||
|
|
||||||
let mut registry = ActionRegistry::default();
|
let mut registry = ActionRegistry::default();
|
||||||
dbg!("got here");
|
|
||||||
|
|
||||||
registry.load_action::<TestAction>();
|
registry.load_action::<TestAction>();
|
||||||
|
|
||||||
dbg!("got here");
|
|
||||||
|
|
||||||
let keymap = Arc::new(Mutex::new(keymap));
|
let keymap = Arc::new(Mutex::new(keymap));
|
||||||
dbg!("got here");
|
|
||||||
|
|
||||||
let tree = DispatchTree::new(keymap, Rc::new(registry));
|
let tree = DispatchTree::new(keymap, Rc::new(registry));
|
||||||
|
|
||||||
dbg!("got here");
|
let contexts = vec![
|
||||||
let keybinding = tree.bindings_for_action(
|
KeyContext::parse("Workspace").unwrap(),
|
||||||
&TestAction,
|
KeyContext::parse("ProjectPanel").unwrap(),
|
||||||
&vec![
|
];
|
||||||
KeyContext::parse(",").unwrap(),
|
|
||||||
KeyContext::parse("Workspace").unwrap(),
|
let keybinding = tree.bindings_for_action(&TestAction, &contexts);
|
||||||
KeyContext::parse("ProjectPanel").unwrap(),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
|
|
||||||
assert!(keybinding[0].action.partial_eq(&TestAction))
|
assert!(keybinding[0].action.partial_eq(&TestAction))
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue