From 545f12362c6c85bf58d32e58f081a1286e6bf77f Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Mon, 15 Aug 2022 14:53:42 +0200
Subject: [PATCH] Rename `{project_panel,contacts_panel}::Toggle` to
 `ToggleFocus`

---
 assets/keymaps/default.json                 | 4 ++--
 crates/contacts_panel/src/contacts_panel.rs | 2 +-
 crates/project_panel/src/project_panel.rs   | 2 +-
 crates/zed/src/menus.rs                     | 4 ++--
 crates/zed/src/zed.rs                       | 8 ++++++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/assets/keymaps/default.json b/assets/keymaps/default.json
index 3fc3a8128be3493d5f5f246247312371911919d9..6f34facc421e203b5b276fd8704ed1265b34c2dd 100644
--- a/assets/keymaps/default.json
+++ b/assets/keymaps/default.json
@@ -308,7 +308,7 @@
             "cmd-p": "file_finder::Toggle",
             "cmd-shift-p": "command_palette::Toggle",
             "cmd-shift-m": "diagnostics::Deploy",
-            "cmd-shift-e": "project_panel::Toggle",
+            "cmd-shift-e": "project_panel::ToggleFocus",
             "cmd-alt-s": "workspace::SaveAll"
         }
     },
@@ -393,7 +393,7 @@
     {
         "context": "Workspace",
         "bindings": {
-            "cmd-shift-c": "contacts_panel::Toggle",
+            "cmd-shift-c": "contacts_panel::ToggleFocus",
             "cmd-shift-b": "workspace::ToggleRightSidebar"
         }
     },
diff --git a/crates/contacts_panel/src/contacts_panel.rs b/crates/contacts_panel/src/contacts_panel.rs
index 9198efceba2adcad2fce421fc70713a722f32881..d97810f106be04d2d52443094d7fc395ae15f025 100644
--- a/crates/contacts_panel/src/contacts_panel.rs
+++ b/crates/contacts_panel/src/contacts_panel.rs
@@ -26,7 +26,7 @@ use std::{ops::DerefMut, sync::Arc};
 use theme::IconButton;
 use workspace::{sidebar::SidebarItem, JoinProject, ToggleProjectOnline, Workspace};
 
-actions!(contacts_panel, [Toggle]);
+actions!(contacts_panel, [ToggleFocus]);
 
 impl_actions!(
     contacts_panel,
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 702c750ea204172be68fbe603ceb3c59bffa88c7..057e0da0c4f5a034caa3d71a67707e0a2667c2f2 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -111,7 +111,7 @@ actions!(
         Paste,
         Delete,
         Rename,
-        Toggle
+        ToggleFocus
     ]
 );
 impl_internal_actions!(project_panel, [Open, ToggleExpanded, DeployContextMenu]);
diff --git a/crates/zed/src/menus.rs b/crates/zed/src/menus.rs
index 71ab1d14e5213a73c0214778811843d2fda60a1a..3a34166ba62c98aa145ef0daba0227c9dbd15796 100644
--- a/crates/zed/src/menus.rs
+++ b/crates/zed/src/menus.rs
@@ -242,11 +242,11 @@ pub fn menus() -> Vec<Menu<'static>> {
                 MenuItem::Separator,
                 MenuItem::Action {
                     name: "Project Panel",
-                    action: Box::new(project_panel::Toggle),
+                    action: Box::new(project_panel::ToggleFocus),
                 },
                 MenuItem::Action {
                     name: "Contacts Panel",
-                    action: Box::new(contacts_panel::Toggle),
+                    action: Box::new(contacts_panel::ToggleFocus),
                 },
                 MenuItem::Action {
                     name: "Command Palette",
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 9976f7a033df343bc82d31d8e75611019b2f2a83..e9248127189f2fcae44fb322253a86a52739c218 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -201,12 +201,16 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut gpui::MutableAppContext) {
         },
     );
     cx.add_action(
-        |workspace: &mut Workspace, _: &project_panel::Toggle, cx: &mut ViewContext<Workspace>| {
+        |workspace: &mut Workspace,
+         _: &project_panel::ToggleFocus,
+         cx: &mut ViewContext<Workspace>| {
             workspace.toggle_sidebar_item_focus(Side::Left, 0, cx);
         },
     );
     cx.add_action(
-        |workspace: &mut Workspace, _: &contacts_panel::Toggle, cx: &mut ViewContext<Workspace>| {
+        |workspace: &mut Workspace,
+         _: &contacts_panel::ToggleFocus,
+         cx: &mut ViewContext<Workspace>| {
             workspace.toggle_sidebar_item_focus(Side::Right, 0, cx);
         },
     );