lib
/
cmd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Release v0.2.3 

- Implemented zsh autocomplete script generation
This commit is contained in:
Evan Fiordeliso 2023-11-13 17:17:29 -05:00
parent 81a1f6d97c b4d610e5fd
commit c5bd7662f2
3 changed files with 59 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
command.go
View File

@ -46,6 +46,10 @@ func (c *Command) Root() *Command {
return c.Parent.Root() return c.Parent.Root()
} }
func (c *Command) IsRoot() bool {
return c.isRoot
}
func (c *Command) CommandPath() string { func (c *Command) CommandPath() string {
if c.Parent == nil { if c.Parent == nil {
return "" return ""

1
completions_bash.go
View File

@ -15,6 +15,7 @@ func WriteBashCompletions(out io.Writer, rootCmd *Command) error {
} }
// TODO: Add --option|--other-option...) to return nothing for options that require a value // TODO: Add --option|--other-option...) to return nothing for options that require a value
// TODO: Add descriptions to completions using https://stackoverflow.com/a/10130007
var bashTpl = template.Must(template.New("bash").Funcs(tplFuncs).Parse(` var bashTpl = template.Must(template.New("bash").Funcs(tplFuncs).Parse(`
{{- $rootCmd := .RootCmd -}} {{- $rootCmd := .RootCmd -}}
{{- $progName := $rootCmd.Name -}} {{- $progName := $rootCmd.Name -}}

58
completions_zsh.go
View File

@ -9,11 +9,61 @@ import (
func WriteZshCompletions(out io.Writer, rootCmd *Command) error { func WriteZshCompletions(out io.Writer, rootCmd *Command) error {
return zshTpl.Execute(out, map[string]any{ return zshTpl.Execute(out, map[string]any{
"rootCmd": rootCmd, "RootCmd": rootCmd,
"globalOpts": opt.Globals(), "GlobalOpts": opt.Globals(),
}) })
} }
var zshTpl = template.Must(template.New("zsh").Parse(` // TODO: Fix indentation and other spacing
var zshTpl = template.Must(template.New("zsh").Funcs(tplFuncs).Parse(`
{{- $rootCmd := .RootCmd -}}
{{- $progName := $rootCmd.Name -}}
{{- $varName := under $rootCmd.Name -}}
{{- define "cmd" }}
{{- $varPrefix := varPrefix .Cmd.CommandPath -}}
{{- if not .Cmd.IsRoot}}
{{ .Cmd.Name }})
{{ end -}}
{{ if gt (len .Cmd.Subcommands) 0 -}}
local -a {{ $varPrefix }}commands
{{ $varPrefix }}commands=(
{{- range .Cmd.Subcommands}}
'{{ .Name }}:{{ .ShortDescription }}'
{{- end }}
)
{{ end }}
{{- if or (gt (len .Cmd.Opts) 0) (gt (len .Cmd.Subcommands) 0) -}}
_arguments
{{- end -}}
{{- range .Cmd.Opts -}}
{{ " " }}\
'-{{ .ShortName }}[{{ .Description }}]'
{{- end }}
{{- if gt (len .Cmd.Subcommands) 0 -}}
{{ " " }}\
'1: :{_describe 'command' {{ $varPrefix }}commands}' \
'*:: :->args'
case $state in
args)
case $words[1] in
{{- range .Cmd.Subcommands }}
{{ template "cmd" (map "Cmd" .) }}
{{- end }}
esac
;;
esac
{{- end }}
{{- if not .Cmd.IsRoot}}
;;
{{ end }}
{{ end -}}
function _{{ $varName }} {
{{ template "cmd" (map "Cmd" .RootCmd) -}}
}
compdef _{{ $varName }} {{ $progName }}
`)) `))