pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(status-bar): proper truncation of secondary info (#4313)

Browse source 
* fix(status-bar): properly truncate secondary keybindings

* style(fmt): rustfmt

* more correct fix

* fix e2e tests

* docs(changelog): add PR
This commit is contained in:
Aram Drevekenin 2025-07-22 21:12:38 +02:00 • committed by GitHub
parent 67e08cbb74
commit 91716979e0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
32 changed files with 41 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
* fix: stack pane ordering when stacking multiple panes (https://github.com/zellij-org/zellij/pull/4308) * fix: stack pane ordering when stacking multiple panes (https://github.com/zellij-org/zellij/pull/4308)
* fix: normalize focusing of plugins launched through pipes (https://github.com/zellij-org/zellij/pull/4309) * fix: normalize focusing of plugins launched through pipes (https://github.com/zellij-org/zellij/pull/4309)
* performance: improve dumping screen for when editing scrollback with $EDITOR (https://github.com/zellij-org/zellij/pull/2548) * performance: improve dumping screen for when editing scrollback with $EDITOR (https://github.com/zellij-org/zellij/pull/2548)
* fix: properly truncate status bar secondary info (https://github.com/zellij-org/zellij/pull/4313)
## [0.42.2] - 2025-04-15 ## [0.42.2] - 2025-04-15
* refactor(terminal): track scroll_region as tuple rather than Option (https://github.com/zellij-org/zellij/pull/4082) * refactor(terminal): track scroll_region as tuple rather than Option (https://github.com/zellij-org/zellij/pull/4082)

15
default-plugins/status-bar/src/one_line_ui.rs
View file

@ -980,18 +980,19 @@ fn secondary_keybinds(help: &ModeInfo, tab_info: Option<&TabInfo>, max_len: usiz
} }
if short_line.len <= max_len { if short_line.len <= max_len {
short_line short_line
} else { } else if max_len >= 3 {
let part = serialize_text( let part = serialize_text(
&Text::new(format!( &Text::new(format!("{:>width$}", "...", width = max_len))
"{:>width$}",
"...",
width = max_len.saturating_sub(3)
))
.color_range(0, ..) .color_range(0, ..)
.opaque(), .opaque(),
); );
let len = max_len.saturating_sub(3); let len = max_len;
LinePart { part, len } LinePart { part, len }
} else {
LinePart {
part: "".to_owned(),
len: 0,
}
} }
} }
} }

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__bracketed_paste.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 2000
expression: last_snapshot expression: last_snapshot
--- ---
Zellij (e2e-test)  Tab #1  Zellij (e2e-test)  Tab #1 

3
src/tests/e2e/snapshots/zellij__tests__e2e__cases__cannot_split_terminals_vertically_when_active_terminal_is_too_small.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 239
expression: last_snapshot expression: last_snapshot
--- ---
Zellij Zellij
@ -22,4 +21,4 @@ expression: last_snapshot
│ │ │ │
│ │ │ │
└──────┘ └──────┘
... Ctrl +

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__close_pane.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 714
expression: last_snapshot expression: last_snapshot
--- ---
Zellij (e2e-test)  Tab #1  Zellij (e2e-test)  Tab #1 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__focus_pane_with_mouse.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 1373
expression: last_snapshot expression: last_snapshot
--- ---
Zellij (e2e-test)  Tab #1  Zellij (e2e-test)  Tab #1 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__mirrored_sessions.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 1650
expression: first_runner_snapshot expression: first_runner_snapshot
--- ---
Zellij (mirrored_sessions)  Tab #1  Tab #2  Zellij (mirrored_sessions)  Tab #1  Tab #2 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__move_tab_to_left.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 562
expression: account_for_races_in_snapshot(last_snapshot) expression: account_for_races_in_snapshot(last_snapshot)
--- ---
Zellij (e2e-test)  Tab #1  Tab #3  Tab #2  Zellij (e2e-test)  Tab #1  Tab #3  Tab #2 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__move_tab_to_left_until_it_wraps_around.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 624
expression: account_for_races_in_snapshot(last_snapshot) expression: account_for_races_in_snapshot(last_snapshot)
--- ---
Zellij (e2e-test)  Tab #2  Tab #1  Tab #3  Zellij (e2e-test)  Tab #2  Tab #1  Tab #3 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__move_tab_to_right.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 596
expression: account_for_races_in_snapshot(last_snapshot) expression: account_for_races_in_snapshot(last_snapshot)
--- ---
Zellij (e2e-test)  Tab #1  Tab #3  Tab #2  Zellij (e2e-test)  Tab #1  Tab #3  Tab #2 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__move_tab_to_right_until_it_wraps_around.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 648
expression: account_for_races_in_snapshot(last_snapshot) expression: account_for_races_in_snapshot(last_snapshot)
--- ---
Zellij (e2e-test)  Tab #3  Tab #2  Tab #1  Zellij (e2e-test)  Tab #3  Tab #2  Tab #1 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_different_panes_and_same_tab-2.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 1836
expression: second_runner_snapshot expression: second_runner_snapshot
--- ---
Zellij (multiple_users_in_same_pane_and_tab)  Tab #1 [ ] Zellij (multiple_users_in_same_pane_and_tab)  Tab #1 [ ]

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_different_panes_and_same_tab.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 1835
expression: first_runner_snapshot expression: first_runner_snapshot
--- ---
Zellij (multiple_users_in_same_pane_and_tab)  Tab #1 [ ] Zellij (multiple_users_in_same_pane_and_tab)  Tab #1 [ ]

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_different_tabs-2.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 1936
expression: second_runner_snapshot expression: second_runner_snapshot
--- ---
Zellij (multiple_users_in_different_tabs)  Tab #1 [ ] Tab #2  Zellij (multiple_users_in_different_tabs)  Tab #1 [ ] Tab #2 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_different_tabs.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 1935
expression: first_runner_snapshot expression: first_runner_snapshot
--- ---
Zellij (multiple_users_in_different_tabs)  Tab #1  Tab #2 [ ] Zellij (multiple_users_in_different_tabs)  Tab #1  Tab #2 [ ]

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_same_pane_and_tab-2.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 1741
expression: second_runner_snapshot expression: second_runner_snapshot
--- ---
Zellij (multiple_users_in_same_pane_and_tab)  Tab #1 [ ] Zellij (multiple_users_in_same_pane_and_tab)  Tab #1 [ ]

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_same_pane_and_tab.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 1740
expression: first_runner_snapshot expression: first_runner_snapshot
--- ---
Zellij (multiple_users_in_same_pane_and_tab)  Tab #1 [ ] Zellij (multiple_users_in_same_pane_and_tab)  Tab #1 [ ]

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__open_new_tab.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 454
expression: last_snapshot expression: last_snapshot
--- ---
Zellij (e2e-test)  Tab #1  Tab #2  Zellij (e2e-test)  Tab #1  Tab #2 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__pin_floating_panes.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 2521
expression: last_snapshot expression: last_snapshot
--- ---
Zellij (e2e-test)  Tab #1  Zellij (e2e-test)  Tab #1 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__resize_pane.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 935
expression: last_snapshot expression: last_snapshot
--- ---
Zellij (e2e-test)  Tab #1  Zellij (e2e-test)  Tab #1 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__resize_terminal_window.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 1064
expression: last_snapshot expression: last_snapshot
--- ---
Zellij (e2e-test)  Tab #1  Zellij (e2e-test)  Tab #1 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__scrolling_inside_a_pane_with_mouse.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 1451
expression: last_snapshot expression: last_snapshot
--- ---
Zellij (e2e-test)  Tab #1  Zellij (e2e-test)  Tab #1 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__send_command_through_the_cli.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 2372
expression: last_snapshot expression: last_snapshot
--- ---
Zellij (e2e-test)  Tab #1  Alt <[]>  VERTICAL  Zellij (e2e-test)  Tab #1  Alt <[]>  VERTICAL 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__split_terminals_vertically.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 195
expression: last_snapshot expression: last_snapshot
--- ---
Zellij (e2e-test)  Tab #1  Zellij (e2e-test)  Tab #1 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__start_without_pane_frames.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 1500
expression: last_snapshot expression: last_snapshot
--- ---
Zellij (e2e-test)  Tab #1  Zellij (e2e-test)  Tab #1 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__starts_with_one_terminal.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 145
expression: last_snapshot expression: last_snapshot
--- ---
Zellij (e2e-test)  Tab #1  Zellij (e2e-test)  Tab #1 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__tmux_mode.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 2099
expression: last_snapshot expression: last_snapshot
--- ---
Zellij (e2e-test)  Tab #1  Zellij (e2e-test)  Tab #1 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__toggle_floating_panes.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 2049
expression: last_snapshot expression: last_snapshot
--- ---
Zellij (e2e-test)  Tab #1  Alt <[]>  STAGGERED  Zellij (e2e-test)  Tab #1  Alt <[]>  STAGGERED 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__toggle_pane_fullscreen.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 386
expression: last_snapshot expression: last_snapshot
--- ---
Zellij (e2e-test)  Tab #1 (FULLSCREEN)  Zellij (e2e-test)  Tab #1 (FULLSCREEN) 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__typing_exit_closes_pane.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 867
expression: last_snapshot expression: last_snapshot
--- ---
Zellij (e2e-test)  Tab #1  Zellij (e2e-test)  Tab #1 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__undo_rename_pane.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 2263
expression: last_snapshot expression: last_snapshot
--- ---
Zellij (e2e-test)  Tab #1  Zellij (e2e-test)  Tab #1 

1
src/tests/e2e/snapshots/zellij__tests__e2e__cases__undo_rename_tab.snap
View file

@ -1,6 +1,5 @@
--- ---
source: src/tests/e2e/cases.rs source: src/tests/e2e/cases.rs
assertion_line: 2206
expression: last_snapshot expression: last_snapshot
--- ---
Zellij (e2e-test)  Tab #1  Zellij (e2e-test)  Tab #1 