From 9d9df4fe80c878e460b38b5d8be76926a9e02286 Mon Sep 17 00:00:00 2001
From: Miciah Masters <miciah.masters@gmail.com>
Date: Thu, 23 Apr 2015 20:28:24 -0400
Subject: [PATCH] Highlight comments

---
 highlighters/main/main-highlighter.zsh   | 15 ++++++++++
 highlighters/main/test-data/comments.zsh | 37 ++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100755 highlighters/main/test-data/comments.zsh

diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
index 5b038b4..ed03951 100755
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -53,6 +53,7 @@
 : ${ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]:=fg=cyan}
 : ${ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]:=fg=cyan}
 : ${ZSH_HIGHLIGHT_STYLES[assign]:=none}
+: ${ZSH_HIGHLIGHT_STYLES[comment]:=fg=black,italic,bold}
 
 # Whether the highlighter should be called or not.
 _zsh_highlight_main_highlighter_predicate()
@@ -88,6 +89,14 @@ _zsh_highlight_main_highlighter()
     [[ $start_pos -eq 0 && $arg = 'noglob' ]] && highlight_glob=false
     ((start_pos+=${#BUFFER[$start_pos+1,-1]}-${#${BUFFER[$start_pos+1,-1]##[[:space:]]#}}))
     ((end_pos=$start_pos+${#arg}))
+
+    if _zsh_highlight_main_highlighter_check_comment; then
+      style=$ZSH_HIGHLIGHT_STYLES[comment]
+      end_pos=$#BUFFER
+      region_highlight+=("$start_pos $end_pos $style")
+      break
+    fi
+
     # Parse the sudo command line
     if $sudo; then
       case "$arg" in
@@ -168,6 +177,12 @@ _zsh_highlight_main_highlighter()
   done
 }
 
+# Check if the argument is the beginning of a comment
+_zsh_highlight_main_highlighter_check_comment()
+{
+    [[ $arg == \#* ]]
+}
+
 # Check if the argument is variable assignment
 _zsh_highlight_main_highlighter_check_assign()
 {
diff --git a/highlighters/main/test-data/comments.zsh b/highlighters/main/test-data/comments.zsh
new file mode 100755
index 0000000..cc0fc9c
--- /dev/null
+++ b/highlighters/main/test-data/comments.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo "foo #bar" #baz # quux'
+
+expected_region_highlight=(
+  "1 4 $ZSH_HIGHLIGHT_STYLES[command]" # echo
+  "5 14 $ZSH_HIGHLIGHT_STYLES[double-quoted-argument]" # "foo #bar"
+  "16 27 $ZSH_HIGHLIGHT_STYLES[comment]" # #baz # quux
+)