Skip to content
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

Jump to bottom

Use lipgloss.Width to calculate DisplayWidth #159

Merged
merged 2 commits into from
Apr 29, 2024
Merged

Use lipgloss.Width to calculate DisplayWidth #159

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88ed363
feat: use `uniseg` to calculate `DisplayWidth`
maaslalani Apr 29, 2024
5b0ee9f
feat: use `lipgloss.Width` to account for ANSI sequences
maaslalani Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/text/text.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"time"
"unicode"

"github.com/muesli/reflow/ansi"
"github.com/muesli/reflow/truncate"
"github.com/rivo/uniseg"
"golang.org/x/text/runes"
"golang.org/x/text/transform"
"golang.org/x/text/unicode/norm"
Expand All @@ -33,7 +33,7 @@ func Indent(s, indent string) string {

// DisplayWidth calculates what the rendered width of string s will be.
func DisplayWidth(s string) int {
return ansi.PrintableRuneWidth(s)
return uniseg.StringWidth(s)
maaslalani marked this conversation as resolved.
Show resolved Hide resolved
}

// Truncate returns a copy of the string s that has been shortened to fit the maximum display width.
Expand Down