From 5e26183ae16bb3aede71979367954c5f1db02927 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sat, 18 Jan 2025 00:30:19 +1100 Subject: [PATCH] Bump tcell to fix broken deployment --- go.mod | 2 +- go.sum | 3 ++- vendor/github.com/gdamore/tcell/v2/attr.go | 2 +- vendor/github.com/gdamore/tcell/v2/tscreen.go | 18 +++++++++--------- vendor/modules.txt | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index c7f6f7682..89d6d8fb9 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/aybabtme/humanlog v0.4.1 github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 github.com/creack/pty v1.1.11 - github.com/gdamore/tcell/v2 v2.8.0 + github.com/gdamore/tcell/v2 v2.8.1 github.com/go-errors/errors v1.5.1 github.com/gookit/color v1.4.2 github.com/iancoleman/orderedmap v0.3.0 diff --git a/go.sum b/go.sum index 0a7458a85..76d556961 100644 --- a/go.sum +++ b/go.sum @@ -87,8 +87,9 @@ github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uhw= github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo= -github.com/gdamore/tcell/v2 v2.8.0 h1:IDclow1j6kKpU/gOhjmc+7Pj5Dxnukb74pfKN4Cxrfg= github.com/gdamore/tcell/v2 v2.8.0/go.mod h1:bj8ori1BG3OYMjmb3IklZVWfZUJ1UBQt9JXrOCOhGWw= +github.com/gdamore/tcell/v2 v2.8.1 h1:KPNxyqclpWpWQlPLx6Xui1pMk8S+7+R37h3g07997NU= +github.com/gdamore/tcell/v2 v2.8.1/go.mod h1:bj8ori1BG3OYMjmb3IklZVWfZUJ1UBQt9JXrOCOhGWw= github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/go-errors/errors v1.0.2/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs= diff --git a/vendor/github.com/gdamore/tcell/v2/attr.go b/vendor/github.com/gdamore/tcell/v2/attr.go index 1e7543549..05af5e5d7 100644 --- a/vendor/github.com/gdamore/tcell/v2/attr.go +++ b/vendor/github.com/gdamore/tcell/v2/attr.go @@ -16,7 +16,7 @@ package tcell // AttrMask represents a mask of text attributes, apart from color. // Note that support for attributes may vary widely across terminals. -type AttrMask int +type AttrMask uint // Attributes are not colors, but affect the display of text. They can // be combined, in some cases, but not others. (E.g. you can have Dim Italic, diff --git a/vendor/github.com/gdamore/tcell/v2/tscreen.go b/vendor/github.com/gdamore/tcell/v2/tscreen.go index 7b0f64fdc..962aa9f47 100644 --- a/vendor/github.com/gdamore/tcell/v2/tscreen.go +++ b/vendor/github.com/gdamore/tcell/v2/tscreen.go @@ -387,7 +387,7 @@ func (t *tScreen) prepareUnderlines() { // practice since these were introduced at about the same time. if t.ti.UnderlineColor != "" { t.underColor = t.ti.UnderlineColor - } else if t.ti.CurlyUnderline != "" { + } else if t.curlyUnder != "" { t.underColor = "\x1b[58:5:%p1%dm" } if t.ti.UnderlineColorRGB != "" { @@ -395,14 +395,14 @@ func (t *tScreen) prepareUnderlines() { // using just a single parameter, the Setulc parameter takes // the 24-bit color as an integer rather than separate bytes. // This matches the "new" style direct color approach that - // ncurses took, even though everyone else when another way. + // ncurses took, even though everyone else went another way. t.underRGB = t.ti.UnderlineColorRGB - } else if t.ti.CurlyUnderline != "" { + } else if t.underColor != "" { t.underRGB = "\x1b[58:2::%p1%d:%p2%d:%p3%dm" } if t.ti.UnderlineColorReset != "" { t.underFg = t.ti.UnderlineColorReset - } else if t.ti.CurlyUnderline != "" { + } else if t.curlyUnder != "" { t.underFg = "\x1b[59m" } } @@ -1529,15 +1529,15 @@ func (t *tScreen) parseClipboard(buf *bytes.Buffer, evs *[]Event) (bool, bool) { for _, c := range b { // valid base64 digits - if (state == 0) { + if state == 0 { if (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || (c == '+') || (c == '/') || (c == '=') { continue } - if (c == '\x1b') { + if c == '\x1b' { state = 1 continue } - if (c == '\a') { + if c == '\a' { // matched with BEL instead of ST b = b[:len(b)-1] // drop the trailing BEL decoded := make([]byte, base64.StdEncoding.DecodedLen(len(b))) @@ -1549,8 +1549,8 @@ func (t *tScreen) parseClipboard(buf *bytes.Buffer, evs *[]Event) (bool, bool) { } return false, false } - if (state == 1) { - if (c == '\\') { + if state == 1 { + if c == '\\' { b = b[:len(b)-2] // drop the trailing ST (\x1b\\) // now decode the data decoded := make([]byte, base64.StdEncoding.DecodedLen(len(b))) diff --git a/vendor/modules.txt b/vendor/modules.txt index 221160478..d45aeefd0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -37,7 +37,7 @@ github.com/fatih/color # github.com/gdamore/encoding v1.0.1 ## explicit; go 1.9 github.com/gdamore/encoding -# github.com/gdamore/tcell/v2 v2.8.0 +# github.com/gdamore/tcell/v2 v2.8.1 ## explicit; go 1.12 github.com/gdamore/tcell/v2 github.com/gdamore/tcell/v2/terminfo