Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
fix(list): Pad arrow column for correct alignment
Maximilian Roos892b72a3f394
diff --git a/src/commands/list/render.rs b/src/commands/list/render.rsindex af3cff413..14d97166b 100644--- a/src/commands/list/render.rs+++ b/src/commands/list/render.rs@@ -49,6 +49,10 @@ fn format_arrow_column(// Reserve full space when behind is zerosegment.push_raw(" ".repeat(1 + widths.deleted_digits));}++ // Pad to total width if header is wider than data+ // (e.g., "Commits" header = 7, but data "↓50" = 5)+ segment.pad_to(widths.total);} else {segment.push_raw(" ".repeat(widths.total));}@@ -615,4 +619,38 @@ mod tests {);}}++ #[test]+ fn test_arrow_column_with_header_wider_than_data() {+ // Reproduces the actual bug: when header is wider than data+ // - No ahead values (max_ahead_digits = 0)+ // - Max behind is 50 (max_behind_digits = 2)+ // - data_width = 1 + 0 + 1 + 1 + 2 = 5+ // - header "Commits" = 7+ // - total = max(5, 7) = 7+ use super::super::layout::DiffWidths;+ use super::format_arrow_column;+ use worktrunk::styling::{ADDITION, DELETION};++ let widths = DiffWidths {+ total: 7, // To fit "Commits" header+ added_digits: 0, // No ahead values+ deleted_digits: 2, // Max behind is 50+ };++ let dim_deletion = DELETION.dimmed();++ // Empty column should be 7 spaces+ let empty = format_arrow_column(0, 0, &widths, ADDITION, dim_deletion);+ assert_eq!(empty.width(), 7, "Empty column should be 7 spaces");++ // Column with only behind should also be 7!+ let behind_only = format_arrow_column(0, 50, &widths, ADDITION, dim_deletion);+ assert_eq!(+ behind_only.width(),+ 7,+ "Column with behind=50 should be 7 chars (currently {} - THIS IS THE BUG)",+ behind_only.width()+ );+ }}diff --git a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__long_commit_message.snapindex 8ede48002..346e24235 100644--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap@@ -15,14 +15,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbmtWq2/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxMvUqA/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mCommits[0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m[1m[35mmain [0m [1m[35m./test-repo[0m [2m10 months ago[0m [2m1310bfb9[0m [2mShort message[0m-[2mfeature-a[0m [2m[31m↓1[0m [2m./feature-a[0m [2m10 months ago[0m [2mf078644e[0m [2mThis is a very long commit message that should test how the message column handles...[0m+[2mfeature-a[0m [2m[31m↓1[0m [2m./feature-a[0m [2m10 months ago[0m [2mf078644e[0m [2mThis is a very long commit message that should test how the message column handles...[0m[2mShowing 2 worktrees, 1 behind[0mdiff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snapindex fb975f2b0..b40df4ad0 100644--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap@@ -15,14 +15,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9GXdoj/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYmyRj4/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mCommits[0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m[1m[35mmain [0m [1m[35m./test-repo [0m [2m10 months ago[0m [2me4614cb7[0m [2mFix bug with café ☕ handling[0m-[2mfeature-test[0m [2m[31m↓1[0m [2m./feature-test[0m [2m10 months ago[0m [2m0c53695b[0m [2mAdd support for 日本語 and émoji 🎉[0m+[2mfeature-test[0m [2m[31m↓1[0m [2m./feature-test[0m [2m10 months ago[0m [2m0c53695b[0m [2mAdd support for 日本語 and émoji 🎉[0m[2mShowing 2 worktrees, 1 behind[0m