diff --git a/go.mod b/go.mod index 5f60790..048279b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module go.step.sm/cli-utils -go 1.21 +go 1.22 require ( github.com/chzyer/readline v1.5.1 @@ -11,7 +11,7 @@ require ( github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262 github.com/stretchr/testify v1.9.0 github.com/urfave/cli v1.22.15 - go.step.sm/crypto v0.51.1 + go.step.sm/crypto v0.51.2 golang.org/x/net v0.28.0 golang.org/x/sys v0.24.0 ) diff --git a/go.sum b/go.sum index d97c23e..5da5c2d 100644 --- a/go.sum +++ b/go.sum @@ -60,8 +60,8 @@ github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8 github.com/urfave/cli v1.22.15 h1:nuqt+pdC/KqswQKhETJjo7pvn/k4xMUxgW6liI7XpnM= github.com/urfave/cli v1.22.15/go.mod h1:wSan1hmo5zeyLGBjRJbzRTNk8gwoYa2B9n4q9dmRIc0= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.step.sm/crypto v0.51.1 h1:ktUg/2hetEMiBAqgz502ktZDGoDoGrcHFg3XpkmkvvA= -go.step.sm/crypto v0.51.1/go.mod h1:PdrhttNU/tG9/YsVd4fdlysBN+UV503p0o2irFZQlAw= +go.step.sm/crypto v0.51.2 h1:5EiCGIMg7IvQTGmJrwRosbXeprtT80OhoS/PJarg60o= +go.step.sm/crypto v0.51.2/go.mod h1:QK7czLjN2k+uqVp5CHXxJbhc70kVRSP+0CQF3zsR5M0= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= diff --git a/usage/renderer.go b/usage/renderer.go index acc9766..eff2743 100644 --- a/usage/renderer.go +++ b/usage/renderer.go @@ -11,6 +11,7 @@ import ( "unicode" "github.com/mgutz/ansi" + md "go.step.sm/cli-utils/pkg/blackfriday" ) @@ -191,36 +192,36 @@ func (r *Renderer) RenderNode(w io.Writer, node *md.Node, entering bool) md.Walk r.write(node.Literal) } else { s := strings.ReplaceAll(string(node.Literal), "\n", "\n"+strings.Repeat(" ", r.depth)) - r.printf(s) + r.printf(s) //nolint:govet // allow non-constant } case md.Heading: if entering { - r.printf(ansi.ColorCode("default+bh")) + r.printf(ansi.ColorCode("default+bh")) //nolint:govet // allow non-constant } else { r.printf(ansi.Reset) r.printf("\n") } case md.Link: if entering { - r.printf(ansi.ColorCode("default+b")) + r.printf(ansi.ColorCode("default+b")) //nolint:govet // allow non-constant //r.printf("\033[2m") // Dim } else { r.printf(ansi.Reset) } case md.Strong: if entering { - r.printf(ansi.ColorCode("default+bh")) + r.printf(ansi.ColorCode("default+bh")) //nolint:govet // allow non-constant } else { r.printf(ansi.Reset) } case md.Emph: if entering { - r.printf(ansi.ColorCode("default+u")) + r.printf(ansi.ColorCode("default+u")) //nolint:govet // allow non-constant } else { r.printf(ansi.Reset) } case md.Code: - r.printf(ansi.ColorCode("default+u")) + r.printf(ansi.ColorCode("default+u")) //nolint:govet // allow non-constant r.write(node.Literal) r.printf(ansi.Reset) case md.List: @@ -331,7 +332,7 @@ func (r *Renderer) RenderNode(w io.Writer, node *md.Node, entering bool) md.Walk for i := 0; i < len(parts); i++ { parts[i] = "\xff" + ansi.ColorCode("default+bh") + "\xff" + parts[i] + "\xff" + ansi.Reset + "\xff" } - r.printf(strings.Join(parts, "\t") + "\t\n") + r.printf(strings.Join(parts, "\t") + "\t\n") //nolint:govet // allow non-constant } } case md.TableRow: