diff --git a/go.mod b/go.mod index 1d19ed8..ba5eb6d 100644 --- a/go.mod +++ b/go.mod @@ -4,11 +4,11 @@ go 1.21 require ( github.com/alecthomas/chroma v0.10.1-0.20220126230913-d491f1b5c1d2 - github.com/alecthomas/kong v0.8.1 + github.com/alecthomas/kong v0.8.2-0.20240122082144-30e84613fe34 github.com/beevik/etree v1.3.0 - github.com/charmbracelet/huh v0.3.1-0.20240131194652-914f076c9207 - github.com/charmbracelet/lipgloss v0.9.1 - github.com/charmbracelet/log v0.3.1 + github.com/charmbracelet/huh v0.3.1-0.20240201144609-324657336e69 + github.com/charmbracelet/lipgloss v0.9.2-0.20240131031835-92946d34c234 + github.com/charmbracelet/log v0.3.2-0.20240104164151-fd1729ad8eb8 github.com/mattn/go-isatty v0.0.20 ) @@ -37,5 +37,3 @@ require ( golang.org/x/term v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect ) - -replace github.com/charmbracelet/huh => ../huh diff --git a/go.sum b/go.sum index f2bcec2..00e4c7c 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,11 @@ -github.com/alecthomas/assert/v2 v2.1.0 h1:tbredtNcQnoSd3QBhQWI7QZ3XHOVkw1Moklp2ojoH/0= -github.com/alecthomas/assert/v2 v2.1.0/go.mod h1:b/+1DI2Q6NckYi+3mXyH3wFb8qG37K/DuK80n7WefXA= +github.com/alecthomas/assert/v2 v2.5.0 h1:OJKYg53BQx06/bMRBSPDCO49CbCDNiUQXwdoNrt6x5w= +github.com/alecthomas/assert/v2 v2.5.0/go.mod h1:fw5suVxB+wfYJ3291t0hRTqtGzFYdSwstnRQdaQx2DM= github.com/alecthomas/chroma v0.10.1-0.20220126230913-d491f1b5c1d2 h1:Gg09t2u+C08At6TYucNrD3Cbaq97SUHax84BzQwRTgU= github.com/alecthomas/chroma v0.10.1-0.20220126230913-d491f1b5c1d2/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s= -github.com/alecthomas/kong v0.8.1 h1:acZdn3m4lLRobeh3Zi2S2EpnXTd1mOL6U7xVml+vfkY= -github.com/alecthomas/kong v0.8.1/go.mod h1:n1iCIO2xS46oE8ZfYCNDqdR0b0wZNrXAIAqro/2132U= -github.com/alecthomas/repr v0.1.0 h1:ENn2e1+J3k09gyj2shc0dHr/yjaWSHRlrJ4DPMevDqE= -github.com/alecthomas/repr v0.1.0/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8= +github.com/alecthomas/kong v0.8.2-0.20240122082144-30e84613fe34 h1:MZ1jCBGe0gB9Mpj4+GLN1ohMXAKZ2Imuxkg9uV1DFMc= +github.com/alecthomas/kong v0.8.2-0.20240122082144-30e84613fe34/go.mod h1:XIZQXUCiO9Hui46kGEPUfYgYFw+qmG8MKpXQvyVr8OA= +github.com/alecthomas/repr v0.3.0 h1:NeYzUPfjjlqHY4KtzgKJiWd6sVq2eNUPTi34PiFGjY8= +github.com/alecthomas/repr v0.3.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= @@ -18,10 +18,12 @@ github.com/charmbracelet/bubbles v0.17.2-0.20240131162854-364eac96a867 h1:VgxgtJ github.com/charmbracelet/bubbles v0.17.2-0.20240131162854-364eac96a867/go.mod h1:08qhZhtIwzgrtBjAcJnij1t1H0ZRjwHyGsy6AL11PSw= github.com/charmbracelet/bubbletea v0.25.0 h1:bAfwk7jRz7FKFl9RzlIULPkStffg5k6pNt5dywy4TcM= github.com/charmbracelet/bubbletea v0.25.0/go.mod h1:EN3QDR1T5ZdWmdfDzYcqOCAps45+QIJbLOBxmVNWNNg= -github.com/charmbracelet/lipgloss v0.9.1 h1:PNyd3jvaJbg4jRHKWXnCj1akQm4rh8dbEzN1p/u1KWg= -github.com/charmbracelet/lipgloss v0.9.1/go.mod h1:1mPmG4cxScwUQALAAnacHaigiiHB9Pmr+v1VEawJl6I= -github.com/charmbracelet/log v0.3.1 h1:TjuY4OBNbxmHWSwO3tosgqs5I3biyY8sQPny/eCMTYw= -github.com/charmbracelet/log v0.3.1/go.mod h1:OR4E1hutLsax3ZKpXbgUqPtTjQfrh1pG3zwHGWuuq8g= +github.com/charmbracelet/huh v0.3.1-0.20240201144609-324657336e69 h1:AwgT1uPhqHP1D2WsEzDuAXGbPZjzsoWRgPyzo1U70F4= +github.com/charmbracelet/huh v0.3.1-0.20240201144609-324657336e69/go.mod h1:ll3nYmrqcRLde+NKubJp0up1t3R274dlXyR8AKBIrDo= +github.com/charmbracelet/lipgloss v0.9.2-0.20240131031835-92946d34c234 h1:Zhjp9F7of99zx70doxZQUef4CoLktaVg1Jdi0y+7iVI= +github.com/charmbracelet/lipgloss v0.9.2-0.20240131031835-92946d34c234/go.mod h1:1mPmG4cxScwUQALAAnacHaigiiHB9Pmr+v1VEawJl6I= +github.com/charmbracelet/log v0.3.2-0.20240104164151-fd1729ad8eb8 h1:b0ztGgJo6EgjcyfKRST1TPqzfhfqCEfMUVpv5280fhM= +github.com/charmbracelet/log v0.3.2-0.20240104164151-fd1729ad8eb8/go.mod h1:OR4E1hutLsax3ZKpXbgUqPtTjQfrh1pG3zwHGWuuq8g= github.com/charmbracelet/x/exp/strings v0.0.0-20240130180102-bafe6fbaee60 h1:/FTPkYsiq7rXip2GU4gn7NvkXqoiN7Rt8nyuL/MGzQ8= github.com/charmbracelet/x/exp/strings v0.0.0-20240130180102-bafe6fbaee60/go.mod h1:pBhA0ybfXv6hDjQUZ7hk1lVxBiUbupdw5R31yPUViVQ= github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 h1:q2hJAaP1k2wIvVRd/hEHD7lacgqrCPS+k8g1MndzfWY= diff --git a/help.go b/help.go index d6c70aa..8bdffbc 100644 --- a/help.go +++ b/help.go @@ -13,9 +13,9 @@ var highlighter = regexp.MustCompile("{{(.+?)}}") func helpPrinter(options kong.HelpOptions, ctx *kong.Context) error { codeBlockStyle := lipgloss.NewStyle().Background(lipgloss.Color("0")).Padding(1, 0) - programStyle := codeBlockStyle.Copy().Foreground(lipgloss.Color("12")).PaddingLeft(2).MarginLeft(2) + programStyle := codeBlockStyle.Copy().Foreground(lipgloss.Color("12")).PaddingLeft(3).MarginLeft(2) argumentStyle := codeBlockStyle.Copy().Foreground(lipgloss.Color("7")).Padding(1, 1) - flagStyle := codeBlockStyle.Copy().Foreground(lipgloss.Color("244")).PaddingRight(2) + flagStyle := codeBlockStyle.Copy().Foreground(lipgloss.Color("244")).PaddingRight(3) titleStyle := lipgloss.NewStyle().Bold(true).Margin(1, 0, 0, 2).Foreground(lipgloss.Color("#875FFF")) dashStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("240")).MarginLeft(2) keywordStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("1"))