summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAram Drevekenin <aram@poor.dev>2022-10-11 13:20:35 +0200
committerAram Drevekenin <aram@poor.dev>2022-10-11 13:20:35 +0200
commitb1edb08e1b45d5d359a4dec3dbde0f956e94b0db (patch)
tree4a48b8db333d3fe025f6199332591a8e21f190f4
parente488a094577aa862bc4a9f9f868f411a7aac0e8d (diff)
style(fmt): rustfmt
-rw-r--r--zellij-server/src/screen.rs7
-rw-r--r--zellij-server/src/tab/mod.rs2
-rw-r--r--zellij-server/src/tab/unit/tab_integration_tests.rs267
-rw-r--r--zellij-server/src/tab/unit/tab_tests.rs41
-rw-r--r--zellij-server/src/unit/screen_tests.rs8
5 files changed, 221 insertions, 104 deletions
diff --git a/zellij-server/src/screen.rs b/zellij-server/src/screen.rs
index 5c181e055..3ab1521a4 100644
--- a/zellij-server/src/screen.rs
+++ b/zellij-server/src/screen.rs
@@ -1223,7 +1223,12 @@ pub(crate) fn screen_thread_main(
ScreenInstruction::Render => {
screen.render()?;
},
- ScreenInstruction::NewPane(pid, initial_pane_title, should_float, client_or_tab_index) => {
+ ScreenInstruction::NewPane(
+ pid,
+ initial_pane_title,
+ should_float,
+ client_or_tab_index,
+ ) => {
match client_or_tab_index {
ClientOrTabIndex::ClientId(client_id) => {
active_tab_and_connected_client_id!(screen, client_id, |tab: &mut Tab,
diff --git a/zellij-server/src/tab/mod.rs b/zellij-server/src/tab/mod.rs
index ef2271028..40879d374 100644
--- a/zellij-server/src/tab/mod.rs
+++ b/zellij-server/src/tab/mod.rs
@@ -7,8 +7,8 @@ mod copy_command;
use copy_command::CopyCommand;
use std::env::temp_dir;
use uuid::Uuid;
-use zellij_utils::input::command::RunCommand;
use zellij_utils::errors::prelude::*;
+use zellij_utils::input::command::RunCommand;
use zellij_utils::position::{Column, Line};
use zellij_utils::{position::Position, serde};
diff --git a/zellij-server/src/tab/unit/tab_integration_tests.rs b/zellij-server/src/tab/unit/tab_integration_tests.rs
index 08b6db2c4..f1efe339d 100644
--- a/zellij-server/src/tab/unit/tab_integration_tests.rs
+++ b/zellij-server/src/tab/unit/tab_integration_tests.rs
@@ -223,7 +223,8 @@ fn create_new_tab(size: Size, default_mode: ModeInfo) -> Tab {
terminal_emulator_colors,
terminal_emulator_color_codes,
);
- tab.apply_layout(PaneLayout::default(), vec![1], index, client_id).unwrap();
+ tab.apply_layout(PaneLayout::default(), vec![1], index, client_id)
+ .unwrap();
tab
}
@@ -392,7 +393,8 @@ fn create_new_tab_with_sixel_support(
terminal_emulator_colors,
terminal_emulator_color_codes,
);
- tab.apply_layout(PaneLayout::default(), vec![1], index, client_id).unwrap();
+ tab.apply_layout(PaneLayout::default(), vec![1], index, client_id)
+ .unwrap();
tab
}
@@ -500,7 +502,8 @@ fn dump_screen() {
file_dumps: map.clone(),
});
let new_pane_id = PaneId::Terminal(2);
- tab.new_pane(new_pane_id, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(2, Vec::from("scratch".as_bytes()))
.unwrap();
let file = "/tmp/log.sh";
@@ -523,7 +526,8 @@ fn new_floating_pane() {
let new_pane_id = PaneId::Terminal(2);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -550,7 +554,8 @@ fn floating_panes_persist_across_toggles() {
let new_pane_id = PaneId::Terminal(2);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id, None, None, Some(client_id))
+ .unwrap();
tab.toggle_floating_panes(client_id, None).unwrap();
// here we send bytes to the pane when it's not visible to make sure they're still handled and
// we see them once we toggle the panes back
@@ -581,7 +586,8 @@ fn toggle_floating_panes_off() {
let new_pane_id = PaneId::Terminal(2);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -609,7 +615,8 @@ fn toggle_floating_panes_on() {
let new_pane_id = PaneId::Terminal(2);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -642,11 +649,16 @@ fn five_new_floating_panes() {
let new_pane_id_5 = PaneId::Terminal(6);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id_1, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_2, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_3, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_4, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_5, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id_1, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_2, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_3, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_4, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_5, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -681,7 +693,8 @@ fn increase_floating_pane_size() {
let new_pane_id_1 = PaneId::Terminal(2);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id_1, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id_1, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -709,7 +722,8 @@ fn decrease_floating_pane_size() {
let new_pane_id_1 = PaneId::Terminal(2);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id_1, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id_1, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -737,7 +751,8 @@ fn resize_floating_pane_left() {
let new_pane_id_1 = PaneId::Terminal(2);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id_1, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id_1, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -765,7 +780,8 @@ fn resize_floating_pane_right() {
let new_pane_id_1 = PaneId::Terminal(2);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id_1, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id_1, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -793,7 +809,8 @@ fn resize_floating_pane_up() {
let new_pane_id_1 = PaneId::Terminal(2);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id_1, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id_1, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -821,7 +838,8 @@ fn resize_floating_pane_down() {
let new_pane_id_1 = PaneId::Terminal(2);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id_1, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id_1, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -853,11 +871,16 @@ fn move_floating_pane_focus_left() {
let new_pane_id_5 = PaneId::Terminal(6);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id_1, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_2, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_3, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_4, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_5, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id_1, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_2, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_3, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_4, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_5, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -903,11 +926,16 @@ fn move_floating_pane_focus_right() {
let new_pane_id_5 = PaneId::Terminal(6);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id_1, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_2, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_3, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_4, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_5, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id_1, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_2, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_3, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_4, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_5, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -954,11 +982,16 @@ fn move_floating_pane_focus_up() {
let new_pane_id_5 = PaneId::Terminal(6);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id_1, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_2, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_3, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_4, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_5, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id_1, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_2, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_3, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_4, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_5, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -1004,11 +1037,16 @@ fn move_floating_pane_focus_down() {
let new_pane_id_5 = PaneId::Terminal(6);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id_1, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_2, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_3, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_4, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_5, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id_1, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_2, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_3, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_4, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_5, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -1055,11 +1093,16 @@ fn move_floating_pane_focus_with_mouse() {
let new_pane_id_5 = PaneId::Terminal(6);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id_1, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_2, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_3, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_4, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_5, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id_1, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_2, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_3, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_4, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_5, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -1108,11 +1151,16 @@ fn move_pane_focus_with_mouse_to_non_floating_pane() {
let new_pane_id_5 = PaneId::Terminal(6);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id_1, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_2, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_3, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_4, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_5, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id_1, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_2, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_3, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_4, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_5, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -1161,11 +1209,16 @@ fn drag_pane_with_mouse() {
let new_pane_id_5 = PaneId::Terminal(6);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id_1, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_2, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_3, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_4, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_5, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id_1, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_2, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_3, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_4, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_5, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -1214,11 +1267,16 @@ fn mark_text_inside_floating_pane() {
let new_pane_id_5 = PaneId::Terminal(6);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id_1, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_2, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_3, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_4, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_5, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id_1, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_2, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_3, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_4, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_5, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -1275,11 +1333,16 @@ fn resize_tab_with_floating_panes() {
let new_pane_id_5 = PaneId::Terminal(6);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id_1, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_2, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_3, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_4, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_5, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id_1, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_2, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_3, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_4, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_5, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -1323,11 +1386,16 @@ fn shrink_whole_tab_with_floating_panes_horizontally_and_vertically() {
let new_pane_id_5 = PaneId::Terminal(6);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id_1, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_2, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_3, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_4, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_5, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id_1, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_2, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_3, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_4, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_5, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -1368,11 +1436,16 @@ fn shrink_whole_tab_with_floating_panes_horizontally_and_vertically_and_expand_b
let new_pane_id_5 = PaneId::Terminal(6);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id_1, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_2, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_3, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_4, None, None, Some(client_id)).unwrap();
- tab.new_pane(new_pane_id_5, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id_1, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_2, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_3, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_4, None, None, Some(client_id))
+ .unwrap();
+ tab.new_pane(new_pane_id_5, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -1413,7 +1486,8 @@ fn embed_floating_pane() {
let new_pane_id = PaneId::Terminal(2);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am scratch terminal".as_bytes()),
@@ -1440,7 +1514,8 @@ fn float_embedded_pane() {
let mut tab = create_new_tab(size, ModeInfo::default());
let new_pane_id = PaneId::Terminal(2);
let mut output = Output::default();
- tab.new_pane(new_pane_id, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am an embedded pane".as_bytes()),
@@ -1542,7 +1617,8 @@ fn rename_floating_pane() {
let mut tab = create_new_tab(size, ModeInfo::default());
let new_pane_id = PaneId::Terminal(2);
let mut output = Output::default();
- tab.new_pane(new_pane_id, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id, None, None, Some(client_id))
+ .unwrap();
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am a floating pane".as_bytes()),
@@ -1627,7 +1703,8 @@ fn move_floating_pane_with_sixel_image() {
let mut output = Output::new(sixel_image_store.clone(), character_cell_size);
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id, None, None, Some(client_id))
+ .unwrap();
let fixture = read_fixture("sixel-image-500px.six");
tab.handle_pty_bytes(2, fixture).unwrap();
tab.handle_left_click(&Position::new(5, 71), client_id)
@@ -1664,7 +1741,8 @@ fn floating_pane_above_sixel_image() {
let mut output = Output::new(sixel_image_store.clone(), character_cell_size);
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id, None, None, Some(client_id))
+ .unwrap();
let fixture = read_fixture("sixel-image-500px.six");
tab.handle_pty_bytes(1, fixture).unwrap();
tab.handle_left_click(&Position::new(5, 71), client_id)
@@ -1720,9 +1798,11 @@ fn suppress_floating_pane() {
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id, None, None, Some(client_id))
+ .unwrap();
tab.suppress_active_pane(editor_pane_id, client_id).unwrap();
- tab.handle_pty_bytes(3, Vec::from("\n\n\nI am an editor pane".as_bytes())).unwrap();
+ tab.handle_pty_bytes(3, Vec::from("\n\n\nI am an editor pane".as_bytes()))
+ .unwrap();
tab.render(&mut output, None).unwrap();
let snapshot = take_snapshot(
output.serialize().get(&client_id).unwrap(),
@@ -1772,10 +1852,13 @@ fn close_suppressing_floating_pane() {
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id, None, None, Some(client_id))
+ .unwrap();
tab.suppress_active_pane(editor_pane_id, client_id).unwrap();
- tab.handle_pty_bytes(3, Vec::from("\n\n\nI am an editor pane".as_bytes())).unwrap();
- tab.handle_pty_bytes(2, Vec::from("\n\n\nI am the original pane".as_bytes())).unwrap();
+ tab.handle_pty_bytes(3, Vec::from("\n\n\nI am an editor pane".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("\n\n\nI am the original pane".as_bytes()))
+ .unwrap();
tab.close_pane(editor_pane_id, false);
tab.render(&mut output, None).unwrap();
let snapshot = take_snapshot(
@@ -1827,10 +1910,13 @@ fn suppress_floating_pane_embed_it_and_close_it() {
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id, None, None, Some(client_id))
+ .unwrap();
tab.suppress_active_pane(editor_pane_id, client_id).unwrap();
- tab.handle_pty_bytes(3, Vec::from("\n\n\nI am an editor pane".as_bytes())).unwrap();
- tab.handle_pty_bytes(2, Vec::from("\n\n\nI am the original pane".as_bytes())).unwrap();
+ tab.handle_pty_bytes(3, Vec::from("\n\n\nI am an editor pane".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("\n\n\nI am the original pane".as_bytes()))
+ .unwrap();
tab.toggle_pane_embed_or_floating(client_id).unwrap();
tab.close_pane(editor_pane_id, false);
tab.render(&mut output, None).unwrap();
@@ -1883,9 +1969,11 @@ fn resize_whole_tab_while_floting_pane_is_suppressed() {
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id, None, None, Some(client_id))
+ .unwrap();
tab.suppress_active_pane(editor_pane_id, client_id).unwrap();
- tab.handle_pty_bytes(3, Vec::from("\n\n\nI am an editor pane".as_bytes())).unwrap();
+ tab.handle_pty_bytes(3, Vec::from("\n\n\nI am an editor pane".as_bytes()))
+ .unwrap();
tab.resize_whole_tab(Size {
cols: 100,
rows: 10,
@@ -1981,7 +2069,8 @@ fn enter_search_floating_pane() {
let new_pane_id = PaneId::Terminal(2);
let mut output = Output::default();
tab.toggle_floating_panes(client_id, None).unwrap();
- tab.new_pane(new_pane_id, None, None, Some(client_id)).unwrap();
+ tab.new_pane(new_pane_id, None, None, Some(client_id))
+ .unwrap();
let pane_content = read_fixture("grid_copy");
tab.handle_pty_bytes(2, pane_content).unwrap();
diff --git a/zellij-server/src/tab/unit/tab_tests.rs b/zellij-server/src/tab/unit/tab_tests.rs
index 56bf147e9..2b8d51a13 100644
--- a/zellij-server/src/tab/unit/tab_tests.rs
+++ b/zellij-server/src/tab/unit/tab_tests.rs
@@ -142,7 +142,8 @@ fn create_new_tab(size: Size) -> Tab {
terminal_emulator_colors,
terminal_emulator_color_codes,
);
- tab.apply_layout(PaneLayout::default(), vec![1], index, client_id).unwrap();
+ tab.apply_layout(PaneLayout::default(), vec![1], index, client_id)
+ .unwrap();
tab
}
@@ -188,7 +189,8 @@ fn create_new_tab_with_cell_size(
terminal_emulator_colors,
terminal_emulator_color_codes,
);
- tab.apply_layout(PaneLayout::default(), vec![1], index, client_id).unwrap();
+ tab.apply_layout(PaneLayout::default(), vec![1], index, client_id)
+ .unwrap();
tab
}
@@ -620,7 +622,8 @@ pub fn cannot_split_panes_horizontally_when_active_pane_is_too_small() {
pub fn cannot_split_largest_pane_when_there_is_no_room() {
let size = Size { cols: 8, rows: 4 };
let mut tab = create_new_tab(size);
- tab.new_pane(PaneId::Terminal(2), None, None, Some(1)).unwrap();
+ tab.new_pane(PaneId::Terminal(2), None, None, Some(1))
+ .unwrap();
assert_eq!(
tab.tiled_panes.panes.len(),
1,
@@ -710,10 +713,18 @@ fn switch_to_next_pane_fullscreen() {
let mut active_tab = create_new_tab(size);
- active_tab.new_pane(PaneId::Terminal(1), None, None, Some(1)).unwrap();
- active_tab.new_pane(PaneId::Terminal(2), None, None, Some(1)).unwrap();
- active_tab.new_pane(PaneId::Terminal(3), None, None, Some(1)).unwrap();
- active_tab.new_pane(PaneId::Terminal(4), None, None, Some(1)).unwrap();
+ active_tab
+ .new_pane(PaneId::Terminal(1), None, None, Some(1))
+ .unwrap();
+ active_tab
+ .new_pane(PaneId::Terminal(2), None, None, Some(1))
+ .unwrap();
+ active_tab
+ .new_pane(PaneId::Terminal(3), None, None, Some(1))
+ .unwrap();
+ active_tab
+ .new_pane(PaneId::Terminal(4), None, None, Some(1))
+ .unwrap();
active_tab.toggle_active_pane_fullscreen(1);
// order is now 1 ->2 -> 3 -> 4 due to how new panes are inserted
@@ -742,10 +753,18 @@ fn switch_to_prev_pane_fullscreen() {
//testing four consecutive switches in fullscreen mode
- active_tab.new_pane(PaneId::Terminal(1), None, None, Some(1)).unwrap();
- active_tab.new_pane(PaneId::Terminal(2), None, None, Some(1)).unwrap();
- active_tab.new_pane(PaneId::Terminal(3), None, None, Some(1)).unwrap();
- active_tab.new_pane(PaneId::Terminal(4), None, None, Some(1)).unwrap();
+ active_tab