From 16adec3a5b8f4d86c121fb321d0e0549554de8c0 Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Mon, 27 Apr 2020 21:07:34 +0800 Subject: [PATCH] climc: remove stale zsh completion code --- cmd/climc/promputils/complete_zsh.go | 8 ++++--- cmd/climc/promputils/completescript.go | 30 -------------------------- 2 files changed, 5 insertions(+), 33 deletions(-) diff --git a/cmd/climc/promputils/complete_zsh.go b/cmd/climc/promputils/complete_zsh.go index 6e3c836c8f..517de2a4ff 100644 --- a/cmd/climc/promputils/complete_zsh.go +++ b/cmd/climc/promputils/complete_zsh.go @@ -128,11 +128,13 @@ func zshCompGenFlagEntryExtras(f structarg.Argument) string { // allow options for flag extras := ":" - switch arg := f.(type) { - case *structarg.SingleArgument: + type iChoices interface { + Choices() []string + } + if hasChoices, ok := f.(iChoices); ok { // process choices var words []string - for _, w := range arg.Choices() { + for _, w := range hasChoices.Choices() { words = append(words, fmt.Sprintf("%q", w)) } if len(words) != 0 { diff --git a/cmd/climc/promputils/completescript.go b/cmd/climc/promputils/completescript.go index 3725189b40..e01e0f6f91 100644 --- a/cmd/climc/promputils/completescript.go +++ b/cmd/climc/promputils/completescript.go @@ -75,33 +75,3 @@ _climc(){ do line="${arr[$i]}" allopts[count]=${line%s` - -const ZSH_COMPLETE_SCRIPT_2 = `%"#"*} - subopts[count]=${line#*"#"} - ((count++)) - done - _arguments \ - '1: :->commands'\ - '*: :->options' - - case $state in - commands) - _arguments '1:Comm:(${allopts[*]})' - ;; - *) - item=1 - for key in ${allopts[*]} - do - case $words[2] in - $key) - compadd "$@"` + "`echo $subopts[item]`" + ` - ;; - *) - ;; - esac - ((item++)) - done - esac -} -_climc "$@" -`