diff options
| author | Aram Drevekenin <aram@poor.dev> | 2022-12-24 15:48:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-24 15:48:04 +0100 |
| commit | 799fa5de8dfd0b826be0f903796bba48a470127e (patch) | |
| tree | 8c202e116b757162cadd0cc350da256b9741e248 /zellij-utils/src/input | |
| parent | docs(changelog): remove nix support (diff) | |
| download | sl0ppij-799fa5de8dfd0b826be0f903796bba48a470127e.tar.gz sl0ppij-799fa5de8dfd0b826be0f903796bba48a470127e.tar.xz sl0ppij-799fa5de8dfd0b826be0f903796bba48a470127e.zip | |
Floating panes in layouts (#2047)
* work
* tests passing
* tests: floating panes in layouts
* panes(plugins): floating plugins working
* refactor(tab): layout applier
* style(comment): remove outdated
* style(fmt): rustfmt
Diffstat (limited to 'zellij-utils/src/input')
40 files changed, 477 insertions, 52 deletions
diff --git a/zellij-utils/src/input/actions.rs b/zellij-utils/src/input/actions.rs index e1a45bf5..7bb13540 100644 --- a/zellij-utils/src/input/actions.rs +++ b/zellij-utils/src/input/actions.rs @@ -1,7 +1,7 @@ //! Definition of the actions that can be bound to keys. use super::command::RunCommandAction; -use super::layout::{Layout, PaneLayout}; +use super::layout::{FloatingPanesLayout, Layout, PaneLayout}; use crate::cli::CliAction; use crate::data::InputMode; use crate::data::{Direction, Resize}; @@ -162,7 +162,7 @@ pub enum Action { PaneNameInput(Vec<u8>), UndoRenamePane, /// Create a new tab, optionally with a specified tab layout. - NewTab(Option<PaneLayout>, Option<String>), // the String is the tab name + NewTab(Option<PaneLayout>, Vec<FloatingPanesLayout>, Option<String>), // the String is the tab name /// Do nothing. NoOp, /// Go to the next tab. @@ -368,15 +368,24 @@ impl Action { if tabs.len() > 1 { return Err(format!("Tab layout cannot itself have tabs")); } else if !tabs.is_empty() { - let (tab_name, layout) = tabs.drain(..).next().unwrap(); + let (tab_name, layout, floating_panes_layout) = + tabs.drain(..).next().unwrap(); let name = tab_name.or(name); - Ok(vec![Action::NewTab(Some(layout), name)]) + Ok(vec![Action::NewTab( + Some(layout), + floating_panes_layout, + name, + )]) } else { - let layout = layout.new_tab(); - Ok(vec![Action::NewTab(Some(layout), name)]) + let (layout, floating_panes_layout) = layout.new_tab(); + Ok(vec![Action::NewTab( + Some(layout), + floating_panes_layout, + name, + )]) } } else { - Ok(vec![Action::NewTab(None, name)]) + Ok(vec![Action::NewTab(None, vec![], name)]) } }, } diff --git a/zellij-utils/src/input/layout.rs b/zellij-utils/src/input/layout.rs index 6c4a222c..eaa2e395 100644 --- a/zellij-utils/src/input/layout.rs +++ b/zellij-utils/src/input/layout.rs @@ -213,9 +213,94 @@ impl fmt::Display for RunPluginLocation { #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, Default)] pub struct Layout { - pub tabs: Vec<(Option<String>, PaneLayout)>, + pub tabs: Vec<(Option<String>, PaneLayout, Vec<FloatingPanesLayout>)>, pub focused_tab_index: Option<usize>, pub template: Option<PaneLayout>, + pub floating_panes_template: Vec<FloatingPanesLayout>, +} + +#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)] +pub enum PercentOrFixed { + Percent(usize), // 1 to 100 + Fixed(usize), // An absolute number of columns or rows +} + +impl PercentOrFixed { + pub fn to_position(&self, whole: usize) -> usize { + match self { + PercentOrFixed::Percent(percent) => { + (whole as f64 / 100.0 * *percent as f64).ceil() as usize + }, + PercentOrFixed::Fixed(fixed) => { + if *fixed > whole { + whole + } else { + *fixed + } + }, + } + } +} + +impl PercentOrFixed { + pub fn is_zero(&self) -> bool { + match self { + PercentOrFixed::Percent(percent) => *percent == 0, + PercentOrFixed::Fixed(fixed) => *fixed == 0, + } + } +} + +impl FromStr for PercentOrFixed { + type Err = Box<dyn std::error::Error>; + fn from_str(s: &str) -> Result<Self, Self::Err> { + if s.chars().last() == Some('%') { + let char_count = s.chars().count(); + let percent_size = usize::from_str_radix(&s[..char_count.saturating_sub(1)], 10)?; + if percent_size <= 100 { + Ok(PercentOrFixed::Percent(percent_size)) + } else { + Err("Percent must be between 0 and 100".into()) + } + } else { + let fixed_size = usize::from_str_radix(s, 10)?; + Ok(PercentOrFixed::Fixed(fixed_size)) + } + } +} + +#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, Default)] +pub struct FloatingPanesLayout { + // TODO: change name to singular + pub name: Option<String>, + pub height: Option<PercentOrFixed>, + pub width: Option<PercentOrFixed>, + pub x: Option<PercentOrFixed>, + pub y: Option<PercentOrFixed>, + pub run: Option<Run>, + pub focus: Option<bool>, +} + +impl FloatingPanesLayout { + pub fn add_cwd_to_layout(&mut self, cwd: &PathBuf) { + match self.run.as_mut() { + Some(run) => run.add_cwd(cwd), + None => { + self.run = Some(Run::Cwd(cwd.clone())); + }, + } + } +} + +impl From<&PaneLayout> for FloatingPanesLayout { + fn from(pane_layout: &PaneLayout) -> Self { + FloatingPanesLayout { + name: pane_layout.name.clone(), + run: pane_layout.run.clone(), + focus: pane_layout.focus, + ..Default::default() + } + } } #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, Default)] @@ -276,6 +361,8 @@ impl PaneLayout { Ok(layouts) } pub fn extract_run_instructions(&self) -> Vec<Option<Run>> { + // the order of these run instructions is significant and needs to be the same + // as the order of the "flattened" layout panes received from eg. position_panes_in_space let mut run_instructions = vec![]; if self.children.is_empty() { run_instructions.push(self.run.clone()); @@ -452,11 +539,12 @@ impl Layout { Ok(String::from_utf8(setup::COMPACT_BAR_LAYOUT.to_vec())?) } - pub fn new_tab(&self) -> PaneLayout { - match &self.template { + pub fn new_tab(&self) -> (PaneLayout, Vec<FloatingPanesLayout>) { + let template = match &self.template { Some(template) => template.clone(), None => PaneLayout::default(), - } + }; + (template, self.floating_panes_template.clone()) } pub fn is_empty(&self) -> bool { @@ -467,7 +555,7 @@ impl Layout { !self.tabs.is_empty() } - pub fn tabs(&self) -> Vec<(Option<String>, PaneLayout)> { + pub fn tabs(&self) -> Vec<(Option<String>, PaneLayout, Vec<FloatingPanesLayout>)> { // String is the tab name self.tabs.clone() } diff --git a/zellij-utils/src/input/unit/layout_test.rs b/zellij-utils/src/input/unit/layout_test.rs index f11c8686..d588fcda 100644 --- a/zellij-utils/src/input/unit/layout_test.rs +++ b/zellij-utils/src/input/unit/layout_test.rs @@ -90,6 +90,175 @@ fn layout_with_nested_panes() { } #[test] +fn layout_with_floating_panes() { + let kdl_layout = r#" + layout { + floating_panes { + pane + pane { + x 10 + y "10%" + width 10 + height "10%" + } + pane x=10 y="10%" + pane command="htop" + } + } + "#; + let layout = Layout::from_kdl(kdl_layout, "layout_file_name".into(), None).unwrap(); + let expected_layout = Layout { + template: Some(PaneLayout::default()), + floating_panes_template: vec![ + FloatingPanesLayout::default(), + FloatingPanesLayout { + x: Some(PercentOrFixed::Fixed(10)), + y: Some(PercentOrFixed::Percent(10)), + width: Some(PercentOrFixed::Fixed(10)), + height: Some(PercentOrFixed::Percent(10)), + ..Default::default() + }, + FloatingPanesLayout { + x: Some(PercentOrFixed::Fixed(10)), + y: Some(PercentOrFixed::Percent(10)), + ..Default::default() + }, + FloatingPanesLayout { + run: Some(Run::Command(RunCommand { + command: PathBuf::from("htop"), + hold_on_close: true, + ..Default::default() + })), + ..Default::default() + }, + ], + ..Default::default() + }; + assert_eq!(layout, expected_layout); +} + +#[test] +fn layout_with_mixed_panes_and_floating_panes() { + let kdl_layout = r#" + layout { + pane + pane + floating_panes { + pane + } + } + "#; + let layout = Layout::from_kdl(kdl_layout, "layout_file_name".into(), None).unwrap(); + let expected_layout = Layout { + template: Some(PaneLayout { + children: vec![PaneLayout::default(), PaneLayout::default()], + ..Default::default() + }), + floating_panes_template: vec![FloatingPanesLayout::default()], + ..Default::default() + }; + assert_eq!(layout, expected_layout); +} + +#[test] +fn layout_with_floating_panes_template() { + let kdl_layout = r#" + layout { + pane_template name="my_cool_template" { + x 10 + y "10%" + } + pane + floating_panes { + pane + my_cool_template + } + } + "#; + let layout = Layout::from_kdl(kdl_layout, "layout_file_name".into(), None).unwrap(); + let expected_layout = Layout { + template: Some(PaneLayout { + children: vec![PaneLayout::default()], + ..Default::default() + }), + floating_panes_template: vec![ + FloatingPanesLayout::default(), + FloatingPanesLayout { + x: Some(PercentOrFixed::Fixed(10)), + y: Some(PercentOrFixed::Percent(10)), + ..Default::default() + }, + ], + ..Default::default() + }; + assert_eq!(layout, expected_layout); +} + +#[test] +fn layout_with_shared_tiled_and_floating_panes_template() { + let kdl_layout = r#" + layout { + pane_template name="htop" { + command "htop" + } + htop + floating_panes { + pane + htop + } + } + "#; + let layout = Layout::from_kdl(kdl_layout, "layout_file_name".into(), None).unwrap(); + let expected_layout = Layout { + template: Some(PaneLayout { + children: vec![PaneLayout { + run: Some(Run::Command(RunCommand { + command: PathBuf::from("htop"), + hold_on_close: true, + ..Default::default() + })), + ..Default::default() + }], + ..Default::default() + }), + floating_panes_template: vec![ + FloatingPanesLayout::default(), + FloatingPanesLayout { + run: Some(Run::Command(RunCommand { + command: PathBuf::from("htop"), + hold_on_close: true, + ..Default::default() + })), + ..Default::default() + }, + ], + ..Default::default() + }; + assert_eq!(layout, expected_layout); +} + +#[test] +fn layout_with_tabs_and_floating_panes() { + let kdl_layout = r#" + layout { + tab { + floating_panes { + pane + } + } + tab { + floating_panes { + pane + pane + } + } + } + "#; + let layout = Layout::from_kdl(kdl_layout, "layout_file_name".into(), None).unwrap(); + assert_snapshot!(format!("{:#?}", layout)); +} + +#[test] fn layout_with_tabs() { let kdl_layout = r#" layout { @@ -98,7 +267,7 @@ fn layout_with_tabs() { "#; let layout = Layout::from_kdl(kdl_layout, "layout_file_name".into(), None).unwrap(); let expected_layout = Layout { - tabs: vec![(None, PaneLayout::default())], + tabs: vec![(None, PaneLayout::default(), vec![])], template: Some(PaneLayout::default()), ..Default::default() }; @@ -134,6 +303,7 @@ fn layout_with_nested_differing_tabs() { ], ..Default::default() }, + vec![], // floating panes ), ( None, @@ -142,6 +312,7 @@ fn layout_with_nested_differing_tabs() { children: vec![PaneLayout::default(), PaneLayout::default()], ..Default::default() }, + vec![], // floating panes ), ], template: Some(PaneLayout::default()), @@ -412,6 +583,7 @@ fn layout_with_tab_names() { children: vec![], ..Default::default() }, + vec![], // floating panes ), ( Some("my cool tab name 2".into()), @@ -419,6 +591,7 @@ fn layout_with_tab_names() { children: vec![], ..Default::default() }, + vec![], // floating panes ), ], template: Some(PaneLayout::default()), @@ -439,9 +612,9 @@ fn layout_with_focused_tab() { let layout = Layout::from_kdl(kdl_layout, "layout_file_name".into(), None).unwrap(); let expected_layout = Layout { tabs: vec![ - (None, PaneLayout::default()), - (None, PaneLayout::default()), - (None, PaneLayout::default()), + (None, PaneLayout::default(), vec![]), + (None, PaneLayout::default(), vec![]), + (None, PaneLayout::default(), vec![]), ], template: Some(PaneLayout::default()), focused_tab_index: Some(1), @@ -488,6 +661,7 @@ fn layout_with_tab_templates() { ], ..Default::default() }, + vec![], // floating panes ), ( Some("my second tab".into()), @@ -504,6 +678,7 @@ fn layout_with_tab_templates() { ], ..Default::default() }, + vec![], // floating panes ), ( None, @@ -516,6 +691,7 @@ fn layout_with_tab_templates() { ], ..Default::default() }, + vec![], // floating panes ), ], template: Some(PaneLayout::default()), diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__args_added_to_args_in_template.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__args_added_to_args_in_template.snap index 8b6d9050..0fc51aad 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__args_added_to_args_in_template.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__args_added_to_args_in_template.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1081 +assertion_line: 1101 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -62,4 +62,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__args_override_args_in_template.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__args_override_args_in_template.snap index 4b026d75..64d47573 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__args_override_args_in_template.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__args_override_args_in_template.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1046 +assertion_line: 1066 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -65,4 +65,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__children_not_as_first_child_of_pane_template.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__children_not_as_first_child_of_pane_template.snap index f7f904f6..36eeb717 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__children_not_as_first_child_of_pane_template.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__children_not_as_first_child_of_pane_template.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 711 +assertion_line: 744 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -138,4 +138,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__children_not_as_first_child_of_tab_template.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__children_not_as_first_child_of_tab_template.snap index 003a3d41..ac027457 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__children_not_as_first_child_of_tab_template.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__children_not_as_first_child_of_tab_template.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 801 +assertion_line: 696 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -82,6 +82,7 @@ Layout { focus: None, external_children_index: None, }, + [], ), ( None, @@ -129,6 +130,7 @@ Layout { focus: None, external_children_index: None, }, + [], ), ], focused_tab_index: None, @@ -144,4 +146,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__close_on_exit_added_to_close_on_exit_in_template.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__close_on_exit_added_to_close_on_exit_in_template.snap index d23bb40c..0386fd19 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__close_on_exit_added_to_close_on_exit_in_template.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__close_on_exit_added_to_close_on_exit_in_template.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1098 +assertion_line: 1118 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -59,4 +59,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__close_on_exit_overrides_close_on_exit_in_template.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__close_on_exit_overrides_close_on_exit_in_template.snap index abce2964..487bfb82 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__close_on_exit_overrides_close_on_exit_in_template.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__close_on_exit_overrides_close_on_exit_in_template.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1064 +assertion_line: 1084 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -59,4 +59,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__combined_tab_and_pane_template_both_with_children.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__combined_tab_and_pane_template_both_with_children.snap index a964c655..0c4cb680 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__combined_tab_and_pane_template_both_with_children.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__combined_tab_and_pane_template_both_with_children.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 899 +assertion_line: 796 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -105,6 +105,7 @@ Layout { focus: None, external_children_index: None, }, + [], ), ( None, @@ -183,6 +184,7 @@ Layout { focus: None, external_children_index: None, }, + [], ), ], focused_tab_index: None, @@ -198,4 +200,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__cwd_added_to_cwd_in_template.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__cwd_added_to_cwd_in_template.snap index 48bb1183..beb1f67f 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__cwd_added_to_cwd_in_template.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__cwd_added_to_cwd_in_template.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1133 +assertion_line: 1153 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -61,4 +61,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__cwd_override_cwd_in_template.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__cwd_override_cwd_in_template.snap index 7d57e6d0..36cc0c24 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__cwd_override_cwd_in_template.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__cwd_override_cwd_in_template.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1116 +assertion_line: 1136 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -63,4 +63,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd.snap index 58a78678..71b46db4 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1516 +assertion_line: 1536 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -58,6 +58,7 @@ Layout { focus: None, external_children_index: None, }, + [], ), ], focused_tab_index: None, @@ -73,4 +74,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd_in_pane_templates.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd_in_pane_templates.snap index c6b3ed5f..5c39bbd1 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd_in_pane_templates.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd_in_pane_templates.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1537 +assertion_line: 1557 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -102,6 +102,7 @@ Layout { focus: None, external_children_index: None, }, + [], ), ], focused_tab_index: None, @@ -117,4 +118,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd_in_tab_templates.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd_in_tab_templates.snap index cd1a51e1..4c6bfd2d 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd_in_tab_templates.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd_in_tab_templates.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1556 +assertion_line: 1576 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -87,6 +87,7 @@ Layout { focus: None, external_children_index: None, }, + [], ), ], focused_tab_index: None, @@ -102,4 +103,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_given_to_panes_without_cwd.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_given_to_panes_without_cwd.snap index ba246e06..5256565c 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_given_to_panes_without_cwd.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_given_to_panes_without_cwd.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1403 +assertion_line: 1423 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -55,4 +55,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_passed_from_layout_constructor.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_passed_from_layout_constructor.snap index 3b546891..b0eaf353 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_passed_from_layout_constructor.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_passed_from_layout_constructor.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1435 +assertion_line: 1455 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -55,4 +55,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_passed_from_layout_constructor_overrides_global_cwd_in_layout_file.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_passed_from_layout_constructor_overrides_global_cwd_in_layout_file.snap index 50b92892..5aa11997 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_passed_from_layout_constructor_overrides_global_cwd_in_layout_file.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_passed_from_layout_constructor_overrides_global_cwd_in_layout_file.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1455 +assertion_line: 1475 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -55,4 +55,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_prepended_to_panes_with_cwd.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_prepended_to_panes_with_cwd.snap index f5d6b95a..8c5d71c1 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_prepended_to_panes_with_cwd.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_prepended_to_panes_with_cwd.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1416 +assertion_line: 1436 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -55,4 +55,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_with_tab_cwd_given_to_panes_without_cwd.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_with_tab_cwd_given_to_panes_without_cwd.snap index 09d209c1..b54634fb 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_with_tab_cwd_given_to_panes_without_cwd.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_with_tab_cwd_given_to_panes_without_cwd.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1471 +assertion_line: 1491 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -58,6 +58,7 @@ Layout { focus: None, external_children_index: None, }, + [], ), ], focused_tab_index: None, @@ -73,4 +74,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_command_panes_and_close_on_exit.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_command_panes_and_close_on_exit.snap index 32d1341c..c16d495e 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_command_panes_and_close_on_exit.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_command_panes_and_close_on_exit.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 281 +assertion_line: 283 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -39,4 +39,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_command_panes_and_start_suspended.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_command_panes_and_start_suspended.snap index 136c95fb..6723bc21 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_command_panes_and_start_suspended.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_command_panes_and_start_suspended.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 294 +assertion_line: 296 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -39,4 +39,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_default_tab_template.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_default_tab_template.snap index f61145b4..8065fc4d 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_default_tab_template.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_default_tab_template.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 549 +assertion_line: 555 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -71,6 +71,7 @@ Layout { focus: None, external_children_index: None, }, + [], ), ( Some( @@ -138,6 +139,7 @@ Layout { focus: None, external_children_index: None, }, + [], ), ( None, @@ -182,6 +184,7 @@ Layout { focus: None, external_children_index: None, }, + [], ), ], focused_tab_index: None, @@ -228,4 +231,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_nested_branched_pane_templates.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_nested_branched_pane_templates.snap index 77b7478c..687d7618 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_nested_branched_pane_templates.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_nested_branched_pane_templates.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 756 +assertion_line: 650 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -122,4 +122,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_nested_pane_templates.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_nested_pane_templates.snap index fd12e42b..e5a655f7 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_nested_pane_templates.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_nested_pane_templates.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 729 +assertion_line: 624 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -91,4 +91,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_pane_templates.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_pane_templates.snap index 561c35f1..cbbddf74 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_pane_templates.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_pane_templates.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 626 +assertion_line: 582 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -236,4 +236,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_tab_and_pane_templates.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_tab_and_pane_templates.snap index fbe11152..464c1647 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_tab_and_pane_templates.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_tab_and_pane_templates.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 583 +assertion_line: 603 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -80,6 +80,7 @@ Layout { focus: None, external_children_index: None, }, + [], ), ], focused_tab_index: None, @@ -95,4 +96,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_tabs_and_floating_panes.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_tabs_and_floating_panes.snap new file mode 100644 index 00000000..5cdf517a --- /dev/null +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_tabs_and_floating_panes.snap @@ -0,0 +1,102 @@ +--- +source: zellij-utils/src/input/./unit/layout_test.rs +assertion_line: 263 +expression: "format!(\"{:#?}\", layout)" +--- +Layout { + tabs: [ + ( + None, + PaneLayout { + children_split_direction: Horizontal, + name: None, + children: [ + PaneLayout { + children_split_direction: Horizontal, + name: None, + children: [], + split_size: None, + run: None, + borderless: false, + focus: None, + external_children_index: None, + }, + ], + split_size: None, + run: None, + borderless: false, + focus: None, + external_children_index: None, + }, + [ + FloatingPanesLayout { + name: None, + height: None, + width: None, + x: None, + y: None, + run: None, + focus: None, + }, + ], + ), + ( + None, + PaneLayout { + children_split_direction: Horizontal, + name: None, + children: [ + PaneLayout { + children_split_direction: Horizontal, + name: None, + children: [], + split_size: None, + run: None, + borderless: false, + focus: None, + external_children_index: None, + }, + ], + split_size: None, + run: None, + borderless: false, + focus: None, + external_children_index: None, + }, + [ + FloatingPanesLayout { + name: None, + height: None, + width: None, + x: None, + y: None, + run: None, + focus: None, + }, + FloatingPanesLayout { + name: None, + height: None, + width: None, + x: None, + y: None, + run: None, + focus: None, + }, + ], + ), + ], + focused_tab_index: None, + template: Some( + PaneLayout { + children_split_direction: Horizontal, + name: None, + children: [], + split_size: None, + run: None, + borderless: false, + focus: None, + external_children_index: None, + }, + ), + floating_panes_template: [], +} diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_is_overriden_by_its_consumers_bare_cwd.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_is_overriden_by_its_consumers_bare_cwd.snap index 94a52aac..4f4552ee 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_is_overriden_by_its_consumers_bare_cwd.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_is_overriden_by_its_consumers_bare_cwd.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1287 +assertion_line: 1307 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -41,4 +41,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_overriden_by_its_consumers_command_cwd.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_overriden_by_its_consumers_command_cwd.snap index 6f2255cd..fc5523fa 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_overriden_by_its_consumers_command_cwd.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_overriden_by_its_consumers_command_cwd.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1233 +assertion_line: 1253 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -41,4 +41,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_remains_when_its_consumer_command_does_not_have_a_cwd.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_remains_when_its_consumer_command_does_not_have_a_cwd.snap index d659eba3..3c00d46f 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_remains_when_its_consumer_command_does_not_have_a_cwd.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_remains_when_its_consumer_command_does_not_have_a_cwd.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1250 +assertion_line: 1270 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -41,4 +41,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_without_cwd_is_overriden_by_its_consumers_cwd.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_without_cwd_is_overriden_by_its_consumers_cwd.snap index feb8a88b..b88f2a9e 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_without_cwd_is_overriden_by_its_consumers_cwd.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_without_cwd_is_overriden_by_its_consumers_cwd.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1268 +assertion_line: 1288 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -41,4 +41,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_without_cwd_receives_its_consumers_bare_cwd.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_without_cwd_receives_its_consumers_bare_cwd.snap index 6cad38df..3d561463 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_without_cwd_receives_its_consumers_bare_cwd.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_without_cwd_receives_its_consumers_bare_cwd.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1305 +assertion_line: 1325 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -41,4 +41,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_cwd_overriden_by_its_consumers_bare_cwd.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_cwd_overriden_by_its_consumers_bare_cwd.snap index 0f488990..89332ea3 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_cwd_overriden_by_its_consumers_bare_cwd.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_cwd_overriden_by_its_consumers_bare_cwd.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1235 +assertion_line: 1343 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -33,4 +33,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_command_with_cwd.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_command_with_cwd.snap index 42fb84d2..3797afc5 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_command_with_cwd.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_command_with_cwd.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1357 +assertion_line: 1377 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -41,4 +41,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_command_without_cwd.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_command_without_cwd.snap index a09f2ab2..072d0bc5 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_command_without_cwd.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_command_without_cwd.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1339 +assertion_line: 1359 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -41,4 +41,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_edit.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_edit.snap index 32bc6880..a6aac1f1 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_edit.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_edit.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1298 +assertion_line: 1393 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -34,4 +34,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_command_propagated_to_its_consumer_edit.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_command_propagated_to_its_consumer_edit.snap index f5f50be1..e77e7b95 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_command_propagated_to_its_consumer_edit.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_command_propagated_to_its_consumer_edit.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1314 +assertion_line: 1409 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -34,4 +34,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__tab_cwd_given_to_panes_without_cwd.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__tab_cwd_given_to_panes_without_cwd.snap index 4508cb07..004238aa 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__tab_cwd_given_to_panes_without_cwd.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__tab_cwd_given_to_panes_without_cwd.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1486 +assertion_line: 1506 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -58,6 +58,7 @@ Layout { focus: None, external_children_index: None, }, + [], ), ], focused_tab_index: None, @@ -73,4 +74,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__tab_cwd_prepended_to_panes_with_cwd.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__tab_cwd_prepended_to_panes_with_cwd.snap index ac1d4240..573e0465 100644 --- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__tab_cwd_prepended_to_panes_with_cwd.snap +++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__tab_cwd_prepended_to_panes_with_cwd.snap @@ -1,6 +1,6 @@ --- source: zellij-utils/src/input/./unit/layout_test.rs -assertion_line: 1501 +assertion_line: 1521 expression: "format!(\"{:#?}\", layout)" --- Layout { @@ -58,6 +58,7 @@ Layout { focus: None, external_children_index: None, }, + [], ), ], focused_tab_index: None, @@ -73,4 +74,5 @@ Layout { external_children_index: None, }, ), + floating_panes_template: [], } |
