From 8abcb1d015c656630bb7e369040fe7ac1715b3e8 Mon Sep 17 00:00:00 2001 From: rsteube Date: Wed, 13 Dec 2023 14:03:50 +0100 Subject: [PATCH] updated carapace-bridge --- cmd/carapace-generate/gen.go | 58 +++++++++++++++++++----------------- go.mod | 2 +- go.sum | 7 ++--- 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/cmd/carapace-generate/gen.go b/cmd/carapace-generate/gen.go index 1ecd5fb23d..abee1ae16a 100644 --- a/cmd/carapace-generate/gen.go +++ b/cmd/carapace-generate/gen.go @@ -177,36 +177,38 @@ func macros() { `bridge "github.com/rsteube/carapace-bridge/pkg/actions/bridge"`: true, } macros := []string{ - `"bridge.Argcomplete": spec.MacroV(bridge.ActionArgcomplete).NoFlag(),`, - `"bridge.Bash": spec.MacroV(bridge.ActionBash).NoFlag(),`, - `"bridge.Carapace": spec.MacroV(bridge.ActionCarapace).NoFlag(),`, - `"bridge.CarapaceBin": spec.MacroV(bridge.ActionCarapaceBin).NoFlag(),`, - `"bridge.Clap": spec.MacroV(bridge.ActionClap).NoFlag(),`, - `"bridge.Click": spec.MacroV(bridge.ActionClick).NoFlag(),`, - `"bridge.Cobra": spec.MacroV(bridge.ActionCobra).NoFlag(),`, - `"bridge.Complete": spec.MacroV(bridge.ActionComplete).NoFlag(),`, - `"bridge.Fish": spec.MacroV(bridge.ActionFish).NoFlag(),`, - `"bridge.Kingpin": spec.MacroV(bridge.ActionKingpin).NoFlag(),`, - `"bridge.Powershell": spec.MacroV(bridge.ActionPowershell).NoFlag(),`, - `"bridge.Urfavecli": spec.MacroV(bridge.ActionUrfavecli).NoFlag(),`, - `"bridge.Yargs": spec.MacroV(bridge.ActionYargs).NoFlag(),`, - `"bridge.Zsh": spec.MacroV(bridge.ActionZsh).NoFlag(),`, + `"bridge.Argcomplete": spec.MacroV(bridge.ActionArgcomplete).NoFlag(),`, + `"bridge.Bash": spec.MacroV(bridge.ActionBash).NoFlag(),`, + `"bridge.Carapace": spec.MacroV(bridge.ActionCarapace).NoFlag(),`, + `"bridge.CarapaceBin": spec.MacroV(bridge.ActionCarapaceBin).NoFlag(),`, + `"bridge.Clap": spec.MacroV(bridge.ActionClap).NoFlag(),`, + `"bridge.Click": spec.MacroV(bridge.ActionClick).NoFlag(),`, + `"bridge.Cobra": spec.MacroV(bridge.ActionCobra).NoFlag(),`, + `"bridge.Complete": spec.MacroV(bridge.ActionComplete).NoFlag(),`, + `"bridge.Fish": spec.MacroV(bridge.ActionFish).NoFlag(),`, + `"bridge.Inshellisense": spec.MacroV(bridge.ActionInshellisense).NoFlag(),`, + `"bridge.Kingpin": spec.MacroV(bridge.ActionKingpin).NoFlag(),`, + `"bridge.Powershell": spec.MacroV(bridge.ActionPowershell).NoFlag(),`, + `"bridge.Urfavecli": spec.MacroV(bridge.ActionUrfavecli).NoFlag(),`, + `"bridge.Yargs": spec.MacroV(bridge.ActionYargs).NoFlag(),`, + `"bridge.Zsh": spec.MacroV(bridge.ActionZsh).NoFlag(),`, } descriptions := map[string]string{ - "bridge.Argcomplete": "bridges https://github.com/kislyuk/argcomplete", - "bridge.Bash": "bridges https://www.gnu.org/software/bash/", - "bridge.Carapace": "bridges https://github.com/rsteube/carapace", - "bridge.CarapaceBin": "bridges https://github.com/rsteube/carapace-bin", - "bridge.Clap": "bridges https://github.com/clap-rs/clap", - "bridge.Click": "bridges https://github.com/pallets/click", - "bridge.Cobra": "bridges https://github.com/spf13/cobra", - "bridge.Complete": "bridges https://github.com/posener/complete", - "bridge.Fish": "bridges https://fishshell.com/", - "bridge.Kingpin": "bridges https://github.com/alecthomas/kingpin", - "bridge.Powershell": "bridges https://microsoft.com/powershell", - "bridge.Urfavecli": "bridges https://github.com/urfave/cli", - "bridge.Yargs": "bridges https://github.com/yargs/yargs", - "bridge.Zsh": "bridges https://www.zsh.org/", + "bridge.Argcomplete": "bridges https://github.com/kislyuk/argcomplete", + "bridge.Bash": "bridges https://www.gnu.org/software/bash/", + "bridge.Carapace": "bridges https://github.com/rsteube/carapace", + "bridge.CarapaceBin": "bridges https://github.com/rsteube/carapace-bin", + "bridge.Clap": "bridges https://github.com/clap-rs/clap", + "bridge.Click": "bridges https://github.com/pallets/click", + "bridge.Cobra": "bridges https://github.com/spf13/cobra", + "bridge.Complete": "bridges https://github.com/posener/complete", + "bridge.Fish": "bridges https://fishshell.com/", + "bridge.Inshellisense": "bridges https://github.com/microsoft/inshellisense", + "bridge.Kingpin": "bridges https://github.com/alecthomas/kingpin", + "bridge.Powershell": "bridges https://microsoft.com/powershell", + "bridge.Urfavecli": "bridges https://github.com/urfave/cli", + "bridge.Yargs": "bridges https://github.com/yargs/yargs", + "bridge.Zsh": "bridges https://www.zsh.org/", } r := regexp.MustCompile(`^func Action(?P[^(]+)\((?P[^(]*)\) carapace.Action {$`) diff --git a/go.mod b/go.mod index 031098c875..a691ee485a 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( github.com/pelletier/go-toml v1.9.5 github.com/rsteube/carapace v0.46.2 - github.com/rsteube/carapace-bridge v0.1.4 + github.com/rsteube/carapace-bridge v0.1.5 github.com/rsteube/carapace-shlex v0.1.1 github.com/rsteube/carapace-spec v0.11.1 github.com/spf13/cobra v1.8.0 diff --git a/go.sum b/go.sum index 545654a160..e3eca29057 100644 --- a/go.sum +++ b/go.sum @@ -2,7 +2,6 @@ github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPn github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg= github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -17,11 +16,10 @@ github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3v github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rsteube/carapace v0.40.2/go.mod h1:jkLt41Ne2TD2xPuMdX/2O05Smhy8vMgG7O2TYvC0yOc= github.com/rsteube/carapace v0.46.2 h1:/LbHEauqSFdANHBRp9XQ4tgTyUjoSKdWtLkPspGdwIY= github.com/rsteube/carapace v0.46.2/go.mod h1:4ZC5bulItu9t9sZ5yPcHgPREd8rPf274Q732n+wfl/o= -github.com/rsteube/carapace-bridge v0.1.4 h1:3ZgsUlGCg5JGQTb8Kec54gn+wgVWyWej8nincgPR+gM= -github.com/rsteube/carapace-bridge v0.1.4/go.mod h1:zPzdZTsLOb/adovJgEUUH+STcslqoRmvXx1vjIVOmz8= +github.com/rsteube/carapace-bridge v0.1.5 h1:7gpvNL5Ci8WieuFo6hLbaRfoBUtqJyn0B9np+oyQrh0= +github.com/rsteube/carapace-bridge v0.1.5/go.mod h1:dvBtSiddmt27551UCS8p7+tWjGgDXDWY1cvZrrA3tPQ= github.com/rsteube/carapace-pflag v0.2.0 h1:EYqFO9Haib3NDCPqKu0VxOGi9YQBkXk1IzlHdT0M0vw= github.com/rsteube/carapace-pflag v0.2.0/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/rsteube/carapace-shlex v0.1.1 h1:fRQEBBKyYKm4TXUabm4tzH904iFWSmXJl3UZhMfQNYU= @@ -29,7 +27,6 @@ github.com/rsteube/carapace-shlex v0.1.1/go.mod h1:zPw1dOFwvLPKStUy9g2BYKanI6bsQ github.com/rsteube/carapace-spec v0.11.1 h1:LUNFbGOucWj4C74JMLvPuqKDFNGFGMHunWyiUfTM0BU= github.com/rsteube/carapace-spec v0.11.1/go.mod h1:1rjCeoupGdnfPaMMfYr7PQDDHk8G8HeL9sSdyHO5UHU= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=