Fix

zpm-zsh · Apr 19, 2017 · 01dd83d · 01dd83d
1 parent 1c578fc
commit 01dd83d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/_zpm b/_zpm
@@ -7,6 +7,20 @@ _1st_arguments=(
   'load:Load plugin'
 )
 
+local -a _ZPM_Plugins_core__unused
+for plugin in "$_ZPM_DIR/plugins/"*; do
+ _ZPM_Plugins_core__unused+=$( basename "$plugin")
+done
+
+local -a _ZPM_Plugins_3rdparty__unused
+for plugin in "$_ZPM_PLUGIN_DIR/"*---*; do
+  local unused=$( basename "$plugin")
+ _ZPM_Plugins_3rdparty__unused+=${unused//---/\/}
+done
+
+local -a _ZPM_Plugins_upgradable
+_ZPM_Plugins_upgradable=( ${_ZPM_Plugins_core__unused[@]} ${_ZPM_Plugins_3rdparty__unused[@]})
+
 _arguments \
     '*:: :->subcmds' && return 0
 
@@ -21,7 +35,7 @@ if (( CURRENT > 1 )); then
       _describe -t commands "zpm plugins" _ZPM_Plugins_3rdparty
     ;;
     l|load)
-      _describe -t commands "zpm plugins" _ZPM_Plugins_core
+      _describe -t commands "zpm plugins" _ZPM_Plugins_upgradable
     ;;
   esac
 fi

diff --git a/lib/functions.zsh b/lib/functions.zsh
@@ -22,7 +22,7 @@ function _ZPM-plugin-path() {
   elif [[ $(_ZPM-plugin-type $1) == 'core' ]]; then
     echo "${_ZPM_DIR}/plugins/${1}"
   else
-    echo "${_ZPM_PLUGIN_DIR}/${1//\//--}"
+    echo "${_ZPM_PLUGIN_DIR}/${1//\//---}"
   fi
 }
 

diff --git a/zpm.zsh b/zpm.zsh
@@ -37,3 +37,4 @@ function ZPM-upgrade(){
   _ZPM-upgrade $@
 }
 
+zstyle ':completion:*:(zpm):*' sort false