Skip to content

refactor(ui): simplify truncPad via runewidth Truncate/FillRight #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peczenyj merged 1 commit into from
May 29, 2026
Merged

refactor(ui): simplify truncPad via runewidth Truncate/FillRight #94

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 5 additions & 22 deletions internal/ui/printer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,28 +380,11 @@ func truncPad(s string, w int) string {
}
// expand tabs to 4 spaces for stable columns
s = strings.ReplaceAll(s, "\t", " ")
runes := []rune(s)
if total := runewidth.StringWidth(s); total <= w {
return s + strings.Repeat(" ", w-total)
}
if w == 1 {
return "…"
}
// Keep the widest prefix that still leaves one cell for the ellipsis, then
// pad: a wide rune straddling the boundary can leave the prefix a cell short.
width := 0
var b strings.Builder
for _, r := range runes {
rw := runewidth.RuneWidth(r)
if width+rw+1 > w { // reserve one cell for "…"
break
}
b.WriteRune(r)
width += rw
}
b.WriteString("…")
width++
return b.String() + strings.Repeat(" ", w-width)
// runewidth.Truncate fits s into w cells, appending "…" (and reserving its
// cell) when it has to cut — including the wide-rune-straddling-the-boundary
// case. FillRight then right-pads the result to exactly w cells. Both measure
// in terminal cells, so CJK and other wide runes count as two.
return runewidth.FillRight(runewidth.Truncate(s, w, "…"), w)
}

// paint renders s in role's style when color is enabled, else returns s plain.
Expand Down
Loading