diff options
Diffstat (limited to 'zellij-server/src/tab/unit/tab_integration_tests.rs')
| -rw-r--r-- | zellij-server/src/tab/unit/tab_integration_tests.rs | 959 |
1 files changed, 814 insertions, 145 deletions
diff --git a/zellij-server/src/tab/unit/tab_integration_tests.rs b/zellij-server/src/tab/unit/tab_integration_tests.rs index 73e266955..6f5c727f8 100644 --- a/zellij-server/src/tab/unit/tab_integration_tests.rs +++ b/zellij-server/src/tab/unit/tab_integration_tests.rs @@ -4,9 +4,9 @@ use crate::screen::CopyOptions; use crate::Arc; use crate::Mutex; use crate::{ - plugins::PluginInstruction, os_input_output::{AsyncReader, Pid, ServerOsApi}, panes::PaneId, + plugins::PluginInstruction, thread_bus::ThreadSenders, ClientId, }; @@ -17,7 +17,10 @@ use zellij_utils::data::Resize; use zellij_utils::data::ResizeStrategy; use zellij_utils::envs::set_session_name; use zellij_utils::errors::{prelude::*, ErrorContext}; -use zellij_utils::input::layout::{Layout, TiledPaneLayout, FloatingPaneLayout, SwapTiledLayout, SwapFloatingLayout, RunPluginLocation}; +use zellij_utils::input::layout::{ + FloatingPaneLayout, Layout, RunPluginLocation, SwapFloatingLayout, SwapTiledLayout, + TiledPaneLayout, +}; use zellij_utils::input::plugins::PluginTag; use zellij_utils::ipc::IpcReceiverWithContext; use zellij_utils::pane_size::{Size, SizeInPixels}; @@ -247,19 +250,16 @@ fn create_new_tab(size: Size, default_mode: ModeInfo) -> Tab { fn create_new_tab_with_swap_layouts( size: Size, default_mode: ModeInfo, - swap_layouts: ( - Vec<SwapTiledLayout>, - Vec<SwapFloatingLayout> - ), + swap_layouts: (Vec<SwapTiledLayout>, Vec<SwapFloatingLayout>), base_layout_and_ids: Option<( TiledPaneLayout, Vec<FloatingPaneLayout>, Vec<(u32, Option<RunCommand>)>, Vec<(u32, Option<RunCommand>)>, - HashMap<RunPluginLocation, Vec<u32>> + HashMap<RunPluginLocation, Vec<u32>>, )>, draw_pane_frames: bool, - ) -> Tab { +) -> Tab { set_session_name("test".into()); let index = 0; let position = 0; @@ -305,8 +305,18 @@ fn create_new_tab_with_swap_layouts( terminal_emulator_color_codes, swap_layouts, ); - let (base_layout, base_floating_layout, new_terminal_ids, new_floating_terminal_ids, new_plugin_ids) = base_layout_and_ids.unwrap_or_default(); - let new_terminal_ids = if new_terminal_ids.is_empty() { vec![(1, None)] } else { new_terminal_ids }; + let ( + base_layout, + base_floating_layout, + new_terminal_ids, + new_floating_terminal_ids, + new_plugin_ids, + ) = base_layout_and_ids.unwrap_or_default(); + let new_terminal_ids = if new_terminal_ids.is_empty() { + vec![(1, None)] + } else { + new_terminal_ids + }; tab.apply_layout( base_layout, base_floating_layout, @@ -3002,7 +3012,13 @@ fn can_swap_tiled_layout_at_runtime() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); tab.new_pane(new_pane_id_1, None, None, Some(client_id)) @@ -3049,7 +3065,13 @@ fn can_swap_floating_layout_at_runtime() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); @@ -3098,13 +3120,20 @@ fn swapping_layouts_after_resize_snaps_to_current_layout() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); tab.new_pane(new_pane_id_1, None, None, Some(client_id)) .unwrap(); tab.next_swap_layout(Some(client_id), false).unwrap(); - tab.resize(client_id, ResizeStrategy::new(Resize::Increase, None)).unwrap(); + tab.resize(client_id, ResizeStrategy::new(Resize::Increase, None)) + .unwrap(); tab.next_swap_layout(Some(client_id), false).unwrap(); tab.render(&mut output, None).unwrap(); let snapshot = take_snapshot( @@ -3139,7 +3168,13 @@ fn swap_tiled_layout_with_stacked_children() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); let new_pane_id_3 = PaneId::Terminal(4); @@ -3183,7 +3218,13 @@ fn swap_tiled_layout_with_stacked_children_and_no_pane_frames() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, false); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + false, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); let new_pane_id_3 = PaneId::Terminal(4); @@ -3227,7 +3268,13 @@ fn move_focus_up_with_stacked_panes() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); let new_pane_id_3 = PaneId::Terminal(4); @@ -3273,7 +3320,13 @@ fn move_focus_down_with_stacked_panes() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); let new_pane_id_3 = PaneId::Terminal(4); @@ -3323,14 +3376,21 @@ fn move_focus_right_into_stacked_panes() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); for i in 0..12 { let new_pane_id = i + 2; tab.new_pane(PaneId::Terminal(new_pane_id), None, None, Some(client_id)) .unwrap(); } tab.move_focus_left(client_id); - tab.horizontal_split(PaneId::Terminal(16), None, client_id).unwrap(); + tab.horizontal_split(PaneId::Terminal(16), None, client_id) + .unwrap(); tab.move_focus_up(client_id); tab.move_focus_right(client_id); @@ -3377,14 +3437,21 @@ fn move_focus_left_into_stacked_panes() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); for i in 0..13 { let new_pane_id = i + 2; tab.new_pane(PaneId::Terminal(new_pane_id), None, None, Some(client_id)) .unwrap(); } tab.move_focus_right(client_id); - tab.horizontal_split(PaneId::Terminal(1), None, client_id).unwrap(); + tab.horizontal_split(PaneId::Terminal(1), None, client_id) + .unwrap(); tab.move_focus_up(client_id); tab.move_focus_left(client_id); @@ -3433,7 +3500,13 @@ fn move_focus_up_into_stacked_panes() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); for i in 0..4 { let new_pane_id = i + 3; tab.new_pane(PaneId::Terminal(new_pane_id), None, None, Some(client_id)) @@ -3443,7 +3516,8 @@ fn move_focus_up_into_stacked_panes() { tab.move_focus_up(client_id); tab.move_focus_left(client_id); tab.move_focus_down(client_id); - tab.vertical_split(PaneId::Terminal(7), None, client_id).unwrap(); + tab.vertical_split(PaneId::Terminal(7), None, client_id) + .unwrap(); tab.move_focus_up(client_id); tab.render(&mut output, None).unwrap(); @@ -3490,7 +3564,13 @@ fn move_focus_down_into_stacked_panes() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); for i in 0..4 { let new_pane_id = i + 3; tab.new_pane(PaneId::Terminal(new_pane_id), None, None, Some(client_id)) @@ -3498,7 +3578,8 @@ fn move_focus_down_into_stacked_panes() { } tab.move_focus_left(client_id); tab.move_focus_up(client_id); - tab.vertical_split(PaneId::Terminal(7), None, client_id).unwrap(); + tab.vertical_split(PaneId::Terminal(7), None, client_id) + .unwrap(); tab.move_focus_down(client_id); tab.render(&mut output, None).unwrap(); @@ -3541,7 +3622,13 @@ fn close_main_stacked_pane() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); let new_pane_id_3 = PaneId::Terminal(4); @@ -3586,7 +3673,13 @@ fn close_main_stacked_pane_in_mid_stack() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); let new_pane_id_3 = PaneId::Terminal(4); @@ -3640,7 +3733,13 @@ fn close_one_liner_stacked_pane_below_main_pane() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); let new_pane_id_3 = PaneId::Terminal(4); @@ -3695,7 +3794,13 @@ fn close_one_liner_stacked_pane_above_main_pane() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); let new_pane_id_3 = PaneId::Terminal(4); @@ -3749,7 +3854,13 @@ fn can_increase_size_of_main_pane_in_stack_horizontally() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); let new_pane_id_3 = PaneId::Terminal(4); @@ -3767,8 +3878,11 @@ fn can_increase_size_of_main_pane_in_stack_horizontally() { tab.new_pane(new_pane_id_5, None, None, Some(client_id)) .unwrap(); tab.move_focus_right(client_id); - tab.resize(client_id, ResizeStrategy::new(Resize::Increase, Some(Direction::Left))) - .unwrap(); + tab.resize( + client_id, + ResizeStrategy::new(Resize::Increase, Some(Direction::Left)), + ) + .unwrap(); tab.render(&mut output, None).unwrap(); let snapshot = take_snapshot( output.serialize().unwrap().get(&client_id).unwrap(), @@ -3804,7 +3918,13 @@ fn can_increase_size_of_main_pane_in_stack_vertically() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); let new_pane_id_3 = PaneId::Terminal(4); @@ -3822,8 +3942,11 @@ fn can_increase_size_of_main_pane_in_stack_vertically() { tab.new_pane(new_pane_id_5, None, None, Some(client_id)) .unwrap(); tab.move_focus_right(client_id); - tab.resize(client_id, ResizeStrategy::new(Resize::Increase, Some(Direction::Down))) - .unwrap(); + tab.resize( + client_id, + ResizeStrategy::new(Resize::Increase, Some(Direction::Down)), + ) + .unwrap(); tab.render(&mut output, None).unwrap(); let snapshot = take_snapshot( output.serialize().unwrap().get(&client_id).unwrap(), @@ -3859,7 +3982,13 @@ fn can_increase_size_of_main_pane_in_stack_non_directionally() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); let new_pane_id_3 = PaneId::Terminal(4); @@ -3921,7 +4050,13 @@ fn increasing_size_of_main_pane_in_stack_horizontally_does_not_break_stack() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); let new_pane_id_3 = PaneId::Terminal(4); @@ -3957,8 +4092,11 @@ fn increasing_size_of_main_pane_in_stack_horizontally_does_not_break_stack() { tab.new_pane(new_pane_id_11, None, None, Some(client_id)) .unwrap(); tab.move_focus_right(client_id); - tab.resize(client_id, ResizeStrategy::new(Resize::Increase, Some(Direction::Left))) - .unwrap(); + tab.resize( + client_id, + ResizeStrategy::new(Resize::Increase, Some(Direction::Left)), + ) + .unwrap(); tab.render(&mut output, None).unwrap(); let snapshot = take_snapshot( output.serialize().unwrap().get(&client_id).unwrap(), @@ -3992,7 +4130,13 @@ fn can_increase_size_into_pane_stack_horizontally() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); let new_pane_id_3 = PaneId::Terminal(4); @@ -4009,8 +4153,11 @@ fn can_increase_size_into_pane_stack_horizontally() { .unwrap(); tab.new_pane(new_pane_id_5, None, None, Some(client_id)) .unwrap(); - tab.resize(client_id, ResizeStrategy::new(Resize::Increase, Some(Direction::Right))) - .unwrap(); + tab.resize( + client_id, + ResizeStrategy::new(Resize::Increase, Some(Direction::Right)), + ) + .unwrap(); tab.render(&mut output, None).unwrap(); let snapshot = take_snapshot( output.serialize().unwrap().get(&client_id).unwrap(), @@ -4046,7 +4193,13 @@ fn can_increase_size_into_pane_stack_vertically() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); let new_pane_id_3 = PaneId::Terminal(4); @@ -4065,8 +4218,11 @@ fn can_increase_size_into_pane_stack_vertically() { .unwrap(); tab.move_focus_right(client_id); tab.move_focus_down(client_id); - tab.resize(client_id, ResizeStrategy::new(Resize::Increase, Some(Direction::Up))) - .unwrap(); + tab.resize( + client_id, + ResizeStrategy::new(Resize::Increase, Some(Direction::Up)), + ) + .unwrap(); tab.render(&mut output, None).unwrap(); let snapshot = take_snapshot( output.serialize().unwrap().get(&client_id).unwrap(), @@ -4102,7 +4258,13 @@ fn can_increase_size_into_pane_stack_non_directionally() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); let new_pane_id_3 = PaneId::Terminal(4); @@ -4164,7 +4326,13 @@ fn increasing_size_into_main_pane_in_stack_horizontally_does_not_break_stack() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); let new_pane_id_3 = PaneId::Terminal(4); @@ -4196,8 +4364,11 @@ fn increasing_size_into_main_pane_in_stack_horizontally_does_not_break_stack() { .unwrap(); tab.new_pane(new_pane_id_10, None, None, Some(client_id)) .unwrap(); - tab.resize(client_id, ResizeStrategy::new(Resize::Increase, Some(Direction::Right))) - .unwrap(); + tab.resize( + client_id, + ResizeStrategy::new(Resize::Increase, Some(Direction::Right)), + ) + .unwrap(); tab.render(&mut output, None).unwrap(); let snapshot = take_snapshot( output.serialize().unwrap().get(&client_id).unwrap(), @@ -4231,7 +4402,13 @@ fn decreasing_size_of_whole_tab_treats_stacked_panes_properly() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); let new_pane_id_3 = PaneId::Terminal(4); @@ -4285,7 +4462,13 @@ fn increasing_size_of_whole_tab_treats_stacked_panes_properly() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); let new_pane_id_3 = PaneId::Terminal(4); @@ -4344,7 +4527,13 @@ fn cannot_decrease_stack_size_beyond_minimum_height() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); let new_pane_id_3 = PaneId::Terminal(4); @@ -4363,8 +4552,11 @@ fn cannot_decrease_stack_size_beyond_minimum_height() { .unwrap(); tab.move_focus_down(client_id); for _ in 0..6 { - tab.resize(client_id, ResizeStrategy::new(Resize::Increase, Some(Direction::Up))) - .unwrap(); + tab.resize( + client_id, + ResizeStrategy::new(Resize::Increase, Some(Direction::Up)), + ) + .unwrap(); } tab.render(&mut output, None).unwrap(); let snapshot = take_snapshot( @@ -4400,7 +4592,13 @@ fn focus_stacked_pane_over_flexible_pane_with_the_mouse() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, + ModeInfo::default(), + (swap_tiled_layouts, swap_floating_layouts), + None, + true, + ); let new_pane_id_1 = PaneId::Terminal(2); let new_pane_id_2 = PaneId::Terminal(3); let new_pane_id_3 = PaneId::Terminal(4); @@ -4453,7 +4651,13 @@ fn focus_stacked_pane_under_flexible_pane_with_the_mouse() { let layout = Layout::from_kdl(swap_layouts, "file_name.kdl".into(), None, None).unwrap(); let swap_tiled_layouts = layout.swap_tiled_layouts.clone(); let swap_floating_layouts = layout.swap_floating_layouts.clone(); - let mut tab = create_new_tab_with_swap_layouts(size, ModeInfo::default(), (swap_tiled_layouts, swap_floating_layouts), None, true); + let mut tab = create_new_tab_with_swap_layouts( + size, |