diff --git a/cmd/shell/shell.go b/cmd/shell/shell.go index 02a752c..ceb1e92 100644 --- a/cmd/shell/shell.go +++ b/cmd/shell/shell.go @@ -8,9 +8,9 @@ import ( "strings" "time" + "github.com/carapace-sh/carapace" "github.com/jippi/dottie/pkg/tui" "github.com/reeflective/console" - "github.com/rsteube/carapace" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/go.mod b/go.mod index 8decb5b..abb5a5e 100644 --- a/go.mod +++ b/go.mod @@ -14,6 +14,7 @@ replace github.com/reeflective/console => github.com/jippi/go-console v0.0.0-202 require ( github.com/Masterminds/sprig/v3 v3.2.3 github.com/caarlos0/go-version v0.1.1 + github.com/carapace-sh/carapace v1.1.5 github.com/charmbracelet/huh v0.5.2 github.com/charmbracelet/lipgloss v0.12.1 github.com/davecgh/go-spew v1.1.1 @@ -27,7 +28,6 @@ require ( github.com/neilotoole/slogt v1.1.0 github.com/reeflective/console v0.1.18 github.com/reugn/pkgslog v0.2.0 - github.com/rsteube/carapace v0.50.2 github.com/samber/slog-multi v1.2.0 github.com/sebdah/goldie/v2 v2.5.5 github.com/spf13/cobra v1.8.1 @@ -52,6 +52,7 @@ require ( github.com/aws/aws-sdk-go v1.44.122 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect + github.com/carapace-sh/carapace-shlex v1.0.1 // indirect github.com/catppuccin/go v0.2.0 // indirect github.com/charmbracelet/bubbles v0.18.0 // indirect github.com/charmbracelet/bubbletea v0.26.6 // indirect @@ -97,7 +98,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/reeflective/readline v1.0.13 // indirect github.com/rivo/uniseg v0.4.7 // indirect - github.com/rsteube/carapace-shlex v0.1.2 // indirect + github.com/rsteube/carapace v0.46.3-0.20231214181515-27e49f3c3b69 // indirect + github.com/rsteube/carapace-shlex v0.1.1 // indirect github.com/samber/lo v1.38.1 // indirect github.com/sergi/go-diff v1.3.1 // indirect github.com/shopspring/decimal v1.2.0 // indirect diff --git a/go.sum b/go.sum index 83d4f00..1025c56 100644 --- a/go.sum +++ b/go.sum @@ -205,6 +205,10 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1U github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= github.com/caarlos0/go-version v0.1.1 h1:1bikKHkGGVIIxqCmufhSSs3hpBScgHGacrvsi8FuIfc= github.com/caarlos0/go-version v0.1.1/go.mod h1:Ze5Qx4TsBBi5FyrSKVg1Ibc44KGV/llAaKGp86oTwZ0= +github.com/carapace-sh/carapace v1.1.5 h1:nacO1H9k8towi/PZDv/kbEi5Rn6+xC8gdjidax2ccqk= +github.com/carapace-sh/carapace v1.1.5/go.mod h1:djegtVDi/3duSAqZNU+/nCq7XtDRMRZUb5bW0O/HnEs= +github.com/carapace-sh/carapace-shlex v1.0.1 h1:ww0JCgWpOVuqWG7k3724pJ18Lq8gh5pHQs9j3ojUs1c= +github.com/carapace-sh/carapace-shlex v1.0.1/go.mod h1:lJ4ZsdxytE0wHJ8Ta9S7Qq0XpjgjU0mdfCqiI2FHx7M= github.com/catppuccin/go v0.2.0 h1:ktBeIrIP42b/8FGiScP9sgrWOss3lw0Z5SktRoithGA= github.com/catppuccin/go v0.2.0/go.mod h1:8IHJuMGaUUjQM82qBrGNBv7LFq6JI3NnQCF6MOlZjpc= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -482,10 +486,10 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/rsteube/carapace v0.50.2 h1:9nPOBmIKPySFQvtBRGghFafRCR09Cf9K4/BEo1M+VFE= -github.com/rsteube/carapace v0.50.2/go.mod h1:syVOvI8e2rEEK/9aMZxfWuHvcnQK/EcnTV4roClEnLE= -github.com/rsteube/carapace-shlex v0.1.2 h1:ZKjhIfXoCkEnzensMglTaLbkNOaLkmM8SCRshpJKx6s= -github.com/rsteube/carapace-shlex v0.1.2/go.mod h1:zPw1dOFwvLPKStUy9g2BYKanI6bsQMATzDMYQQybo3o= +github.com/rsteube/carapace v0.46.3-0.20231214181515-27e49f3c3b69 h1:ctOUuKn5PO6VtwtaS7unNrm6u20YXESPtnKEie/u304= +github.com/rsteube/carapace v0.46.3-0.20231214181515-27e49f3c3b69/go.mod h1:4ZC5bulItu9t9sZ5yPcHgPREd8rPf274Q732n+wfl/o= +github.com/rsteube/carapace-shlex v0.1.1 h1:fRQEBBKyYKm4TXUabm4tzH904iFWSmXJl3UZhMfQNYU= +github.com/rsteube/carapace-shlex v0.1.1/go.mod h1:zPw1dOFwvLPKStUy9g2BYKanI6bsQMATzDMYQQybo3o= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM= github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=