zsh-workers/8101

Completion/User/_my_accounts

@@ -10,4 +10,4 @@ else
   accounts_users_hosts=( $my_accounts )
 fi
 
-_user@host "$@"
+_user_at_host "$@"

Completion/User/_other_accounts

@@ -10,4 +10,4 @@ else
   accounts_users_hosts=( $other_accounts )
 fi
 
-_user@host "$@"
+_user_at_host "$@"

Completion/User/_user_at_host

@@ -0,0 +1,15 @@
+#autoload
+
+local expl nm="$compstate[nmatches]"
+
+if [[ -prefix 1 *@ ]]; then
+  local user=${PREFIX/@}
+  compset -P 1 '*@'
+  _description expl "hostnames for $user"
+  _combination accounts_users_hosts users="$user" hosts "$expl[@]" "$@"
+else
+  _description expl "usernames"
+  _combination accounts_users_hosts users -S@ -q "$expl[@]" "$@"
+fi
+
+[[ nm -ne compstate[nmatches] ]]