diff options
| author | Aram Drevekenin <aram@poor.dev> | 2025-06-26 12:57:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-26 12:57:05 +0200 |
| commit | a4d5b0238d18fb1bd8f0a05995b1e81b5252849e (patch) | |
| tree | 0861a884cd00d5295d0f21f44cddf8cb6a82262a /zellij-server/src/unit/snapshots | |
| parent | Feature: web-client/server to share your sessions in the browser (#4242) (diff) | |
| download | sl0ppij-a4d5b0238d18fb1bd8f0a05995b1e81b5252849e.tar.gz sl0ppij-a4d5b0238d18fb1bd8f0a05995b1e81b5252849e.tar.xz sl0ppij-a4d5b0238d18fb1bd8f0a05995b1e81b5252849e.zip | |
performance(terminal): consolidate renders (#4245)
* work
* fix tests for async rendering
* remove comment
* some cleanups
* style(fmt): rustfmt
* fix e2e tests
* fix more e2e tests
* style(fmt): rustfmt
* fix one more test
* style(fmt): rustfmt
Diffstat (limited to 'zellij-server/src/unit/snapshots')
37 files changed, 283 insertions, 343 deletions
diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_move_pane_to_a_new_tab_left-3.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_move_pane_to_a_new_tab_left-3.snap index bcac6ce6..d3d25148 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_move_pane_to_a_new_tab_left-3.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_move_pane_to_a_new_tab_left-3.snap @@ -1,26 +1,24 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 3079 expression: "format!(\"{}\", snapshot)" --- -00 (C): ┌ pane_to_stay ────────────────────────────────────────────────────────────────┐ -01 (C): │ │ -02 (C): │ │ -03 (C): │ │ -04 (C): │ │ -05 (C): │ │ -06 (C): │ │ -07 (C): │ │ -08 (C): │ │ -09 (C): │ │ -10 (C): │ │ -11 (C): │ │ -12 (C): │ │ -13 (C): │ │ -14 (C): │ │ -15 (C): │ │ -16 (C): │ │ -17 (C): │ │ -18 (C): │ │ -19 (C): └──────────────────────────────────────────────────────────────────────────────┘ - +00 (C): ┌ pane_to_stay ────────────────────────┐┌ pane_to_break_free ──────────────────┐ +01 (C): │ ││ │ +02 (C): │ ││ │ +03 (C): │ ││ │ +04 (C): │ ││ │ +05 (C): │ ││ │ +06 (C): │ ││ │ +07 (C): │ ││ │ +08 (C): │ ││ │ +09 (C): │ ││ │ +10 (C): │ ││ │ +11 (C): │ ││ │ +12 (C): │ ││ │ +13 (C): │ ││ │ +14 (C): │ ││ │ +15 (C): │ ││ │ +16 (C): │ ││ │ +17 (C): │ ││ │ +18 (C): │ ││ │ +19 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_move_pane_to_a_new_tab_left-4.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_move_pane_to_a_new_tab_left-4.snap index 77c5a5a3..6f985b85 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_move_pane_to_a_new_tab_left-4.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_move_pane_to_a_new_tab_left-4.snap @@ -1,26 +1,5 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 3649 -expression: "format!(\"{}\", snapshot)" +expression: "format!(\"{}\", snapshot_count)" --- -00 (C): ┌ pane_to_stay ────────────────────────┐┌ pane_to_break_free ──────────────────┐ -01 (C): │ ││ │ -02 (C): │ ││ │ -03 (C): │ ││ │ -04 (C): │ ││ │ -05 (C): │ ││ │ -06 (C): │ ││ │ -07 (C): │ ││ │ -08 (C): │ ││ │ -09 (C): │ ││ │ -10 (C): │ ││ │ -11 (C): │ ││ │ -12 (C): │ ││ │ -13 (C): │ ││ │ -14 (C): │ ││ │ -15 (C): │ ││ │ -16 (C): │ ││ │ -17 (C): │ ││ │ -18 (C): │ ││ │ -19 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ - +3 diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_move_pane_to_a_new_tab_right-3.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_move_pane_to_a_new_tab_right-3.snap index d1f54bfe..d3d25148 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_move_pane_to_a_new_tab_right-3.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_move_pane_to_a_new_tab_right-3.snap @@ -1,26 +1,24 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 3032 expression: "format!(\"{}\", snapshot)" --- -00 (C): ┌ pane_to_stay ────────────────────────────────────────────────────────────────┐ -01 (C): │ │ -02 (C): │ │ -03 (C): │ │ -04 (C): │ │ -05 (C): │ │ -06 (C): │ │ -07 (C): │ │ -08 (C): │ │ -09 (C): │ │ -10 (C): │ │ -11 (C): │ │ -12 (C): │ │ -13 (C): │ │ -14 (C): │ │ -15 (C): │ │ -16 (C): │ │ -17 (C): │ │ -18 (C): │ │ -19 (C): └──────────────────────────────────────────────────────────────────────────────┘ - +00 (C): ┌ pane_to_stay ────────────────────────┐┌ pane_to_break_free ──────────────────┐ +01 (C): │ ││ │ +02 (C): │ ││ │ +03 (C): │ ││ │ +04 (C): │ ││ │ +05 (C): │ ││ │ +06 (C): │ ││ │ +07 (C): │ ││ │ +08 (C): │ ││ │ +09 (C): │ ││ │ +10 (C): │ ││ │ +11 (C): │ ││ │ +12 (C): │ ││ │ +13 (C): │ ││ │ +14 (C): │ ││ │ +15 (C): │ ││ │ +16 (C): │ ││ │ +17 (C): │ ││ │ +18 (C): │ ││ │ +19 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_move_pane_to_a_new_tab_right-4.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_move_pane_to_a_new_tab_right-4.snap index ef8a4d90..6f985b85 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_move_pane_to_a_new_tab_right-4.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_move_pane_to_a_new_tab_right-4.snap @@ -1,26 +1,5 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 3601 -expression: "format!(\"{}\", snapshot)" +expression: "format!(\"{}\", snapshot_count)" --- -00 (C): ┌ pane_to_stay ────────────────────────┐┌ pane_to_break_free ──────────────────┐ -01 (C): │ ││ │ -02 (C): │ ││ │ -03 (C): │ ││ │ -04 (C): │ ││ │ -05 (C): │ ││ │ -06 (C): │ ││ │ -07 (C): │ ││ │ -08 (C): │ ││ │ -09 (C): │ ││ │ -10 (C): │ ││ │ -11 (C): │ ││ │ -12 (C): │ ││ │ -13 (C): │ ││ │ -14 (C): │ ││ │ -15 (C): │ ││ │ -16 (C): │ ││ │ -17 (C): │ ││ │ -18 (C): │ ││ │ -19 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ - +3 diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_edit_action_with_default_parameters.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_edit_action_with_default_parameters.snap index 6ed151b4..01736b70 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_edit_action_with_default_parameters.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_edit_action_with_default_parameters.snap @@ -1,6 +1,5 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 2389 -expression: "format!(\"{:?}\", * received_pty_instructions.lock().unwrap())" +expression: "format!(\"{:?}\", *received_pty_instructions.lock().unwrap())" --- -[SpawnTerminal(Some(OpenFile(OpenFilePayload { path: "/file/to/edit", line_number: None, cwd: Some("."), originating_plugin: None })), Some(false), Some("Editing: /file/to/edit"), None, false, ClientId(10)), UpdateActivePane(Some(Terminal(0)), 1), UpdateActivePane(Some(Terminal(0)), 1), Exit] +[UpdateActivePane(Some(Terminal(0)), 1), UpdateActivePane(Some(Terminal(0)), 1), SpawnTerminal(Some(OpenFile(OpenFilePayload { path: "/file/to/edit", line_number: None, cwd: Some("."), originating_plugin: None })), Some(false), Some("Editing: /file/to/edit"), None, false, ClientId(10)), Exit] diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_edit_action_with_line_number.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_edit_action_with_line_number.snap index a6ad8ea0..097e9f01 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_edit_action_with_line_number.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_edit_action_with_line_number.snap @@ -1,6 +1,5 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 2427 -expression: "format!(\"{:?}\", * received_pty_instructions.lock().unwrap())" +expression: "format!(\"{:?}\", *received_pty_instructions.lock().unwrap())" --- -[SpawnTerminal(Some(OpenFile(OpenFilePayload { path: "/file/to/edit", line_number: Some(100), cwd: Some("."), originating_plugin: None })), Some(false), Some("Editing: /file/to/edit"), None, false, ClientId(10)), UpdateActivePane(Some(Terminal(0)), 1), UpdateActivePane(Some(Terminal(0)), 1), Exit] +[UpdateActivePane(Some(Terminal(0)), 1), UpdateActivePane(Some(Terminal(0)), 1), SpawnTerminal(Some(OpenFile(OpenFilePayload { path: "/file/to/edit", line_number: Some(100), cwd: Some("."), originating_plugin: None })), Some(false), Some("Editing: /file/to/edit"), None, false, ClientId(10)), Exit] diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_edit_action_with_split_direction.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_edit_action_with_split_direction.snap index fa4e0e3d..80db096e 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_edit_action_with_split_direction.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_edit_action_with_split_direction.snap @@ -1,6 +1,5 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 2465 -expression: "format!(\"{:?}\", * received_pty_instructions.lock().unwrap())" +expression: "format!(\"{:?}\", *received_pty_instructions.lock().unwrap())" --- -[SpawnTerminalHorizontally(Some(OpenFile(OpenFilePayload { path: "/file/to/edit", line_number: None, cwd: Some("."), originating_plugin: None })), Some("Editing: /file/to/edit"), 10), UpdateActivePane(Some(Terminal(0)), 1), UpdateActivePane(Some(Terminal(0)), 1), Exit] +[UpdateActivePane(Some(Terminal(0)), 1), UpdateActivePane(Some(Terminal(0)), 1), SpawnTerminalHorizontally(Some(OpenFile(OpenFilePayload { path: "/file/to/edit", line_number: None, cwd: Some("."), originating_plugin: None })), Some("Editing: /file/to/edit"), 10), Exit] diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_down_action-2.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_down_action-2.snap index 36487ff3..96aaf171 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_down_action-2.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_down_action-2.snap @@ -1,16 +1,14 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1702 expression: "format!(\"{}\", snapshot)" --- -00 (C): ┌ Pane #1 ────────────── SCROLL: 4/13 ┐┌ Pane #2 ─────────────────────────────┐ -01 (C): │fill pane up with something 9 ││ │ -02 (C): │fill pane up with something 10 ││ │ -03 (C): │fill pane up with something 11 ││ │ -04 (C): │fill pane up with something 12 ││ │ -05 (C): │fill pane up with something 13 ││ │ -06 (C): │fill pane up with something 14 ││ │ -07 (C): │fill pane up with something 15 ││ │ -08 (C): │fill pane up with something 16 ││ │ +00 (C): ┌ Pane #1 ────────────── SCROLL: 0/13 ┐┌ Pane #2 ─────────────────────────────┐ +01 (C): │fill pane up with something 13 ││ │ +02 (C): │fill pane up with something 14 ││ │ +03 (C): │fill pane up with something 15 ││ │ +04 (C): │fill pane up with something 16 ││ │ +05 (C): │fill pane up with something 17 ││ │ +06 (C): │fill pane up with something 18 ││ │ +07 (C): │fill pane up with something 19 ││ │ +08 (C): │ ││ │ 09 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ - diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_down_action-3.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_down_action-3.snap index e0476fec..92fc1f4a 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_down_action-3.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_down_action-3.snap @@ -1,16 +1,14 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1702 expression: "format!(\"{}\", snapshot)" --- -00 (C): ┌ Pane #1 ────────────── SCROLL: 8/13 ┐┌ Pane #2 ─────────────────────────────┐ -01 (C): │fill pane up with something 5 ││ │ -02 (C): │fill pane up with something 6 ││ │ -03 (C): │fill pane up with something 7 ││ │ -04 (C): │fill pane up with something 8 ││ │ -05 (C): │fill pane up with something 9 ││ │ -06 (C): │fill pane up with something 10 ││ │ -07 (C): │fill pane up with something 11 ││ │ -08 (C): │fill pane up with something 12 ││ │ +00 (C): ┌ Pane #1 ────────────── SCROLL: 4/13 ┐┌ Pane #2 ─────────────────────────────┐ +01 (C): │fill pane up with something 9 ││ │ +02 (C): │fill pane up with something 10 ││ │ +03 (C): │fill pane up with something 11 ││ │ +04 (C): │fill pane up with something 12 ││ │ +05 (C): │fill pane up with something 13 ││ │ +06 (C): │fill pane up with something 14 ││ │ +07 (C): │fill pane up with something 15 ││ │ +08 (C): │fill pane up with something 16 ││ │ 09 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ - diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_down_action-4.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_down_action-4.snap index 36487ff3..1541218d 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_down_action-4.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_down_action-4.snap @@ -1,16 +1,14 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1702 expression: "format!(\"{}\", snapshot)" --- -00 (C): ┌ Pane #1 ────────────── SCROLL: 4/13 ┐┌ Pane #2 ─────────────────────────────┐ -01 (C): │fill pane up with something 9 ││ │ -02 (C): │fill pane up with something 10 ││ │ -03 (C): │fill pane up with something 11 ││ │ -04 (C): │fill pane up with something 12 ││ │ -05 (C): │fill pane up with something 13 ││ │ -06 (C): │fill pane up with something 14 ││ │ -07 (C): │fill pane up with something 15 ││ │ -08 (C): │fill pane up with something 16 ││ │ +00 (C): ┌ Pane #1 ────────────── SCROLL: 8/13 ┐┌ Pane #2 ─────────────────────────────┐ +01 (C): │fill pane up with something 5 ││ │ +02 (C): │fill pane up with something 6 ││ │ +03 (C): │fill pane up with something 7 ││ │ +04 (C): │fill pane up with something 8 ││ │ +05 (C): │fill pane up with something 9 ││ │ +06 (C): │fill pane up with something 10 ││ │ +07 (C): │fill pane up with something 11 ││ │ +08 (C): │fill pane up with something 12 ││ │ 09 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ - diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_down_action-5.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_down_action-5.snap index f5742603..92fc1f4a 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_down_action-5.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_down_action-5.snap @@ -1,6 +1,14 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1704 -expression: "format!(\"{}\", snapshot_count)" +expression: "format!(\"{}\", snapshot)" --- -4 +00 (C): ┌ Pane #1 ────────────── SCROLL: 4/13 ┐┌ Pane #2 ─────────────────────────────┐ +01 (C): │fill pane up with something 9 ││ │ +02 (C): │fill pane up with something 10 ││ │ +03 (C): │fill pane up with something 11 ││ │ +04 (C): │fill pane up with something 12 ││ │ +05 (C): │fill pane up with something 13 ││ │ +06 (C): │fill pane up with something 14 ││ │ +07 (C): │fill pane up with something 15 ││ │ +08 (C): │fill pane up with something 16 ││ │ +09 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_up_action-2.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_up_action-2.snap index f400815e..96aaf171 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_up_action-2.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_up_action-2.snap @@ -1,16 +1,14 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1639 expression: "format!(\"{}\", snapshot)" --- -00 (C): ┌ Pane #1 ────────────── SCROLL: 4/13 ┐┌ Pane #2 ─────────────────────────────┐ -01 (C): │fill pane up with something 9 ││ │ -02 (C): │fill pane up with something 10 ││ │ -03 (C): │fill pane up with something 11 ││ │ -04 (C): │fill pane up with something 12 ││ │ -05 (C): │fill pane up with something 13 ││ │ -06 (C): │fill pane up with something 14 ││ │ -07 (C): │fill pane up with something 15 ││ │ -08 (C): │fill pane up with something 16 ││ │ +00 (C): ┌ Pane #1 ────────────── SCROLL: 0/13 ┐┌ Pane #2 ─────────────────────────────┐ +01 (C): │fill pane up with something 13 ││ │ +02 (C): │fill pane up with something 14 ││ │ +03 (C): │fill pane up with something 15 ││ │ +04 (C): │fill pane up with something 16 ││ │ +05 (C): │fill pane up with something 17 ││ │ +06 (C): │fill pane up with something 18 ││ │ +07 (C): │fill pane up with something 19 ││ │ +08 (C): │ ││ │ 09 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ - diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_up_action-3.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_up_action-3.snap index f33220f2..92fc1f4a 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_up_action-3.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_half_page_scroll_up_action-3.snap @@ -1,6 +1,14 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1641 -expression: "format!(\"{}\", snapshot_count)" +expression: "format!(\"{}\", snapshot)" --- -2 +00 (C): ┌ Pane #1 ────────────── SCROLL: 4/13 ┐┌ Pane #2 ─────────────────────────────┐ +01 (C): │fill pane up with something 9 ││ │ +02 (C): │fill pane up with something 10 ││ │ +03 (C): │fill pane up with something 11 ││ │ +04 (C): │fill pane up with something 12 ││ │ +05 (C): │fill pane up with something 13 ││ │ +06 (C): │fill pane up with something 14 ││ │ +07 (C): │fill pane up with something 15 ││ │ +08 (C): │fill pane up with something 16 ││ │ +09 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_pane_action_with_default_parameters.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_pane_action_with_default_parameters.snap index bf271501..93561eb3 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_pane_action_with_default_parameters.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_pane_action_with_default_parameters.snap @@ -1,6 +1,5 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 2222 -expression: "format!(\"{:?}\", * received_pty_instructions.lock().unwrap())" +expression: "format!(\"{:?}\", *received_pty_instructions.lock().unwrap())" --- -[SpawnTerminal(None, Some(false), None, None, false, ClientId(10)), UpdateActivePane(Some(Terminal(0)), 1), UpdateActivePane(Some(Terminal(0)), 1), Exit] +[UpdateActivePane(Some(Terminal(0)), 1), UpdateActivePane(Some(Terminal(0)), 1), SpawnTerminal(None, Some(false), None, None, false, ClientId(10)), Exit] diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_pane_action_with_floating_pane_and_coordinates.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_pane_action_with_floating_pane_and_coordinates.snap index 06cf752b..cb24294e 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_pane_action_with_floating_pane_and_coordinates.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_pane_action_with_floating_pane_and_coordinates.snap @@ -1,6 +1,5 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 2371 -expression: "format!(\"{:?}\", * received_pty_instructions.lock().unwrap())" +expression: "format!(\"{:?}\", *received_pty_instructions.lock().unwrap())" --- -[SpawnTerminal(Some(RunCommand(RunCommand { command: "htop", args: [], cwd: Some("/some/folder"), hold_on_close: true, hold_on_start: false, originating_plugin: None })), Some(true), None, Some(FloatingPaneCoordinates { x: Some(Fixed(10)), y: None, width: Some(Percent(20)), height: None, pinned: None }), false, ClientId(10)), UpdateActivePane(Some(Terminal(0)), 1), UpdateActivePane(Some(Terminal(0)), 1), Exit] +[UpdateActivePane(Some(Terminal(0)), 1), UpdateActivePane(Some(Terminal(0)), 1), SpawnTerminal(Some(RunCommand(RunCommand { command: "htop", args: [], cwd: Some("/some/folder"), hold_on_close: true, hold_on_start: false, originating_plugin: None })), Some(true), None, Some(FloatingPaneCoordinates { x: Some(Fixed(10)), y: None, width: Some(Percent(20)), height: None, pinned: None }), false, ClientId(10)), Exit] diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_pane_action_with_split_direction.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_pane_action_with_split_direction.snap index 50d0d59c..a42fe8e1 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_pane_action_with_split_direction.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_pane_action_with_split_direction.snap @@ -1,6 +1,5 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1869 -expression: "format!(\"{:?}\", * received_pty_instructions.lock().unwrap())" +expression: "format!(\"{:?}\", *received_pty_instructions.lock().unwrap())" --- -[SpawnTerminalVertically(None, None, 10), UpdateActivePane(Some(Terminal(0)), 1), UpdateActivePane(Some(Terminal(0)), 1), Exit] +[UpdateActivePane(Some(Terminal(0)), 1), UpdateActivePane(Some(Terminal(0)), 1), SpawnTerminalVertically(None, None, 10), Exit] diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_down_action-2.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_down_action-2.snap index 813e0411..96aaf171 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_down_action-2.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_down_action-2.snap @@ -1,16 +1,14 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1593 expression: "format!(\"{}\", snapshot)" --- -00 (C): ┌ Pane #1 ────────────── SCROLL: 9/13 ┐┌ Pane #2 ─────────────────────────────┐ -01 (C): │fill pane up with something 4 ││ │ -02 (C): │fill pane up with something 5 ││ │ -03 (C): │fill pane up with something 6 ││ │ -04 (C): │fill pane up with something 7 ││ │ -05 (C): │fill pane up with something 8 ││ │ -06 (C): │fill pane up with something 9 ││ │ -07 (C): │fill pane up with something 10 ││ │ -08 (C): │fill pane up with something 11 ││ │ +00 (C): ┌ Pane #1 ────────────── SCROLL: 0/13 ┐┌ Pane #2 ─────────────────────────────┐ +01 (C): │fill pane up with something 13 ││ │ +02 (C): │fill pane up with something 14 ││ │ +03 (C): │fill pane up with something 15 ││ │ +04 (C): │fill pane up with something 16 ││ │ +05 (C): │fill pane up with something 17 ││ │ +06 (C): │fill pane up with something 18 ││ │ +07 (C): │fill pane up with something 19 ││ │ +08 (C): │ ││ │ 09 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ - diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_down_action-3.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_down_action-3.snap index c570d8d7..749019a5 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_down_action-3.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_down_action-3.snap @@ -1,16 +1,14 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1593 expression: "format!(\"{}\", snapshot)" --- -00 (C): ┌ Pane #1 ───────────── SCROLL: 13/13 ┐┌ Pane #2 ─────────────────────────────┐ -01 (C): │fill pane up with something 0 ││ │ -02 (C): │fill pane up with something 1 ││ │ -03 (C): │fill pane up with something 2 ││ │ -04 (C): │fill pane up with something 3 ││ │ -05 (C): │fill pane up with something 4 ││ │ -06 (C): │fill pane up with something 5 ││ │ -07 (C): │fill pane up with something 6 ││ │ -08 (C): │fill pane up with something 7 ││ │ +00 (C): ┌ Pane #1 ────────────── SCROLL: 9/13 ┐┌ Pane #2 ─────────────────────────────┐ +01 (C): │fill pane up with something 4 ││ │ +02 (C): │fill pane up with something 5 ││ │ +03 (C): │fill pane up with something 6 ││ │ +04 (C): │fill pane up with something 7 ││ │ +05 (C): │fill pane up with something 8 ││ │ +06 (C): │fill pane up with something 9 ││ │ +07 (C): │fill pane up with something 10 ││ │ +08 (C): │fill pane up with something 11 ││ │ 09 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ - diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_down_action-4.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_down_action-4.snap index 3c606aa7..da18a425 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_down_action-4.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_down_action-4.snap @@ -1,16 +1,14 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1593 expression: "format!(\"{}\", snapshot)" --- -00 (C): ┌ Pane #1 ────────────── SCROLL: 5/13 ┐┌ Pane #2 ─────────────────────────────┐ -01 (C): │fill pane up with something 8 ││ │ -02 (C): │fill pane up with something 9 ││ │ -03 (C): │fill pane up with something 10 ││ │ -04 (C): │fill pane up with something 11 ││ │ -05 (C): │fill pane up with something 12 ││ │ -06 (C): │fill pane up with something 13 ││ │ -07 (C): │fill pane up with something 14 ││ │ -08 (C): │fill pane up with something 15 ││ │ +00 (C): ┌ Pane #1 ───────────── SCROLL: 13/13 ┐┌ Pane #2 ─────────────────────────────┐ +01 (C): │fill pane up with something 0 ││ │ +02 (C): │fill pane up with something 1 ││ │ +03 (C): │fill pane up with something 2 ││ │ +04 (C): │fill pane up with something 3 ││ │ +05 (C): │fill pane up with something 4 ││ │ +06 (C): │fill pane up with something 5 ││ │ +07 (C): │fill pane up with something 6 ││ │ +08 (C): │fill pane up with something 7 ││ │ 09 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ - diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_down_action-5.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_down_action-5.snap index e9a17763..492ab5ec 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_down_action-5.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_down_action-5.snap @@ -1,6 +1,14 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1595 -expression: "format!(\"{}\", snapshot_count)" +expression: "format!(\"{}\", snapshot)" --- -4 +00 (C): ┌ Pane #1 ────────────── SCROLL: 5/13 ┐┌ Pane #2 ─────────────────────────────┐ +01 (C): │fill pane up with something 8 ││ │ +02 (C): │fill pane up with something 9 ││ │ +03 (C): │fill pane up with something 10 ││ │ +04 (C): │fill pane up with something 11 ││ │ +05 (C): │fill pane up with something 12 ││ │ +06 (C): │fill pane up with something 13 ││ │ +07 (C): │fill pane up with something 14 ││ │ +08 (C): │fill pane up with something 15 ││ │ +09 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_up_action-2.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_up_action-2.snap index 75b3e602..96aaf171 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_up_action-2.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_up_action-2.snap @@ -1,16 +1,14 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1530 expression: "format!(\"{}\", snapshot)" --- -00 (C): ┌ Pane #1 ────────────── SCROLL: 9/13 ┐┌ Pane #2 ─────────────────────────────┐ -01 (C): │fill pane up with something 4 ││ │ -02 (C): │fill pane up with something 5 ││ │ -03 (C): │fill pane up with something 6 ││ │ -04 (C): │fill pane up with something 7 ││ │ -05 (C): │fill pane up with something 8 ││ │ -06 (C): │fill pane up with something 9 ││ │ -07 (C): │fill pane up with something 10 ││ │ -08 (C): │fill pane up with something 11 ││ │ +00 (C): ┌ Pane #1 ────────────── SCROLL: 0/13 ┐┌ Pane #2 ─────────────────────────────┐ +01 (C): │fill pane up with something 13 ││ │ +02 (C): │fill pane up with something 14 ││ │ +03 (C): │fill pane up with something 15 ││ │ +04 (C): │fill pane up with something 16 ││ │ +05 (C): │fill pane up with something 17 ││ │ +06 (C): │fill pane up with something 18 ││ │ +07 (C): │fill pane up with something 19 ││ │ +08 (C): │ ││ │ 09 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ - diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_up_action-3.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_up_action-3.snap index 661ae9b1..749019a5 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_up_action-3.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_page_scroll_up_action-3.snap @@ -1,6 +1,14 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1532 -expression: "format!(\"{}\", snapshot_count)" +expression: "format!(\"{}\", snapshot)" --- -2 +00 (C): ┌ Pane #1 ────────────── SCROLL: 9/13 ┐┌ Pane #2 ─────────────────────────────┐ +01 (C): │fill pane up with something 4 ││ │ +02 (C): │fill pane up with something 5 ││ │ +03 (C): │fill pane up with something 6 ││ │ +04 (C): │fill pane up with something 7 ││ │ +05 (C): │fill pane up with something 8 ││ │ +06 (C): │fill pane up with something 9 ││ │ +07 (C): │fill pane up with something 10 ││ │ +08 (C): │fill pane up with something 11 ││ │ +09 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_resize_action_to_screen-2.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_resize_action_to_screen-2.snap index da2e2a7b..94c79ed1 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_resize_action_to_screen-2.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_resize_action_to_screen-2.snap @@ -1,26 +1,24 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 924 expression: "format!(\"{}\", snapshot)" --- -00 (C): -01 (C): -02 (C): -03 (C): -04 (C): -05 (C): -06 (C): -07 (C): -08 (C): -09 (C): -10 (C): -11 (C): -12 (C): -13 (C): -14 (C): -15 (C): -16 (C): -17 (C): -18 (C): -19 (C): - +00 (C): ┌ Pane #1 ─────────────────────────┐┌ Pane #2 ─────────────────────────────────┐ +01 (C): │ ││ │ +02 (C): │ ││ │ +03 (C): │ ││ │ +04 (C): │ ││ │ +05 (C): │ ││ │ +06 (C): │ ││ │ +07 (C): │ ││ │ +08 (C): │ ││ │ +09 (C): │ ││ │ +10 (C): │ ││ │ +11 (C): │ ││ │ +12 (C): │ ││ │ +13 (C): │ ││ │ +14 (C): │ ││ │ +15 (C): │ ││ │ +16 (C): │ ││ │ +17 (C): │ ││ │ +18 (C): │ ││ │ +19 (C): └──────────────────────────────────┘└──────────────────────────────────────────┘ diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_resize_action_to_screen-3.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_resize_action_to_screen-3.snap index 4325fbb4..45361b56 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_resize_action_to_screen-3.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_resize_action_to_screen-3.snap @@ -1,26 +1,5 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 924 -expression: "format!(\"{}\", snapshot)" +expression: "format!(\"{}\", snapshot_count)" --- -00 (C): ┌ Pane #1 ─────────────────────────┐┌ Pane #2 ─────────────────────────────────┐ -01 (C): │ ││ │ -02 (C): │ ││ │ -03 (C): │ ││ │ -04 (C): │ ││ │ -05 (C): │ ││ │ -06 (C): │ ││ │ -07 (C): │ ││ │ -08 (C): │ ││ │ -09 (C): │ ││ │ -10 (C): │ ││ │ -11 (C): │ ││ │ -12 (C): │ ││ │ -13 (C): │ ││ │ -14 (C): │ ││ │ -15 (C): │ ││ │ -16 (C): │ ││ │ -17 (C): │ ││ │ -18 (C): │ ││ │ -19 (C): └──────────────────────────────────┘└──────────────────────────────────────────┘ - +2 diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_resize_action_to_screen.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_resize_action_to_screen.snap index 3b34c47d..69ea0a2e 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_resize_action_to_screen.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_resize_action_to_screen.snap @@ -1,6 +1,24 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 904 -expression: "format!(\"{}\", snapshot_count)" +expression: "format!(\"{}\", snapshot)" --- -0 +00 (C): ┌ Pane #1 ─────────────────────────────┐┌ Pane #2 ─────────────────────────────┐ +01 (C): │ ││ │ +02 (C): │ ││ │ +03 (C): │ ││ │ +04 (C): │ ││ │ +05 (C): │ ││ │ +06 (C): │ ││ │ +07 (C): │ ││ │ +08 (C): │ ││ │ +09 (C): │ ││ │ +10 (C): │ ││ │ +11 (C): │ ││ │ +12 (C): │ ││ │ +13 (C): │ ││ │ +14 (C): │ ││ │ +15 (C): │ ││ │ +16 (C): │ ││ │ +17 (C): │ ││ │ +18 (C): │ ││ │ +19 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_down_action-2.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_down_action-2.snap index 2435355f..96aaf171 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_down_action-2.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_down_action-2.snap @@ -1,16 +1,14 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1407 expression: "format!(\"{}\", snapshot)" --- -00 (C): ┌ Pane #1 ────────────── SCROLL: 1/13 ┐┌ Pane #2 ─────────────────────────────┐ -01 (C): │fill pane up with something 12 ││ │ -02 (C): │fill pane up with something 13 ││ │ -03 (C): │fill pane up with something 14 ││ │ -04 (C): │fill pane up with something 15 ││ │ -05 (C): │fill pane up with something 16 ││ │ -06 (C): │fill pane up with something 17 ││ │ -07 (C): │fill pane up with something 18 ││ │ -08 (C): │fill pane up with something 19 ││ │ +00 (C): ┌ Pane #1 ────────────── SCROLL: 0/13 ┐┌ Pane #2 ─────────────────────────────┐ +01 (C): │fill pane up with something 13 ││ │ +02 (C): │fill pane up with something 14 ││ │ +03 (C): │fill pane up with something 15 ││ │ +04 (C): │fill pane up with something 16 ││ │ +05 (C): │fill pane up with something 17 ││ │ +06 (C): │fill pane up with something 18 ││ │ +07 (C): │fill pane up with something 19 ││ │ +08 (C): │ ││ │ 09 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ - diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_down_action-4.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_down_action-4.snap index e2f43ec0..6f985b85 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_down_action-4.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_down_action-4.snap @@ -1,16 +1,5 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1407 -expression: "format!(\"{}\", snapshot)" +expression: "format!(\"{}\", snapshot_count)" --- -00 (C): ┌ Pane #1 ────────────── SCROLL: 3/13 ┐┌ Pane #2 ─────────────────────────────┐ -01 (C): │fill pane up with something 10 ││ │ -02 (C): │fill pane up with something 11 ││ │ -03 (C): │fill pane up with something 12 ││ │ -04 (C): │fill pane up with something 13 ││ │ -05 (C): │fill pane up with something 14 ││ │ -06 (C): │fill pane up with something 15 ││ │ -07 (C): │fill pane up with something 16 ││ │ -08 (C): │fill pane up with something 17 ││ │ -09 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ - +3 diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_bottom_action-2.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_bottom_action-2.snap index 20c9331f..96aaf171 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_bottom_action-2.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_bottom_action-2.snap @@ -1,16 +1,14 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1484 expression: "format!(\"{}\", snapshot)" --- -00 (C): ┌ Pane #1 ────────────── SCROLL: 1/13 ┐┌ Pane #2 ─────────────────────────────┐ -01 (C): │fill pane up with something 12 ││ │ -02 (C): │fill pane up with something 13 ││ │ -03 (C): │fill pane up with something 14 ││ │ -04 (C): │fill pane up with something 15 ││ │ -05 (C): │fill pane up with something 16 ││ │ -06 (C): │fill pane up with something 17 ││ │ -07 (C): │fill pane up with something 18 ││ │ -08 (C): │fill pane up with something 19 ││ │ +00 (C): ┌ Pane #1 ────────────── SCROLL: 0/13 ┐┌ Pane #2 ─────────────────────────────┐ +01 (C): │fill pane up with something 13 ││ │ +02 (C): │fill pane up with something 14 ││ │ +03 (C): │fill pane up with something 15 ││ │ +04 (C): │fill pane up with something 16 ││ │ +05 (C): │fill pane up with something 17 ││ │ +06 (C): │fill pane up with something 18 ││ │ +07 (C): │fill pane up with something 19 ││ │ +08 (C): │ ││ │ 09 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ - diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_bottom_action-3.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_bottom_action-3.snap index 5685baed..96aaf171 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_bottom_action-3.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_bottom_action-3.snap @@ -1,16 +1,14 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1484 expression: "format!(\"{}\", snapshot)" --- -00 (C): ┌ Pane #1 ────────────── SCROLL: 2/13 ┐┌ Pane #2 ─────────────────────────────┐ -01 (C): │fill pane up with something 11 ││ │ -02 (C): │fill pane up with something 12 ││ │ -03 (C): │fill pane up with something 13 ││ │ -04 (C): │fill pane up with something 14 ││ │ -05 (C): │fill pane up with something 15 ││ │ -06 (C): │fill pane up with something 16 ││ │ -07 (C): │fill pane up with something 17 ││ │ -08 (C): │fill pane up with something 18 ││ │ +00 (C): ┌ Pane #1 ────────────── SCROLL: 0/13 ┐┌ Pane #2 ─────────────────────────────┐ +01 (C): │fill pane up with something 13 ││ │ +02 (C): │fill pane up with something 14 ││ │ +03 (C): │fill pane up with something 15 ││ │ +04 (C): │fill pane up with something 16 ││ │ +05 (C): │fill pane up with something 17 ││ │ +06 (C): │fill pane up with something 18 ││ │ +07 (C): │fill pane up with something 19 ││ │ +08 (C): │ ││ │ 09 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ - diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_bottom_action-4.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_bottom_action-4.snap index 5ae26d91..6f985b85 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_bottom_action-4.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_bottom_action-4.snap @@ -1,16 +1,5 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1484 -expression: "format!(\"{}\", snapshot)" +expression: "format!(\"{}\", snapshot_count)" --- -00 (C): ┌ Pane #1 ────────────── SCROLL: 3/13 ┐┌ Pane #2 ─────────────────────────────┐ -01 (C): │fill pane up with something 10 ││ │ -02 (C): │fill pane up with something 11 ││ │ -03 (C): │fill pane up with something 12 ││ │ -04 (C): │fill pane up with something 13 ││ │ -05 (C): │fill pane up with something 14 ││ │ -06 (C): │fill pane up with something 15 ││ │ -07 (C): │fill pane up with something 16 ││ │ -08 (C): │fill pane up with something 17 ││ │ -09 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ - +3 diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_top_action-2.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_top_action-2.snap index e0a5a3fd..96aaf171 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_top_action-2.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_top_action-2.snap @@ -1,16 +1,14 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1565 expression: "format!(\"{}\", snapshot)" --- -00 (C): ┌ Pane #1 ───────────── SCROLL: 13/13 ┐┌ Pane #2 ─────────────────────────────┐ -01 (C): │fill pane up with something 0 ││ │ -02 (C): │fill pane up with something 1 ││ │ -03 (C): │fill pane up with something 2 ││ │ -04 (C): │fill pane up with something 3 ││ │ -05 (C): │fill pane up with something 4 ││ │ -06 (C): │fill pane up with something 5 ││ │ -07 (C): │fill pane up with something 6 ││ │ -08 (C): │fill pane up with something 7 ││ │ +00 (C): ┌ Pane #1 ────────────── SCROLL: 0/13 ┐┌ Pane #2 ─────────────────────────────┐ +01 (C): │fill pane up with something 13 ││ │ +02 (C): │fill pane up with something 14 ││ │ +03 (C): │fill pane up with something 15 ││ │ +04 (C): │fill pane up with something 16 ││ │ +05 (C): │fill pane up with something 17 ││ │ +06 (C): │fill pane up with something 18 ││ │ +07 (C): │fill pane up with something 19 ││ │ +08 (C): │ ││ │ 09 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ - diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_top_action-3.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_top_action-3.snap index 526a865c..da18a425 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_top_action-3.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_top_action-3.snap @@ -1,6 +1,14 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1567 -expression: "format!(\"{}\", snapshot_count)" +expression: "format!(\"{}\", snapshot)" --- -2 +00 (C): ┌ Pane #1 ───────────── SCROLL: 13/13 ┐┌ Pane #2 ─────────────────────────────┐ +01 (C): │fill pane up with something 0 ││ │ +02 (C): │fill pane up with something 1 ││ │ +03 (C): │fill pane up with something 2 ││ │ +04 (C): │fill pane up with something 3 ││ │ +05 (C): │fill pane up with something 4 ││ │ +06 (C): │fill pane up with something 5 ││ │ +07 (C): │fill pane up with something 6 ││ │ +08 (C): │fill pane up with something 7 ││ │ +09 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_top_action-4.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_top_action-4.snap new file mode 100644 index 00000000..6f985b85 --- /dev/null +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_to_top_action-4.snap @@ -0,0 +1,5 @@ +--- +source: zellij-server/src/./unit/screen_tests.rs +expression: "format!(\"{}\", snapshot_count)" +--- +3 diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_up_action-2.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_up_action-2.snap index d7056c6e..96aaf171 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_up_action-2.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_scroll_up_action-2.snap @@ -1,16 +1,14 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 1327 expression: "format!(\"{}\", snapshot)" --- -00 (C): ┌ Pane #1 ────────────── SCROLL: 1/13 ┐┌ Pane #2 ─────────────────────────────┐ -01 (C): │fill pane up with something 12 ││ │ -02 (C): │fill pane up with something 13 ││ │ -03 (C): │fill pane up with something 14 ││ │ -04 (C): │fill pane up with something 15 ││ │ -05 (C): │fill pane up with something 16 ││ │ -06 (C): │fill pane up with something 17 ││ │ -07 (C): │fill pane up with something 18 ││ │ -08 (C): │fill pane up with something 19 ││ │ +00 (C): ┌ Pane #1 ────────────── SCROLL: 0/13 ┐┌ Pane #2 ─────────────────────────────┐ +01 (C): │fill pane up with something 13 ││ │ +02 (C): │fill pane up with something 14 ││ │ +03 (C): │fill pane up with something 15 ││ │ +04 (C): │fill pane up with something 16 ││ │ +05 (C): │fill pane up with something 17 ││ │ +06 (C): │fill pane up with something 18 ││ │ +07 (C): │fill pane up with something 19 ││ │ +08 (C): │ ││ │ 09 (C): └──────────────────────────────────────┘└──────────────────────────────────────┘ - diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_toggle_active_tab_sync_action.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_toggle_active_tab_sync_action.snap index dab5b941..97a33ab7 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_toggle_active_tab_sync_action.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_toggle_active_tab_sync_action.snap @@ -2,4 +2,4 @@ source: zellij-server/src/./unit/screen_tests.rs expression: "format!(\"{:?}\", *received_pty_instructions.lock().unwrap())" --- -[StartCachingResizes, ApplyCachedResizes, StartCachingResizes, ResizePty(0, 59, 18, None, None), ResizePty(1, 58, 18, None, None), ResizePty(0, 59, 18, None, None), ResizePty(1, 58, 18, None, None), ResizePty(0, 59, 18, None, None), ResizePty(1, 58, 18, None, None), ResizePty(0, 59, 18, None, None), ResizePty(1, 58, 18, None, None), ApplyCachedResizes, ResizePty(0, 58, 18, None, None), ResizePty(1, 59, 18, None, None), ResizePty(0, 58, 18, None, None), ResizePty(1, 59, 18, None, None), ResizePty(0, 58, 18, None, None), ResizePty(1, 59, 18, None, None), ResizePty(0, 58, 18, None, None), ResizePty(1, 59, 18, None, None), ResizePty(0, 59, 18, None, None), ResizePty(1, 58, 18, None, None), ApplyCachedResizes, ApplyCachedResizes, ApplyCachedResizes, StartCachingResizes, ApplyCachedResizes, StartCachingResizes, ApplyCachedResizes, StartCachingResizes, Write([102, 111, 111], 0), Write([102, 111, 111], 1), ApplyCachedResizes, Exit] +[StartCachingResizes, ApplyCachedResizes, StartCachingResizes, ResizePty(0, 59, 18, None, None), ResizePty(1, 58, 18, None, None), ResizePty(0, 59, 18, None, None), ResizePty(1, 58, 18, None, None), ResizePty(0, 59, 18, None, None), ResizePty(1, 58, 18, None, None), ResizePty(0, 59, 18, None, None), ResizePty(1, 58, 18, None, None), ApplyCachedResizes, ResizePty(0, 58, 18, None, None), ResizePty(1, 59, 18, None, None), ResizePty(0, 58, 18, None, None), ResizePty(1, 59, 18, None, None), ResizePty(0, 58, 18, None, None), ResizePty(1, 59, 18, None, None), ResizePty(0, 58, 18, None, None), ResizePty(1, 59, 18, None, None), ResizePty(0, 59, 18, None, None), ResizePty(1, 58, 18, None, None), ApplyCachedResizes, ApplyCachedResizes, ApplyCachedResizes, StartCachingResizes, ApplyCachedResizes, StartCachingResizes, ApplyCachedResizes, StartCachingResizes, ApplyCachedResizes, StartCachingResizes, ApplyCachedResizes, StartCachingResizes, Write([102, 111, 111], 0), Write([102, 111, 111], 1), ApplyCachedResizes, StartCachingResizes, ApplyCachedResizes, StartCachingResizes, ApplyCachedResizes, Exit] diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_write_action_to_screen.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_write_action_to_screen.snap index 79a0b61c..23ecdce1 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_write_action_to_screen.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_write_action_to_screen.snap @@ -2,4 +2,4 @@ source: zellij-server/src/./unit/screen_tests.rs expression: "format!(\"{:?}\", *received_pty_instructions.lock().unwrap())" --- -[StartCachingResizes, ApplyCachedResizes, StartCachingResizes, ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ApplyCachedResizes, ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ApplyCachedResizes, ApplyCachedResizes, ApplyCachedResizes, StartCachingResizes, ApplyCachedResizes, StartCachingResizes, Write([102, 111, 111], 0), ApplyCachedResizes, Exit] +[StartCachingResizes, ApplyCachedResizes, StartCachingResizes, ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ApplyCachedResizes, ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ApplyCachedResizes, ApplyCachedResizes, ApplyCachedResizes, StartCachingResizes, ApplyCachedResizes, StartCachingResizes, ApplyCachedResizes, StartCachingResizes, ApplyCachedResizes, StartCachingResizes, Write([102, 111, 111], 0), ApplyCachedResizes, StartCachingResizes, ApplyCachedResizes, Exit] diff --git a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_write_chars_action_to_screen.snap b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_write_chars_action_to_screen.snap index 995d89bc..938d5ce2 100644 --- a/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_write_chars_action_to_screen.snap +++ b/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_write_chars_action_to_screen.snap @@ -2,4 +2,4 @@ source: zellij-server/src/./unit/screen_tests.rs expression: "format!(\"{:?}\", *received_pty_instructions.lock().unwrap())" --- -[StartCachingResizes, ApplyCachedResizes, StartCachingResizes, ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ApplyCachedResizes, ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ApplyCachedResizes, ApplyCachedResizes, ApplyCachedResizes, StartCachingResizes, ApplyCachedResizes, StartCachingResizes, Write([105, 110, 112, 117, 116, 32, 102, 114, 111, 109, 32, 116, 104, 101, 32, 99, 108, 105], 0), ApplyCachedResizes, Exit] +[StartCachingResizes, ApplyCachedResizes, StartCachingResizes, ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ApplyCachedResizes, ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ResizePty(0, 119, 18, None, None), ApplyCachedResizes, ApplyCachedResizes, ApplyCachedResizes, StartCachingResizes, ApplyCachedResizes, StartCachingResizes, ApplyCachedResizes, StartCachingResizes, ApplyCachedResizes, StartCachingResizes, Write([105, 110, 112, 117, 116, 32, 102, 114, 111, 109, 32, 116, 104, 101, 32, 99, 108, 105], 0), ApplyCachedResizes, StartCachingResizes, ApplyCachedResizes, Exit] |