summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2011-10-10 05:10:03 -0700
committerRobby Russell <robby@planetargon.com>2011-10-10 05:10:03 -0700
commit6cc4389304c02cefe1501e5df18baaae56741447 (patch)
tree5a9b3d44c3ba922e20aee6eae0efa198e2c6ac4f
parent1ab0054dc6ddecdb4d185056efc8468d222eb125 (diff)
parent5aa6b0fae5f1fa82c90003c2020849b4bb87c9e8 (diff)
downloadzsh-6cc4389304c02cefe1501e5df18baaae56741447.tar.gz
zsh-6cc4389304c02cefe1501e5df18baaae56741447.tar.bz2
zsh-6cc4389304c02cefe1501e5df18baaae56741447.zip
Merge pull request #319 from sorin-ionescu/plugin-npm
Replace npm 0.x completion with 1.0 completion.
-rw-r--r--plugins/npm/_npm19
-rw-r--r--plugins/npm/npm.plugin.zsh1
2 files changed, 1 insertions, 19 deletions
diff --git a/plugins/npm/_npm b/plugins/npm/_npm
deleted file mode 100644
index 24b536188..000000000
--- a/plugins/npm/_npm
+++ /dev/null
@@ -1,19 +0,0 @@
-#compdef npm
-
-# Node Package Manager 0.3.15 completion, letting npm do all the completion work
-
-_npm() {
- compadd -- $(_npm_complete $words)
-}
-
-# 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 "$@"
diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
new file mode 100644
index 000000000..c3eb91d31
--- /dev/null
+++ b/plugins/npm/npm.plugin.zsh
@@ -0,0 +1 @@
+eval "$(npm completion 2>/dev/null)"