From d08238fb0f5150bfd0be8201537a2a8ca6dbbdc9 Mon Sep 17 00:00:00 2001
From: Jakob Probst <jakob@probstfamilie.de>
Date: Sat, 16 Nov 2019 13:10:02 +0100
Subject: [PATCH] Fix some comments and messages. Remove (probably) debug
 messages. Improve ZSH_COLORIZE_TOOL recognition.

---
 plugins/colorize/README.md           |  4 ++--
 plugins/colorize/colorize.plugin.zsh | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/plugins/colorize/README.md b/plugins/colorize/README.md
index b6e27fd27..38d17dc76 100644
--- a/plugins/colorize/README.md
+++ b/plugins/colorize/README.md
@@ -14,7 +14,7 @@ plugins=(... colorize)
 
 ### Colorize tool
 
-Colorize supports using either the `pygmentize` tool or the `chroma` tool.  By default colorize uses `pygmentize` unless it's not installed & `chroma` is installed.  However, you can override this with the `ZSH_COLORIZE_TOOL` environment variable:
+Colorize supports `pygmentize` and `chroma` as syntax highlighter. By default colorize uses `pygmentize` unless it's not installed and `chroma` is. This can be overridden by the `ZSH_COLORIZE_TOOL` environment variable:
 
 ```
 ZSH_COLORIZE_TOOL=chroma
@@ -30,7 +30,7 @@ ZSH_COLORIZE_STYLE="colorful"
 
 ## Usage
 
-* `ccat  <file> [files]`: colorize the contents of the file (or files, if more than one are provided). 
+* `ccat <file> [files]`: colorize the contents of the file (or files, if more than one are provided). 
   If no arguments are passed it will colorize the standard input or stdin.
 
 * `cless <file> [files]`: colorize the contents of the file (or files, if more than one are provided) and
diff --git a/plugins/colorize/colorize.plugin.zsh b/plugins/colorize/colorize.plugin.zsh
index 051d2269c..ac826e44b 100644
--- a/plugins/colorize/colorize.plugin.zsh
+++ b/plugins/colorize/colorize.plugin.zsh
@@ -3,11 +3,7 @@ alias ccat='colorize_via_pygmentize'
 alias cless='colorize_via_pygmentize_less'
 
 colorize_via_pygmentize() {
-    
-    if [[ $ZSH_COLORIZE_TOOL != "chroma" && $ZSH_COLORIZE_TOOL != "pygmentize" ]]; then
-        echo "ZSH_COLORIZE_TOOL not recognized.  Options are 'pygmentize' or 'chroma'"
-        return 1
-    fi
+    local available_tools=("chroma" "pygmentize")
 
     if [ -z $ZSH_COLORIZE_TOOL ]; then
         if (( $+commands[pygmentize] )); then
@@ -15,12 +11,18 @@ colorize_via_pygmentize() {
         elif (( $+commands[chroma] )); then
             ZSH_COLORIZE_TOOL="chroma"
         else
-            echo "niether 'Pygments' nor 'chroma' is not installed!"
+            echo "Neither 'pygments' nor 'chroma' is installed!"
             return 1
         fi
     fi
 
-    echo "Tool: $ZSH_COLORIZE_TOOL"
+    if [[ ${available_tools[(Ie)$ZSH_COLORIZE_TOOL]} -eq 0 ]]; then
+        echo "ZSH_COLORIZE_TOOL '$ZSH_COLORIZE_TOOL' not recognized. Available options are 'pygmentize' and 'chroma'."
+        return 1
+    elif (( $+commands[$ZSH_COLORIZE_TOOL] )); then
+        echo "Package '$ZSH_COLORIZE_TOOL' is not installed!"
+        return 1
+    fi
 
     # If the environment variable ZSH_COLORIZE_STYLE
     # is set, use that theme instead. Otherwise,
@@ -35,7 +37,6 @@ colorize_via_pygmentize() {
         fi
     fi
 
-    echo "color style: $ZSH_COLORIZE_STYLE"
     # pygmentize stdin if no arguments passed
     if [ $# -eq 0 ]; then
         if [[ $ZSH_COLORIZE_TOOL == "pygmentize" ]]; then