Workspace move editor actions #21760
+147
−6
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -121,6 +121,35 @@ impl PaneGroup { | |
| }; | ||
| } | ||
|
|
||
| pub fn move_active_item( | ||
|
There was a problem hiding this comment. Looking at the code better, it looks like we have zed/crates/workspace/src/workspace.rs Lines 6150 to 6180 in 7b7d5dc which does almost the same thing but also focuses the right pane? Let's unity them (by removing this method and moving the existing one here; optionally we can also replace I think, that focusing the last pane is important, and might solve the observed lag issues. |
||
| &self, | ||
| from: &View<Pane>, | ||
| to: &View<Pane>, | ||
| focus_target: bool, | ||
| close_if_empty: bool, | ||
| cx: &mut WindowContext, | ||
| ) { | ||
| if from == to { | ||
| return; | ||
| } | ||
| let Some(active_item) = from.read(cx).active_item() else { | ||
| return; | ||
| }; | ||
| from.update(cx, |source_pane, cx| { | ||
| let item_id = active_item.item_id(); | ||
| source_pane.remove_item(item_id, false, close_if_empty, cx); | ||
| to.update(cx, |target_pane, cx| { | ||
| target_pane.add_item( | ||
| active_item, | ||
| focus_target, | ||
| focus_target, | ||
| Some(target_pane.items_len()), | ||
| cx, | ||
| ); | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| #[allow(clippy::too_many_arguments)] | ||
| pub fn render( | ||
| &self, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -177,6 +177,12 @@ pub struct ActivatePaneInDirection(pub SplitDirection); | |
| #[derive(Clone, Deserialize, PartialEq)] | ||
| pub struct SwapPaneInDirection(pub SplitDirection); | ||
|
|
||
| #[derive(Clone, Deserialize, PartialEq)] | ||
| pub struct MoveItemToPane(pub usize); | ||
|
|
||
| #[derive(Clone, Deserialize, PartialEq)] | ||
| pub struct MoveItemToPaneInDirection(pub SplitDirection); | ||
|
|
||
| #[derive(Clone, PartialEq, Debug, Deserialize)] | ||
| #[serde(rename_all = "camelCase")] | ||
| pub struct SaveAll { | ||
|
|
@@ -226,6 +232,8 @@ impl_actions!( | |
| ActivatePaneInDirection, | ||
| CloseAllItemsAndPanes, | ||
| CloseInactiveTabsAndPanes, | ||
| MoveItemToPane, | ||
| MoveItemToPaneInDirection, | ||
| OpenTerminal, | ||
| Reload, | ||
| Save, | ||
|
|
@@ -2832,6 +2840,16 @@ impl Workspace { | |
| } | ||
| } | ||
|
|
||
| fn move_item_to_pane_at_index(&mut self, action: &MoveItemToPane, cx: &mut ViewContext<Self>) { | ||
| let panes = self.center.panes(); | ||
| let source_pane = self.active_pane.clone(); | ||
| let Some(target_pane) = panes.get(action.0).map(|p| (*p).clone()) else { | ||
| return; | ||
| }; | ||
| self.center | ||
| .move_active_item(&source_pane, &target_pane, true, true, cx); | ||
| } | ||
|
|
||
| pub fn activate_next_pane(&mut self, cx: &mut WindowContext) { | ||
| let panes = self.center.panes(); | ||
| if let Some(ix) = panes.iter().position(|pane| **pane == self.active_pane) { | ||
|
|
@@ -2950,6 +2968,18 @@ impl Workspace { | |
| } | ||
| } | ||
|
|
||
| pub fn move_item_to_pane_in_direction( | ||
| &mut self, | ||
| direction: SplitDirection, | ||
| cx: &mut WindowContext, | ||
| ) { | ||
| if let Some(target_pane) = self.find_pane_in_direction(direction, cx) { | ||
| let source_pane = self.active_pane.clone(); | ||
| self.center | ||
| .move_active_item(&source_pane, &target_pane, true, true, cx); | ||
| } | ||
| } | ||
|
|
||
| pub fn bounding_box_for_pane(&self, pane: &View<Pane>) -> Option<Bounds<Pixels>> { | ||
| self.center.bounding_box_for_pane(pane) | ||
| } | ||
|
|
@@ -4411,6 +4441,7 @@ impl Workspace { | |
| .on_action(cx.listener(Self::follow_next_collaborator)) | ||
| .on_action(cx.listener(Self::close_window)) | ||
| .on_action(cx.listener(Self::activate_pane_at_index)) | ||
| .on_action(cx.listener(Self::move_item_to_pane_at_index)) | ||
| .on_action(cx.listener(|workspace, _: &Unfollow, cx| { | ||
| let pane = workspace.active_pane().clone(); | ||
| workspace.unfollow_in_pane(&pane, cx); | ||
|
|
@@ -4441,6 +4472,11 @@ impl Workspace { | |
| workspace.activate_pane_in_direction(action.0, cx) | ||
| }), | ||
| ) | ||
| .on_action( | ||
| cx.listener(|workspace, action: &MoveItemToPaneInDirection, cx| { | ||
| workspace.move_item_to_pane_in_direction(action.0, cx) | ||
| }), | ||
| ) | ||
| .on_action(cx.listener(|workspace, action: &SwapPaneInDirection, cx| { | ||
| workspace.swap_pane_in_direction(action.0, cx) | ||
| })) | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These two lines look unrelated?
I see two more below, and same question to
AddSelectionAboveandAddSelectionBelow.