diff options
Diffstat (limited to 'zellij-server/src/tab/unit')
7 files changed, 38 insertions, 98 deletions
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__base_floating_layout_is_included_in_swap_layouts.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__base_floating_layout_is_included_in_swap_layouts.snap index cd3f576f9..e60c5fd33 100644 --- a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__base_floating_layout_is_included_in_swap_layouts.snap +++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__base_floating_layout_is_included_in_swap_layouts.snap @@ -1,9 +1,9 @@ --- source: zellij-server/src/tab/./unit/tab_integration_tests.rs -assertion_line: 6071 +assertion_line: 6089 expression: snapshot --- -00 (C): ┌ tab-bar ────────────────────────────────────────┌ status-bar ──────────────────────────────────────────────┐──────────┐ +00 (C): ┌ zellij:tab-bar ─────────────────────────────────┌ zellij:status-bar ───────────────────────────────────────┐──────────┐ 01 (C): │I am a tab bar │I am a │ │ 02 (C): │ │status bar │ │ 03 (C): │ │ │ │ diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__floating_layout_with_plugins_and_commands_swaped_properly.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__floating_layout_with_plugins_and_commands_swaped_properly.snap index 109824752..1d8dfe043 100644 --- a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__floating_layout_with_plugins_and_commands_swaped_properly.snap +++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__floating_layout_with_plugins_and_commands_swaped_properly.snap @@ -1,9 +1,9 @@ --- source: zellij-server/src/tab/./unit/tab_integration_tests.rs -assertion_line: 5971 +assertion_line: 5995 expression: snapshot --- -00 (C): ┌ status-bar ──────────────────────────────────────────────┐─────────────────────────────────────────────────┐──────────┐ +00 (C): ┌ zellij:status-bar ───────────────────────────────────────┐ab-bar ──────────────────────────────────────────┐──────────┐ 01 (C): │I am a │b bar │ │ 02 (C): │status bar │ │ │ 03 (C): │ │ │ │ diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__swap_floating_layouts_including_command_panes_absent_from_existing_layout.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__swap_floating_layouts_including_command_panes_absent_from_existing_layout.snap index 6bdd963e2..fb7d91761 100644 --- a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__swap_floating_layouts_including_command_panes_absent_from_existing_layout.snap +++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__swap_floating_layouts_including_command_panes_absent_from_existing_layout.snap @@ -1,6 +1,6 @@ --- source: zellij-server/src/tab/./unit/tab_integration_tests.rs -assertion_line: 5541 +assertion_line: 6180 expression: snapshot --- 00 (C): ┌ Pane #2 ─────────────────────────────────────────────────┐────────────────────────────────────────────────────────────┐ @@ -8,7 +8,7 @@ expression: snapshot 02 (C): │ │ │ 03 (C): │ │ │ 04 (C): │ │ │ -05 (C): │ ┌ status-bar ──────────────────────────────────────────────┐ │ +05 (C): │ ┌ zellij:status-bar ───────────────────────────────────────┐ │ 06 (C): │ │I am a │ │ 07 (C): │ │status bar │─┐ │ 08 (C): │ │ │ │ │ diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__swap_floating_layouts_not_including_command_panes_present_in_existing_layout.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__swap_floating_layouts_not_including_command_panes_present_in_existing_layout.snap index 8db6a06a3..01d107cde 100644 --- a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__swap_floating_layouts_not_including_command_panes_present_in_existing_layout.snap +++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__swap_floating_layouts_not_including_command_panes_present_in_existing_layout.snap @@ -1,14 +1,14 @@ --- source: zellij-server/src/tab/./unit/tab_integration_tests.rs -assertion_line: 6269 +assertion_line: 6275 expression: snapshot --- 00 (C): ┌ Pane #1 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐ 01 (C): │ │ 02 (C): │ ┌ command2 ────────────── SCROLL: 0/1 ┐ │ 03 (C): │ │ Waiting to run: command2 │ │ -04 (C): │ │ ┌ tab-bar ─────────────────────────────┐ │ -05 (C): │ │<│I am a tab bar ┌ status-bar ──────────────────────────────────────────────┐ │ +04 (C): │ │ ┌ zellij:tab-bar ──────────────────────┐ │ +05 (C): │ │<│I am a tab bar ┌ zellij:status-bar ───────────────────────────────────────┐ │ 06 (C): │ │l│ │I am a │ │ 07 (C): │ └─│ │status bar │─┐ │ 08 (C): │ │ │ │ │ │ diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__swap_floating_layouts_not_including_plugin_panes_present_in_existing_layout.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__swap_floating_layouts_not_including_plugin_panes_present_in_existing_layout.snap index 278676fa2..bb542c19f 100644 --- a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__swap_floating_layouts_not_including_plugin_panes_present_in_existing_layout.snap +++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__swap_floating_layouts_not_including_plugin_panes_present_in_existing_layout.snap @@ -1,6 +1,6 @@ --- source: zellij-server/src/tab/./unit/tab_integration_tests.rs -assertion_line: 6363 +assertion_line: 6432 expression: snapshot --- 00 (C): ┌ Pane #1 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐ @@ -8,11 +8,11 @@ expression: snapshot 02 (C): │ │ 03 (C): │ │ 04 (C): │ │ -05 (C): │ ┌ tab-bar ─────────────────────────────────────────────────┐ │ +05 (C): │ ┌ zellij:tab-bar ──────────────────────────────────────────┐ │ 06 (C): │ │I am a tab bar │ │ 07 (C): │ │ ┌ Pane #2 ─────────────────────────────────────────────────┐ │ 08 (C): │ │ │ │ │ -09 (C): │ │ │ ┌ status-bar ──────────────────────────────────────────────┐ │ +09 (C): │ │ │ ┌ zellij:status-bar ───────────────────────────────────────┐ │ 10 (C): │ │ │ │I am a │ │ 11 (C): │ │ │ │status bar │ │ 12 (C): │ │ │ │ │ │ diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__swap_layouts_not_including_plugin_panes_present_in_existing_layout.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__swap_layouts_not_including_plugin_panes_present_in_existing_layout.snap index 1c8c7f776..9a5f48672 100644 --- a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__swap_layouts_not_including_plugin_panes_present_in_existing_layout.snap +++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__swap_layouts_not_including_plugin_panes_present_in_existing_layout.snap @@ -1,6 +1,6 @@ --- source: zellij-server/src/tab/./unit/tab_integration_tests.rs -assertion_line: 5481 +assertion_line: 5510 expression: snapshot --- 00 (C): ┌ Pane #2 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐ @@ -17,10 +17,10 @@ expression: snapshot 11 (C): │ │ 12 (C): │ <ENTER> run, <ESC> drop to shell, <Ctrl-c> exit │ 13 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ -14 (C): ┌ status-bar ───────────────────────────────────────────────────────────────────────────────────────────────────────────┐ +14 (C): ┌ zellij:status-bar ────────────────────────────────────────────────────────────────────────────────────────────────────┐ 15 (C): │I am a │ 16 (C): │status bar │ 17 (C): │ │ 18 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ -19 (C): ┌ tab-bar ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐ +19 (C): ┌ zellij:tab-bar ───────────────────────────────────────────────────────────────────────────────────────────────────────┐ diff --git a/zellij-server/src/tab/unit/tab_integration_tests.rs b/zellij-server/src/tab/unit/tab_integration_tests.rs index ef5cc1bf0..f8953235e 100644 --- a/zellij-server/src/tab/unit/tab_integration_tests.rs +++ b/zellij-server/src/tab/unit/tab_integration_tests.rs @@ -20,8 +20,8 @@ use zellij_utils::data::ResizeStrategy; use zellij_utils::envs::set_session_name; use zellij_utils::errors::{prelude::*, ErrorContext}; use zellij_utils::input::layout::{ - FloatingPaneLayout, Layout, PluginUserConfiguration, RunPluginLocation, SwapFloatingLayout, - SwapTiledLayout, TiledPaneLayout, + FloatingPaneLayout, Layout, PluginUserConfiguration, RunPluginLocation, RunPluginOrAlias, + SwapFloatingLayout, SwapTiledLayout, TiledPaneLayout, }; use zellij_utils::input::plugins::PluginTag; use zellij_utils::ipc::IpcReceiverWithContext; @@ -273,7 +273,7 @@ fn create_new_tab_with_swap_layouts( Vec<FloatingPaneLayout>, Vec<(u32, Option<RunCommand>)>, Vec<(u32, Option<RunCommand>)>, - HashMap<(RunPluginLocation, PluginUserConfiguration), Vec<u32>>, + HashMap<RunPluginOrAlias, Vec<u32>>, )>, draw_pane_frames: bool, ) -> Tab { @@ -5022,17 +5022,11 @@ fn layout_with_plugins_and_commands_swaped_properly() { let new_floating_terminal_ids = vec![]; let mut new_plugin_ids = HashMap::new(); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("tab-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:tab-bar", &None, None, None).unwrap(), vec![1], ); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("status-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:status-bar", &None, None, None).unwrap(), vec![2], ); @@ -5123,17 +5117,11 @@ fn base_layout_is_included_in_swap_layouts() { let new_floating_terminal_ids = vec![]; let mut new_plugin_ids = HashMap::new(); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("tab-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:tab-bar", &None, None, None).unwrap(), vec![1], ); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("status-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:status-bar", &None, None, None).unwrap(), vec![2], ); @@ -5221,17 +5209,11 @@ fn swap_layouts_including_command_panes_absent_from_existing_layout() { let new_floating_terminal_ids = vec![]; let mut new_plugin_ids = HashMap::new(); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("tab-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:tab-bar", &None, None, None).unwrap(), vec![1], ); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("status-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:status-bar", &None, None, None).unwrap(), vec![2], ); @@ -5322,17 +5304,11 @@ fn swap_layouts_not_including_command_panes_present_in_existing_layout() { let new_floating_terminal_ids = vec![]; let mut new_plugin_ids = HashMap::new(); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("tab-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:tab-bar", &None, None, None).unwrap(), vec![1], ); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("status-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:status-bar", &None, None, None).unwrap(), vec![2], ); @@ -5496,17 +5472,11 @@ fn swap_layouts_not_including_plugin_panes_present_in_existing_layout() { let new_floating_terminal_ids = vec![]; let mut new_plugin_ids = HashMap::new(); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("tab-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:tab-bar", &None, None, None).unwrap(), vec![1], ); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("status-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:status-bar", &None, None, None).unwrap(), vec![2], ); @@ -5987,17 +5957,11 @@ fn floating_layout_with_plugins_and_commands_swaped_properly() { let new_terminal_ids = vec![(4, None)]; let mut new_plugin_ids = HashMap::new(); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("tab-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:tab-bar", &None, None, None).unwrap(), vec![1], ); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("status-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:status-bar", &None, None, None).unwrap(), vec![2], ); @@ -6086,17 +6050,11 @@ fn base_floating_layout_is_included_in_swap_layouts() { let new_terminal_ids = vec![(4, None)]; let mut new_plugin_ids = HashMap::new(); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("tab-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:tab-bar", &None, None, None).unwrap(), vec![1], ); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("status-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:status-bar", &None, None, None).unwrap(), vec![2], ); @@ -6184,17 +6142,11 @@ fn swap_floating_layouts_including_command_panes_absent_from_existing_layout() { let new_terminal_ids = vec![(4, None)]; let mut new_plugin_ids = HashMap::new(); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("tab-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:tab-bar", &None, None, None).unwrap(), vec![1], ); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("status-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:status-bar", &None, None, None).unwrap(), vec![2], ); @@ -6285,17 +6237,11 @@ fn swap_floating_layouts_not_including_command_panes_present_in_existing_layout( let new_terminal_ids = vec![(4, None)]; let mut new_plugin_ids = HashMap::new(); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("tab-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:tab-bar", &None, None, None).unwrap(), vec![1], ); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("status-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:status-bar", &None, None, None).unwrap(), vec![2], ); @@ -6448,17 +6394,11 @@ fn swap_floating_layouts_not_including_plugin_panes_present_in_existing_layout() let new_terminal_ids = vec![(4, None)]; let mut new_plugin_ids = HashMap::new(); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("tab-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:tab-bar", &None, None, None).unwrap(), vec![1], ); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("status-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:status-bar", &None, None, None).unwrap(), vec![2], ); |