From ff6681ccd4ae3436af94f3d0175bbad044f42bdb Mon Sep 17 00:00:00 2001
From: m0viefreak <m0viefreak.cm@googlemail.com>
Date: Wed, 24 Aug 2016 23:28:04 +0200
Subject: [PATCH] 'main': Work around type -w bug in zsh

Even if 'type -w' returns 'none', it still hashes it in $commands:
http://www.zsh.org/mla/workers/2016/msg01583.html

Before 12b879caf7a6f96921d1c03ab9b839a7f6c8eb1e, we ran 'type -w'
in a subshell, so this bug did not manifest. Now that we don't,
the $commands array is poisoned with invalid entries.

To prevent this, while still keeping the perfomance benefit of
avoiding the subshell, we make sure we remove invalid entries
from $commands again.
---
 highlighters/main/main-highlighter.zsh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
index b120bf2..33c603a 100644
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -101,7 +101,13 @@ _zsh_highlight_main__type() {
   fi
   unset REPLY
   if zmodload -e zsh/parameter; then
-    if (( $+aliases[(e)$1] )); then
+    if ! builtin type -w -- $1 >/dev/null 2>&1; then
+      REPLY=none
+      # work around zsh bug: even if type -w encounters an invalid command,
+      # it hashes it anyways. http://www.zsh.org/mla/workers/2016/msg01583.html
+      # we force an unhash here to keep the hash tables clean.
+      (( $+commands[(e)$1] )) && unhash $1
+    elif (( $+aliases[(e)$1] )); then
       REPLY=alias
     elif (( $+saliases[(e)${1##*.}] )); then
       REPLY='suffix alias'
@@ -113,8 +119,6 @@ _zsh_highlight_main__type() {
       REPLY=builtin
     elif (( $+commands[(e)$1] )); then
       REPLY=command
-    elif ! builtin type -w -- $1 >/dev/null 2>&1; then
-      REPLY=none
     fi
   fi
   if ! (( $+REPLY )); then