From decf9cdb3143fde3d2e608c008e61ba9838c0deb Mon Sep 17 00:00:00 2001 From: Gunther Konig Date: Fri, 21 Jun 2013 12:21:25 +0300 Subject: [PATCH 1/2] autocomplete required packages as second argumet --- plugins/composer/composer.plugin.zsh | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh index 2d1557541..37dd282e4 100644 --- a/plugins/composer/composer.plugin.zsh +++ b/plugins/composer/composer.plugin.zsh @@ -10,14 +10,36 @@ _composer_get_command_list () { composer --no-ansi | sed "1,/Available commands/d" | awk '/^ [a-z]+/ { print $1 }' } +_composer_get_required_list () { + composer show -s --no-ansi | sed '1,/requires/d' | awk 'NF > 0 && !/^requires \(dev\)/{ print $1 }' +} + _composer () { + local curcontext="$curcontext" state line + typeset -A opt_args + _arguments \ + '1: :->command'\ + '*: :->args' if [ -f composer.json ]; then - compadd `_composer_get_command_list` + case $state in + command) + compadd `_composer_get_command_list` + ;; + *) + compadd `_composer_get_required_list` + ;; + esac else compadd create-project init search selfupdate show fi } +_composer_required () { + if [ -f composer.json ]; then + compadd `_composer_get_required_list` + fi +} + compdef _composer composer # Aliases From 85c43f8a894b7aa521a68d096e39587855d2d35f Mon Sep 17 00:00:00 2001 From: Gunther Konig Date: Fri, 21 Jun 2013 12:38:17 +0300 Subject: [PATCH 2/2] remove unused function --- plugins/composer/composer.plugin.zsh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh index 37dd282e4..9975aaca4 100644 --- a/plugins/composer/composer.plugin.zsh +++ b/plugins/composer/composer.plugin.zsh @@ -34,12 +34,6 @@ _composer () { fi } -_composer_required () { - if [ -f composer.json ]; then - compadd `_composer_get_required_list` - fi -} - compdef _composer composer # Aliases