Skip to content

fix(git): preserve grapheme clusters in fish-style abbreviations - #790

Merged
sirmalloc merged 4 commits into
sirmalloc:mainfrom
wozhenbang2004:fix/git-grapheme-abbreviation
Nov 5, 2026
Merged

sirmalloc merged 4 commits into
sirmalloc:mainfrom
wozhenbang2004:fix/git-grapheme-abbreviation

Conversation

@wozhenbang2004

Copy link
Copy Markdown
Contributor

Fixes #789.

Use the existing getGraphemes helper when abbreviating Git branch and worktree names. The first displayed character now stays intact for flags, ZWJ emoji, combining marks, skin-tone modifiers, and variation selectors. The final path segment and unabridged names keep their current behavior.

Adds fourteen rendering cases across the existing widget tests, including single-segment names and a final-segment control. The new failing cases use clusters at the start of a segment, where fish-style abbreviation actually truncates.

Validation:

No dependency or runtime-floor changes; this reuses the helper's existing fallback for runtimes without Intl.Segmenter.

@sirmalloc
sirmalloc merged commit a3af006 into sirmalloc:main Nov 5, 2026
3 checks passed
pcvelz added a commit to pcvelz/ccstatusline-usage that referenced this pull request Nov 13, 2026
Upstream: Extra Usage Today widget (sirmalloc#811), newer usage API percent in an idle session (sirmalloc#767), thinking-effort brackets and per-level colors (sirmalloc#777), 256-color grid in Edit Colors (sirmalloc#778), context bar thin line mode (sirmalloc#794), progress-bar widget consolidation (sirmalloc#810), Zed IDE link mode (sirmalloc#800), Check for Updates deadline and proxy fixes (sirmalloc#806), Configure Status Line before an install (sirmalloc#807), emoji and grapheme fixes (sirmalloc#808, sirmalloc#803, sirmalloc#790), Nerd Font icon width in Ghostty and kitty (sirmalloc#801), cache temp file leak fix (sirmalloc#783), plus TUI, timer and separator fixes.

Hand edits outside conflicts:
- src/tui/components/__tests__/InstallMenu.test.tsx: fork-rename (ccstatusline@ -> ccstatusline-usage@)
- src/utils/__tests__/hooks.test.ts: fork-rename (ccstatusline@ -> ccstatusline-usage@)
- src/tui/__tests__/App.test.ts: fork-rename; upstream's new menu and preview tests step over the fork's Off Hours row and pin cyan where the fork's Model default is ansi256:124
- src/tui/components/__tests__/ColorMenuPalette.test.tsx: fork deviation - Model default is ansi256:124
- src/utils/__tests__/global-package-manager.test.ts: fork deviation - fixture path uses the fork package name ccstatusline-usage
- src/utils/__tests__/migrations.test.ts: fork deviation - flexMode is a post-v1 key in the fork, the v1 sample uses globalBold
- src/utils/__tests__/usage-prefetch.test.ts: fork deviation - stub the provider gate (resolveProvider) in upstream's idle-session and daily-spend tests; the fork reads weekly usage from the API only
- src/utils/__tests__/update-checker.test.ts: lint import order
- src/utils/usage-prefetch.ts: lint - drop the unused fetchUsageData import
- src/widgets/WeeklyFableUsage.ts: compat fix - render through upstream's formatUsageBar (sirmalloc#810) so the line mode works; the inverted cursor follows the shared percent-widget rule
- src/widgets/__tests__/line-bar.test.ts: compat fix - fork WeeklyFableUsageWidget, weeklyFableUsage field and Fable label; block metrics stubbed so the inactive-block case does not read the real cache
- src/widgets/shared/__tests__/usage-display.test.ts: compat fix - the merged cycle has line mode after slider-only
- src/widgets/__tests__/ThinkingEffort.test.ts: keeps the fork's real-settings-file harness, ports upstream's sirmalloc#777 cases onto it
- bun.lock: upstream dependency updates, re-resolved by bun install
- docs/test-retirements.md: ledger for 7 tests upstream replaced (sirmalloc#781 tab as one space, sirmalloc#805 settings write failures, sirmalloc#800 Zed IDE link mode), each naming its replacing test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Fish-style abbreviation splits multi-codepoint graphemes (flags, ZWJ emoji, combining marks)

2 participants