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

fix(compact-bar): fix cursor length calculation for multiple users (#4279)

Browse source 
* fix(compact-bar): account for multiplayer cursor length

* fix(e2e): account for races in tmux mode

* style(fmt): rustfmt

* docs(changelog): add PR
This commit is contained in:
Aram Drevekenin 2025-07-09 17:32:41 +02:00 • committed by GitHub
parent f8b8d61552
commit 8113ddf9db
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
## [Unreleased] ## [Unreleased]
* feat: multiple select and bulk pane actions (https://github.com/zellij-org/zellij/pull/4169 and https://github.com/zellij-org/zellij/pull/4171 and https://github.com/zellij-org/zellij/pull/4221) * feat: multiple select and bulk pane actions (https://github.com/zellij-org/zellij/pull/4169 and https://github.com/zellij-org/zellij/pull/4171 and https://github.com/zellij-org/zellij/pull/4221)
* feat: add an optional key tooltip to show the current keybindings for the compact bar (https://github.com/zellij-org/zellij/pull/4225) * feat: add an optional key tooltip to show the current keybindings for the compact bar (https://github.com/zellij-org/zellij/pull/4225 and https://github.com/zellij-org/zellij/pull/4279)
* feat: web-client, allowing users to share sessions in the browser (https://github.com/zellij-org/zellij/pull/4242, https://github.com/zellij-org/zellij/pull/4257 and https://github.com/zellij-org/zellij/pull/4278) * feat: web-client, allowing users to share sessions in the browser (https://github.com/zellij-org/zellij/pull/4242, https://github.com/zellij-org/zellij/pull/4257 and https://github.com/zellij-org/zellij/pull/4278)
* performance: consolidate renders (https://github.com/zellij-org/zellij/pull/4245) * performance: consolidate renders (https://github.com/zellij-org/zellij/pull/4245)
* feat: add plugin API to replace a pane with another existing pane (https://github.com/zellij-org/zellij/pull/4246) * feat: add plugin API to replace a pane with another existing pane (https://github.com/zellij-org/zellij/pull/4246)

1
default-plugins/compact-bar/src/tab.rs
View file

@ -14,6 +14,7 @@ fn cursors(focused_clients: &[ClientId], colors: MultiplayerColors) -> (Vec<ANSI
len += 1; len += 1;
} }
} }
len += 2; // 2 for the brackets: [ and ]
(cursors, len) (cursors, len)
} }

4
src/tests/e2e/cases.rs
View file

@ -101,8 +101,12 @@ fn account_for_races_in_snapshot(snapshot: String) -> String {
// once that happens, we should be able to remove this hack (and adjust the snapshots for the // once that happens, we should be able to remove this hack (and adjust the snapshots for the
// trailing spaces that we had to get rid of here) // trailing spaces that we had to get rid of here)
let base_replace = Regex::new(r"Alt <\[\]>  BASE \s*\n").unwrap(); let base_replace = Regex::new(r"Alt <\[\]>  BASE \s*\n").unwrap();
let base_replace_tmux_mode = Regex::new(r"Alt \[\|SPACE\|Alt \]  BASE \s*\n").unwrap();
let eol_arrow_replace = Regex::new(r"\s*\n").unwrap(); let eol_arrow_replace = Regex::new(r"\s*\n").unwrap();
let snapshot = base_replace.replace_all(&snapshot, "\n").to_string(); let snapshot = base_replace.replace_all(&snapshot, "\n").to_string();
let snapshot = base_replace_tmux_mode
.replace_all(&snapshot, "\n")
.to_string();
let snapshot = eol_arrow_replace.replace_all(&snapshot, "\n").to_string(); let snapshot = eol_arrow_replace.replace_all(&snapshot, "\n").to_string();
snapshot snapshot