From 9d88cd8842a9d49e77252483e71cc681b976c22f Mon Sep 17 00:00:00 2001
From: Joseph Lyons <JosephTLyons@gmail.com>
Date: Wed, 22 Mar 2023 13:34:12 -0400
Subject: [PATCH] Unify spelling of `key binding` to be two words

---
 crates/gpui/src/app.rs                            |  2 +-
 crates/settings/src/settings_file.rs              | 10 +++++-----
 crates/vim/src/test/neovim_backed_test_context.rs |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index d476ecdef9..0c8256fefb 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -6834,7 +6834,7 @@ mod tests {
             None
         );
 
-        // Produces a list of actions and keybindings
+        // Produces a list of actions and key bindings
         fn available_actions(
             window_id: usize,
             view_id: usize,
diff --git a/crates/settings/src/settings_file.rs b/crates/settings/src/settings_file.rs
index 4c01b3de72..2ab5c10598 100644
--- a/crates/settings/src/settings_file.rs
+++ b/crates/settings/src/settings_file.rs
@@ -150,7 +150,7 @@ mod tests {
 
         // Test loading the keymap base at all
         cx.update(|cx| {
-            assert_keybindings_for(
+            assert_key_bindings_for(
                 cx,
                 vec![("backspace", &A), ("k", &ActivatePreviousPane)],
                 line!(),
@@ -178,7 +178,7 @@ mod tests {
         cx.foreground().run_until_parked();
 
         cx.update(|cx| {
-            assert_keybindings_for(
+            assert_key_bindings_for(
                 cx,
                 vec![("backspace", &B), ("k", &ActivatePreviousPane)],
                 line!(),
@@ -202,7 +202,7 @@ mod tests {
         cx.foreground().run_until_parked();
 
         cx.update(|cx| {
-            assert_keybindings_for(
+            assert_key_bindings_for(
                 cx,
                 vec![("backspace", &B), ("[", &ActivatePrevItem)],
                 line!(),
@@ -210,7 +210,7 @@ mod tests {
         });
     }
 
-    fn assert_keybindings_for<'a>(
+    fn assert_key_bindings_for<'a>(
         cx: &mut MutableAppContext,
         actions: Vec<(&'static str, &'a dyn Action)>,
         line: u32,
@@ -226,7 +226,7 @@ mod tests {
                     && b.iter()
                         .any(|binding| binding.keystrokes().iter().any(|k| k.key == key))
                 }),
-                "On {} Failed to find {} with keybinding {}",
+                "On {} Failed to find {} with key binding {}",
                 line,
                 action.name(),
                 key
diff --git a/crates/vim/src/test/neovim_backed_test_context.rs b/crates/vim/src/test/neovim_backed_test_context.rs
index a6bf5bc6fa..2443ae593b 100644
--- a/crates/vim/src/test/neovim_backed_test_context.rs
+++ b/crates/vim/src/test/neovim_backed_test_context.rs
@@ -85,7 +85,7 @@ impl<'a> NeovimBackedTestContext<'a> {
                 let mut marked_text = unmarked_text.clone();
                 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);
             }
         }