fmt

Mikayla Maki created 2 years ago

Change summary

crates/terminal_view/src/terminal_panel.rs | 11 ++++++-----
crates/terminal_view/src/terminal_view.rs  |  2 +-
crates/workspace/src/dock.rs               |  3 ++-
crates/workspace/src/pane.rs               |  4 ++--
crates/workspace/src/workspace.rs          | 14 +++++++++++---
crates/zed/src/menus.rs                    | 15 +++------------
6 files changed, 25 insertions(+), 24 deletions(-)

Detailed changes

crates/terminal_view/src/terminal_panel.rs

@@ -220,15 +220,16 @@ impl TerminalPanel {
         }
     }
 
-
-    fn new_terminal(workspace: &mut Workspace, _: &workspace::NewTerminal, cx: &mut ViewContext<Workspace>) {
+    fn new_terminal(
+        workspace: &mut Workspace,
+        _: &workspace::NewTerminal,
+        cx: &mut ViewContext<Workspace>,
+    ) {
         let Some(this) = workspace.focus_panel::<Self>(cx) else {
             return;
         };
 
-        this.update(cx, |this, cx| {
-            this.add_terminal(cx)
-        })
+        this.update(cx, |this, cx| this.add_terminal(cx))
     }
 
     fn add_terminal(&mut self, cx: &mut ViewContext<Self>) {

crates/terminal_view/src/terminal_view.rs

@@ -38,7 +38,7 @@ use workspace::{
     notifications::NotifyResultExt,
     pane, register_deserializable_item,
     searchable::{SearchEvent, SearchOptions, SearchableItem, SearchableItemHandle},
-    Pane, ToolbarItemLocation, Workspace, WorkspaceId, NewCenterTerminal,
+    NewCenterTerminal, Pane, ToolbarItemLocation, Workspace, WorkspaceId,
 };
 
 pub use terminal::TerminalSettings;

crates/workspace/src/dock.rs

@@ -517,7 +517,8 @@ impl View for PanelButtons {
                                                 &*tooltip_action,
                                             )
                                             .ok();
-                                        }).detach();
+                                        })
+                                        .detach();
                                     }
                                 }
                             })

crates/workspace/src/pane.rs

@@ -2,8 +2,8 @@ mod dragged_item_receiver;
 
 use super::{ItemHandle, SplitDirection};
 use crate::{
-    item::WeakItemHandle, toolbar::Toolbar, AutosaveSetting, Item, NewFile, NewSearch,
-    ToggleZoom, Workspace, WorkspaceSettings, NewCenterTerminal,
+    item::WeakItemHandle, toolbar::Toolbar, AutosaveSetting, Item, NewCenterTerminal, NewFile,
+    NewSearch, ToggleZoom, Workspace, WorkspaceSettings,
 };
 use anyhow::Result;
 use collections::{HashMap, HashSet, VecDeque};

crates/workspace/src/workspace.rs

@@ -53,9 +53,10 @@ use std::{
     cmp, env,
     future::Future,
     path::{Path, PathBuf},
+    rc::Rc,
     str,
     sync::{atomic::AtomicUsize, Arc},
-    time::Duration, rc::Rc,
+    time::Duration,
 };
 
 use crate::{
@@ -1623,14 +1624,21 @@ impl Workspace {
     }
 
     pub fn focus_panel<T: Panel>(&mut self, cx: &mut ViewContext<Self>) -> Option<ViewHandle<T>> {
-        self.show_or_hide_panel::<T>(cx, |_, _| true)?.as_any().clone().downcast()
+        self.show_or_hide_panel::<T>(cx, |_, _| true)?
+            .as_any()
+            .clone()
+            .downcast()
     }
 
     pub fn toggle_panel_focus<T: Panel>(&mut self, cx: &mut ViewContext<Self>) {
         self.show_or_hide_panel::<T>(cx, |panel, cx| !panel.has_focus(cx));
     }
 
-    fn show_or_hide_panel<T: Panel>(&mut self, cx: &mut ViewContext<Self>, show: impl Fn(&dyn PanelHandle, &mut ViewContext<Dock>) -> bool) -> Option<Rc<dyn PanelHandle>> {
+    fn show_or_hide_panel<T: Panel>(
+        &mut self,
+        cx: &mut ViewContext<Self>,
+        show: impl Fn(&dyn PanelHandle, &mut ViewContext<Dock>) -> bool,
+    ) -> Option<Rc<dyn PanelHandle>> {
         for (dock, position) in [
             self.left_dock.clone(),
             self.bottom_dock.clone(),

crates/zed/src/menus.rs

@@ -89,18 +89,9 @@ pub fn menus() -> Vec<Menu<'static>> {
                 MenuItem::action("Zoom Out", super::DecreaseBufferFontSize),
                 MenuItem::action("Reset Zoom", super::ResetBufferFontSize),
                 MenuItem::separator(),
-                MenuItem::action(
-                    "Toggle Left Dock",
-                    workspace::ToggleLeftDock,
-                ),
-                MenuItem::action(
-                    "Toggle Right Dock",
-                    workspace::ToggleRightDock,
-                ),
-                MenuItem::action(
-                    "Toggle Bottom Dock",
-                    workspace::ToggleBottomDock,
-                ),
+                MenuItem::action("Toggle Left Dock", workspace::ToggleLeftDock),
+                MenuItem::action("Toggle Right Dock", workspace::ToggleRightDock),
+                MenuItem::action("Toggle Bottom Dock", workspace::ToggleBottomDock),
                 MenuItem::submenu(Menu {
                     name: "Editor Layout",
                     items: vec![