From b718451d96b0ac978dfc6dfa0e3c594e26136d51 Mon Sep 17 00:00:00 2001 From: Roman Suvorov Date: Sat, 14 Dec 2024 19:01:21 +0100 Subject: [PATCH] trimLeft, move to charmbracelete/x/ansi lib --- go.mod | 2 +- go.sum | 2 ++ viewport/viewport.go | 4 ++-- viewport/viewport_test.go | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 575d4f5..c74c326 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/charmbracelet/bubbletea v1.1.2 github.com/charmbracelet/harmonica v0.2.0 github.com/charmbracelet/lipgloss v1.0.0 - github.com/charmbracelet/x/ansi v0.4.2 + github.com/charmbracelet/x/ansi v0.6.0 github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 github.com/dustin/go-humanize v1.0.1 github.com/lucasb-eyer/go-colorful v1.2.0 diff --git a/go.sum b/go.sum index bd41a6f..05b3ebd 100644 --- a/go.sum +++ b/go.sum @@ -14,6 +14,8 @@ github.com/charmbracelet/lipgloss v1.0.0 h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O github.com/charmbracelet/lipgloss v1.0.0/go.mod h1:U5fy9Z+C38obMs+T+tJqst9VGzlOYGj4ri9reL3qUlo= github.com/charmbracelet/x/ansi v0.4.2 h1:0JM6Aj/g/KC154/gOP4vfxun0ff6itogDYk41kof+qk= github.com/charmbracelet/x/ansi v0.4.2/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw= +github.com/charmbracelet/x/ansi v0.6.0 h1:qOznutrb93gx9oMiGf7caF7bqqubh6YIM0SWKyA08pA= +github.com/charmbracelet/x/ansi v0.6.0/go.mod h1:KBUFw1la39nl0dLl10l5ORDAqGXaeurTQmwyyVKse/Q= github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 h1:payRxjMjKgx2PaCWLZ4p3ro9y97+TVLZNaRZgJwSVDQ= github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U= github.com/charmbracelet/x/term v0.2.0 h1:cNB9Ot9q8I711MyZ7myUR5HFWL/lc3OpU8jZ4hwm0x0= diff --git a/viewport/viewport.go b/viewport/viewport.go index bb08645..9658e6c 100644 --- a/viewport/viewport.go +++ b/viewport/viewport.go @@ -7,7 +7,7 @@ import ( "github.com/charmbracelet/bubbles/key" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" - "github.com/mattn/go-runewidth" + "github.com/charmbracelet/x/ansi" ) const ( @@ -137,7 +137,7 @@ func (m Model) visibleLines() (lines []string) { if m.indent > 0 { cutLines := make([]string, len(lines)) for i := range lines { - cutLines[i] = runewidth.TruncateLeft(lines[i], m.indent, "") + cutLines[i] = ansi.TruncateLeft(lines[i], m.indent, "") } return cutLines diff --git a/viewport/viewport_test.go b/viewport/viewport_test.go index a3a47af..53ae7c6 100644 --- a/viewport/viewport_test.go +++ b/viewport/viewport_test.go @@ -325,7 +325,7 @@ func TestVisibleLines(t *testing.T) { for i := range list { if i == 0 || i == 2 { - cutLine := " えお" + cutLine := "うえお" if list[i] != cutLine { t.Errorf("line must be `%s`, get `%s`", cutLine, list[i]) }