zsh-workers
 help / color / mirror / code / Atom feed
* Fix the outdated _npm completion script
@ 2014-02-24  4:02 Hong Xu
  2014-02-24  4:25 ` Hong Xu
  0 siblings, 1 reply; 2+ messages in thread
From: Hong Xu @ 2014-02-24  4:02 UTC (permalink / raw)
  To: zsh-workers

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

Hi,

The existing npm completion script no longer works. The stdout of `npm 
completion` has become a script to add a completion function. Here is 
the patch to update it.

Hong

[-- Attachment #2: _npm.patch --]
[-- Type: text/plain, Size: 861 bytes --]

diff --git a/Completion/Unix/Command/_npm b/Completion/Unix/Command/_npm
index 24b5361..d9d6287 100644
--- a/Completion/Unix/Command/_npm
+++ b/Completion/Unix/Command/_npm
@@ -1,19 +1,7 @@
 #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)
-}
+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 "$@"

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: Fix the outdated _npm completion script
  2014-02-24  4:02 Fix the outdated _npm completion script Hong Xu
@ 2014-02-24  4:25 ` Hong Xu
  0 siblings, 0 replies; 2+ messages in thread
From: Hong Xu @ 2014-02-24  4:25 UTC (permalink / raw)
  To: zsh-workers

[-- Attachment #1: Type: text/plain, Size: 306 bytes --]

On 2/23/14, 8:02 PM, Hong Xu wrote:
> Hi,
>
> The existing npm completion script no longer works. The stdout of `npm
> completion` has become a script to add a completion function. Here is
> the patch to update it.

An update to the patch, handling the case in which the npm command does 
not exist.

Hong

[-- Attachment #2: _npm.patch --]
[-- Type: text/plain, Size: 900 bytes --]

diff --git a/Completion/Unix/Command/_npm b/Completion/Unix/Command/_npm
index 24b5361..f5493a3 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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-02-24  4:25 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-24  4:02 Fix the outdated _npm completion script Hong Xu
2014-02-24  4:25 ` Hong Xu

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).