diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2014-08-11 17:39:42 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2014-08-11 17:39:42 +0200 |
| commit | 382c26acfc62a56744ab9eb603efc56130764fd3 (patch) | |
| tree | 1b7cb9d3e372481007fc4546e7d06ce5bb1bc104 /Completion/Unix/Command/_npm | |
| parent | 73508e345b4925f33b7f652aba9bd313169e5ac2 (diff) | |
| parent | f8ae47f29b766dc0330b19d7fdb35859d6aab930 (diff) | |
| download | zsh-382c26acfc62a56744ab9eb603efc56130764fd3.tar.gz zsh-382c26acfc62a56744ab9eb603efc56130764fd3.zip | |
New upstream release candidate: Merge branch 'upstream' into debian
Diffstat (limited to 'Completion/Unix/Command/_npm')
| -rw-r--r-- | Completion/Unix/Command/_npm | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/Completion/Unix/Command/_npm b/Completion/Unix/Command/_npm index 24b536188..f5493a321 100644 --- a/Completion/Unix/Command/_npm +++ b/Completion/Unix/Command/_npm @@ -1,19 +1,9 @@ #compdef npm -# Node Package Manager 0.3.15 completion, letting npm do all the completion work +# Node Package Manager completion, letting npm do all the completion work -_npm() { - compadd -- $(_npm_complete $words) -} +if type npm > /dev/null; then + eval "$(npm completion)" -# We want to show all errors of any substance, but never the "npm (not )ok" one. -# (Also doesn't consider "ERR! no match found" worth breaking the terminal for.) -_npm_complete() { - local ask_npm - ask_npm=(npm completion --color false --loglevel error -- $@) - { _call_program npm $ask_npm 2>&1 >&3 \ - | egrep -v '^(npm (not |)ok|ERR! no match found)$' >&2; \ - } 3>&1 -} - -_npm "$@" + _npm_completion "$@" +fi |