From 9d31523cf3056df980d47ff44f3439a0ce15d51e Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Tue, 14 Nov 2023 13:37:21 -0500
Subject: [PATCH] Rename `keybinding` method on `PaletteItem` to `key_binding`

---
 crates/ui2/src/components/palette.rs | 25 +++++++++++--------------
 crates/ui2/src/static_data.rs        | 20 ++++++++++----------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/crates/ui2/src/components/palette.rs b/crates/ui2/src/components/palette.rs
index 4e1034595db8043bae80823fb793509c86f01ff0..d73b15940ea8097d9bec57fc7ac7ad5a7613d985 100644
--- a/crates/ui2/src/components/palette.rs
+++ b/crates/ui2/src/components/palette.rs
@@ -108,7 +108,7 @@ impl Palette {
 pub struct PaletteItem {
     pub label: SharedString,
     pub sublabel: Option<SharedString>,
-    pub keybinding: Option<KeyBinding>,
+    pub key_binding: Option<KeyBinding>,
 }
 
 impl PaletteItem {
@@ -116,7 +116,7 @@ impl PaletteItem {
         Self {
             label: label.into(),
             sublabel: None,
-            keybinding: None,
+            key_binding: None,
         }
     }
 
@@ -130,11 +130,8 @@ impl PaletteItem {
         self
     }
 
-    pub fn keybinding<K>(mut self, keybinding: K) -> Self
-    where
-        K: Into<Option<KeyBinding>>,
-    {
-        self.keybinding = keybinding.into();
+    pub fn key_binding(mut self, key_binding: impl Into<Option<KeyBinding>>) -> Self {
+        self.key_binding = key_binding.into();
         self
     }
 
@@ -149,7 +146,7 @@ impl PaletteItem {
                     .child(Label::new(self.label.clone()))
                     .children(self.sublabel.clone().map(|sublabel| Label::new(sublabel))),
             )
-            .children(self.keybinding)
+            .children(self.key_binding)
     }
 }
 
@@ -182,23 +179,23 @@ mod stories {
                             .placeholder("Execute a command...")
                             .items(vec![
                                 PaletteItem::new("theme selector: toggle")
-                                    .keybinding(KeyBinding::new(binding("cmd-k cmd-t"))),
+                                    .key_binding(KeyBinding::new(binding("cmd-k cmd-t"))),
                                 PaletteItem::new("assistant: inline assist")
-                                    .keybinding(KeyBinding::new(binding("cmd-enter"))),
+                                    .key_binding(KeyBinding::new(binding("cmd-enter"))),
                                 PaletteItem::new("assistant: quote selection")
-                                    .keybinding(KeyBinding::new(binding("cmd-<"))),
+                                    .key_binding(KeyBinding::new(binding("cmd-<"))),
                                 PaletteItem::new("assistant: toggle focus")
-                                    .keybinding(KeyBinding::new(binding("cmd-?"))),
+                                    .key_binding(KeyBinding::new(binding("cmd-?"))),
                                 PaletteItem::new("auto update: check"),
                                 PaletteItem::new("auto update: view release notes"),
                                 PaletteItem::new("branches: open recent")
-                                    .keybinding(KeyBinding::new(binding("cmd-alt-b"))),
+                                    .key_binding(KeyBinding::new(binding("cmd-alt-b"))),
                                 PaletteItem::new("chat panel: toggle focus"),
                                 PaletteItem::new("cli: install"),
                                 PaletteItem::new("client: sign in"),
                                 PaletteItem::new("client: sign out"),
                                 PaletteItem::new("editor: cancel")
-                                    .keybinding(KeyBinding::new(binding("escape"))),
+                                    .key_binding(KeyBinding::new(binding("escape"))),
                             ]),
                     )
             }
diff --git a/crates/ui2/src/static_data.rs b/crates/ui2/src/static_data.rs
index 89aef8140a062685b59f00c508d99fea5fe19b1b..4615adbfa484c0f97b98e50e8ed1d330cc72d150 100644
--- a/crates/ui2/src/static_data.rs
+++ b/crates/ui2/src/static_data.rs
@@ -701,16 +701,16 @@ pub fn static_collab_panel_channels() -> Vec<ListItem> {
 
 pub fn example_editor_actions() -> Vec<PaletteItem> {
     vec![
-        PaletteItem::new("New File").keybinding(KeyBinding::new(binding("cmd-n"))),
-        PaletteItem::new("Open File").keybinding(KeyBinding::new(binding("cmd-o"))),
-        PaletteItem::new("Save File").keybinding(KeyBinding::new(binding("cmd-s"))),
-        PaletteItem::new("Cut").keybinding(KeyBinding::new(binding("cmd-x"))),
-        PaletteItem::new("Copy").keybinding(KeyBinding::new(binding("cmd-c"))),
-        PaletteItem::new("Paste").keybinding(KeyBinding::new(binding("cmd-v"))),
-        PaletteItem::new("Undo").keybinding(KeyBinding::new(binding("cmd-z"))),
-        PaletteItem::new("Redo").keybinding(KeyBinding::new(binding("cmd-shift-z"))),
-        PaletteItem::new("Find").keybinding(KeyBinding::new(binding("cmd-f"))),
-        PaletteItem::new("Replace").keybinding(KeyBinding::new(binding("cmd-r"))),
+        PaletteItem::new("New File").key_binding(KeyBinding::new(binding("cmd-n"))),
+        PaletteItem::new("Open File").key_binding(KeyBinding::new(binding("cmd-o"))),
+        PaletteItem::new("Save File").key_binding(KeyBinding::new(binding("cmd-s"))),
+        PaletteItem::new("Cut").key_binding(KeyBinding::new(binding("cmd-x"))),
+        PaletteItem::new("Copy").key_binding(KeyBinding::new(binding("cmd-c"))),
+        PaletteItem::new("Paste").key_binding(KeyBinding::new(binding("cmd-v"))),
+        PaletteItem::new("Undo").key_binding(KeyBinding::new(binding("cmd-z"))),
+        PaletteItem::new("Redo").key_binding(KeyBinding::new(binding("cmd-shift-z"))),
+        PaletteItem::new("Find").key_binding(KeyBinding::new(binding("cmd-f"))),
+        PaletteItem::new("Replace").key_binding(KeyBinding::new(binding("cmd-r"))),
         PaletteItem::new("Jump to Line"),
         PaletteItem::new("Select All"),
         PaletteItem::new("Deselect All"),