fix: use old auto-completion for 0.9.x compat
See toolshed/organising#644 Partial revert of 1f8662cd9518c3d1e14d058f2a88d438b59170b2
This commit is contained in:
parent
1f9b863be0
commit
b313b0a145
22
scripts/autocomplete/bash
Executable file → Normal file
22
scripts/autocomplete/bash
Executable file → Normal file
@ -2,31 +2,17 @@
|
|||||||
|
|
||||||
: ${PROG:=$(basename ${BASH_SOURCE})}
|
: ${PROG:=$(basename ${BASH_SOURCE})}
|
||||||
|
|
||||||
# Macs have bash3 for which the bash-completion package doesn't include
|
|
||||||
# _init_completion. This is a minimal version of that function.
|
|
||||||
_cli_init_completion() {
|
|
||||||
COMPREPLY=()
|
|
||||||
_get_comp_words_by_ref "$@" cur prev words cword
|
|
||||||
}
|
|
||||||
|
|
||||||
_cli_bash_autocomplete() {
|
_cli_bash_autocomplete() {
|
||||||
if [[ "${COMP_WORDS[0]}" != "source" ]]; then
|
if [[ "${COMP_WORDS[0]}" != "source" ]]; then
|
||||||
local cur opts base words
|
local cur opts base
|
||||||
COMPREPLY=()
|
COMPREPLY=()
|
||||||
cur="${COMP_WORDS[COMP_CWORD]}"
|
cur="${COMP_WORDS[COMP_CWORD]}"
|
||||||
if declare -F _init_completion >/dev/null 2>&1; then
|
|
||||||
_init_completion -n "=:" || return
|
|
||||||
else
|
|
||||||
_cli_init_completion -n "=:" || return
|
|
||||||
fi
|
|
||||||
words=("${words[@]:0:$cword}")
|
|
||||||
if [[ "$cur" == "-"* ]]; then
|
if [[ "$cur" == "-"* ]]; then
|
||||||
requestComp="${words[*]} ${cur} --generate-shell-completion"
|
opts=$( ${COMP_WORDS[@]:0:$COMP_CWORD} ${cur} --generate-bash-completion )
|
||||||
else
|
else
|
||||||
requestComp="${words[*]} --generate-shell-completion"
|
opts=$( ${COMP_WORDS[@]:0:$COMP_CWORD} --generate-bash-completion )
|
||||||
fi
|
fi
|
||||||
opts=$(eval "${requestComp}" 2>/dev/null)
|
COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
|
||||||
COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
|
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
function complete_abra_args
|
function complete_abra_args
|
||||||
set -l cmd (commandline -poc) --generate-shell-completion
|
set -l cmd (commandline -poc) --generate-bash-completion
|
||||||
$cmd
|
$cmd
|
||||||
end
|
end
|
||||||
complete -c abra -f -n "not __fish_seen_subcommand_from -h --help -v --version complete_abra_args" -a "(complete_abra_args)"
|
complete -c abra -f -n "not __fish_seen_subcommand_from -h --help -v --version complete_abra_args" -a "(complete_abra_args)"
|
||||||
|
@ -2,7 +2,7 @@ $fn = $($MyInvocation.MyCommand.Name)
|
|||||||
$name = $fn -replace "(.*)\.ps1$", '$1'
|
$name = $fn -replace "(.*)\.ps1$", '$1'
|
||||||
Register-ArgumentCompleter -Native -CommandName $name -ScriptBlock {
|
Register-ArgumentCompleter -Native -CommandName $name -ScriptBlock {
|
||||||
param($commandName, $wordToComplete, $cursorPosition)
|
param($commandName, $wordToComplete, $cursorPosition)
|
||||||
$other = "$wordToComplete --generate-shell-completion"
|
$other = "$wordToComplete --generate-bash-completion"
|
||||||
Invoke-Expression $other | ForEach-Object {
|
Invoke-Expression $other | ForEach-Object {
|
||||||
[System.Management.Automation.CompletionResult]::new($_, $_, 'ParameterValue', $_)
|
[System.Management.Automation.CompletionResult]::new($_, $_, 'ParameterValue', $_)
|
||||||
}
|
}
|
||||||
|
@ -1,26 +1,23 @@
|
|||||||
#compdef abra
|
#compdef $PROG
|
||||||
compdef _abra abra
|
|
||||||
|
|
||||||
# https://github.com/urfave/cli/blob/main/autocomplete/zsh_autocomplete
|
_cli_zsh_autocomplete() {
|
||||||
|
|
||||||
_abra() {
|
local -a opts
|
||||||
local -a opts
|
local cur
|
||||||
local cur
|
cur=${words[-1]}
|
||||||
cur=${words[-1]}
|
if [[ "$cur" == "-"* ]]; then
|
||||||
if [[ "$cur" == "-"* ]]; then
|
opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} ${cur} --generate-bash-completion)}")
|
||||||
opts=("${(@f)$(${words[@]:0:#words[@]-1} ${cur} --generate-shell-completion)}")
|
else
|
||||||
else
|
opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} --generate-bash-completion)}")
|
||||||
opts=("${(@f)$(${words[@]:0:#words[@]-1} --generate-shell-completion)}")
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "${opts[1]}" != "" ]]; then
|
if [[ "${opts[1]}" != "" ]]; then
|
||||||
_describe 'values' opts
|
_describe 'values' opts
|
||||||
else
|
else
|
||||||
_files
|
_files
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
# don't run the completion function when being source-ed or eval-ed
|
compdef _cli_zsh_autocomplete $PROG
|
||||||
if [ "$funcstack[1]" = "_abra" ]; then
|
|
||||||
_abra
|
|
||||||
fi
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user