mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-27 02:48:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #2313 from zed-industries/unify-spelling-of-key-binding-to-be-two-words

Browse source 
Unify spelling of `key binding` to be two words
This commit is contained in:
Joseph T. Lyons 2023-03-27 15:58:12 -04:00 committed by GitHub
commit e10338ed17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/gpui/src/app.rs
View file

@ -6834,7 +6834,7 @@ mod tests {
None None
); );
// Produces a list of actions and keybindings // Produces a list of actions and key bindings
fn available_actions( fn available_actions(
window_id: usize, window_id: usize,
view_id: usize, view_id: usize,

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

@ -150,7 +150,7 @@ mod tests {
// Test loading the keymap base at all // Test loading the keymap base at all
cx.update(|cx| { cx.update(|cx| {
assert_keybindings_for( assert_key_bindings_for(
cx, cx,
vec![("backspace", &A), ("k", &ActivatePreviousPane)], vec![("backspace", &A), ("k", &ActivatePreviousPane)],
line!(), line!(),
@ -178,7 +178,7 @@ mod tests {
cx.foreground().run_until_parked(); cx.foreground().run_until_parked();
cx.update(|cx| { cx.update(|cx| {
assert_keybindings_for( assert_key_bindings_for(
cx, cx,
vec![("backspace", &B), ("k", &ActivatePreviousPane)], vec![("backspace", &B), ("k", &ActivatePreviousPane)],
line!(), line!(),
@ -202,7 +202,7 @@ mod tests {
cx.foreground().run_until_parked(); cx.foreground().run_until_parked();
cx.update(|cx| { cx.update(|cx| {
assert_keybindings_for( assert_key_bindings_for(
cx, cx,
vec![("backspace", &B), ("[", &ActivatePrevItem)], vec![("backspace", &B), ("[", &ActivatePrevItem)],
line!(), line!(),
@ -210,7 +210,7 @@ mod tests {
}); });
} }
fn assert_keybindings_for<'a>( fn assert_key_bindings_for<'a>(
cx: &mut MutableAppContext, cx: &mut MutableAppContext,
actions: Vec<(&'static str, &'a dyn Action)>, actions: Vec<(&'static str, &'a dyn Action)>,
line: u32, line: u32,
@ -226,7 +226,7 @@ mod tests {
&& b.iter() && b.iter()
.any(|binding| binding.keystrokes().iter().any(|k| k.key == key)) .any(|binding| binding.keystrokes().iter().any(|k| k.key == key))
}), }),
"On {} Failed to find {} with keybinding {}", "On {} Failed to find {} with key binding {}",
line, line,
action.name(), action.name(),
key key

2
crates/vim/src/test/neovim_backed_test_context.rs
View file

@ -85,7 +85,7 @@ impl<'a> NeovimBackedTestContext<'a> {
let mut marked_text = unmarked_text.clone(); let mut marked_text = unmarked_text.clone();
marked_text.insert(*cursor_offset, 'ˇ'); marked_text.insert(*cursor_offset, 'ˇ');
// None represents all keybindings being exempted for that initial state // None represents all key bindings being exempted for that initial state
self.exemptions.insert(marked_text, None); self.exemptions.insert(marked_text, None);
} }
} }