Add move item actions support to the terminal panel

zed-industries · Dec 10, 2024 · a9252ae · a9252ae
1 parent 3edee86
commit a9252ae
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 36 deletions.
diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
@@ -36,8 +36,9 @@ use workspace::{
     move_item, pane,
     ui::IconName,
     ActivateNextPane, ActivatePane, ActivatePaneInDirection, ActivatePreviousPane, DraggedTab,
-    ItemId, NewTerminal, Pane, PaneGroup, SplitDirection, SplitDown, SplitLeft, SplitRight,
-    SplitUp, SwapPaneInDirection, ToggleZoom, Workspace,
+    ItemId, MovableActiveItem, MoveItemToPane, MoveItemToPaneInDirection, NewTerminal, Pane,
+    PaneGroup, SplitDirection, SplitDown, SplitLeft, SplitRight, SplitUp, SwapPaneInDirection,
+    ToggleZoom, Workspace,
 };
 
 use anyhow::Result;
@@ -1124,8 +1125,8 @@ impl Render for TerminalPanel {
                         .detach();
                     }
                 }))
-                .on_action(cx.listener(
-                    |terminal_panel, action: &SwapPaneInDirection, cx| {
+                .on_action(
+                    cx.listener(|terminal_panel, action: &SwapPaneInDirection, cx| {
                         if let Some(to) = terminal_panel
                             .center
                             .find_pane_in_direction(&terminal_panel.active_pane, action.0, cx)
@@ -1136,6 +1137,27 @@ impl Render for TerminalPanel {
                                 .swap(&terminal_panel.active_pane.clone(), &to);
                             cx.notify();
                         }
+                    }),
+                )
+                .on_action(cx.listener(|terminal_panel, action: &MoveItemToPane, cx| {
+                    let panes = terminal_panel.center.panes();
+                    let Some(target_pane) = panes.get(action.0).map(|p| (*p).clone()) else {
+                        return;
+                    };
+                    let source_pane = terminal_panel.active_pane.clone();
+                    source_pane.move_active_item_to(target_pane, true, true, cx);
+                }))
+                .on_action(cx.listener(
+                    |terminal_panel, action: &MoveItemToPaneInDirection, cx| {
+                        let source_pane = terminal_panel.active_pane.clone();
+                        let Some(target_pane) = terminal_panel
+                            .center
+                            .find_pane_in_direction(&source_pane, action.0, cx)
+                            .cloned()
+                        else {
+                            return;
+                        };
+                        source_pane.move_active_item_to(target_pane, true, true, cx);
                     },
                 ))
             })

diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
@@ -2846,19 +2846,7 @@ impl Workspace {
         let Some(target_pane) = panes.get(action.0).map(|p| (*p).clone()) else {
             return;
         };
-        if target_pane == source_pane {
-            return;
-        }
-        let Some(active_item) = source_pane.read(cx).active_item() else {
-            return;
-        };
-        source_pane.update(cx, |pane, cx| {
-            let item_id = active_item.item_id();
-            pane.remove_item(item_id, false, true, cx);
-            target_pane.update(cx, |target_pane, cx| {
-                target_pane.add_item(active_item, true, true, Some(target_pane.items_len()), cx);
-            });
-        });
+        source_pane.move_active_item_to(target_pane, true, true, cx);
     }
 
     pub fn activate_next_pane(&mut self, cx: &mut WindowContext) {
@@ -2986,25 +2974,7 @@ impl Workspace {
     ) {
         if let Some(target_pane) = self.find_pane_in_direction(direction, cx) {
             let source_pane = self.active_pane.clone();
-            if target_pane == source_pane {
-                return;
-            }
-            let Some(active_item) = source_pane.read(cx).active_item() else {
-                return;
-            };
-            source_pane.update(cx, |pane, cx| {
-                let item_id = active_item.item_id();
-                pane.remove_item(item_id, false, true, cx);
-                target_pane.update(cx, |target_pane, cx| {
-                    target_pane.add_item(
-                        active_item,
-                        true,
-                        true,
-                        Some(target_pane.items_len()),
-                        cx,
-                    );
-                });
-            });
+            source_pane.move_active_item_to(target_pane, true, true, cx);
         }
     }
 
@@ -5201,6 +5171,46 @@ impl WorkspaceHandle for View<Workspace> {
     }
 }
 
+pub trait MovableActiveItem {
+    fn move_active_item_to(
+        &self,
+        target_pane: View<Pane>,
+        focus_target: bool,
+        close_if_empty: bool,
+        cx: &mut WindowContext,
+    );
+}
+
+impl MovableActiveItem for View<Pane> {
+    fn move_active_item_to(
+        &self,
+        target_pane: View<Pane>,
+        focus_target: bool,
+        close_if_empty: bool,
+        cx: &mut WindowContext,
+    ) {
+        if &target_pane == self {
+            return;
+        }
+        let Some(active_item) = self.read(cx).active_item() else {
+            return;
+        };
+        self.update(cx, |pane, cx| {
+            let item_id = active_item.item_id();
+            pane.remove_item(item_id, false, close_if_empty, cx);
+            target_pane.update(cx, |target_pane, cx| {
+                target_pane.add_item(
+                    active_item,
+                    focus_target,
+                    focus_target,
+                    Some(target_pane.items_len()),
+                    cx,
+                );
+            });
+        });
+    }
+}
+
 impl std::fmt::Debug for OpenPaths {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("OpenPaths")