From e48af357532c24e24666441205cda24968bf93c6 Mon Sep 17 00:00:00 2001
From: Matthew Martin <phy1729@gmail.com>
Date: Thu, 18 Jan 2018 20:10:25 -0600
Subject: [PATCH] main: Only highlight characters special to globbing as
 globbing

---
 highlighters/main/main-highlighter.zsh        |  8 ++--
 highlighters/main/test-data/glob.zsh          |  9 ++--
 .../main/test-data/globs-with-quoting.zsh     | 42 +++++++++++++++++++
 .../main/test-data/number_range-glob.zsh      |  4 +-
 4 files changed, 54 insertions(+), 9 deletions(-)
 create mode 100644 highlighters/main/test-data/globs-with-quoting.zsh

diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
index 4b83f60..5058bc8 100644
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -799,9 +799,8 @@ _zsh_highlight_main_highlighter_check_path()
 # This command will at least highlight start_pos to end_pos with the default style
 _zsh_highlight_main_highlighter_highlight_argument()
 {
-  local base_style=default i path_eligible style
+  local base_style=default i path_eligible=1 style
   local -a highlights reply
-  path_eligible=1
 
   local -a match mbegin mend
   local MATCH; integer MBEGIN MEND
@@ -841,10 +840,9 @@ _zsh_highlight_main_highlighter_highlight_argument()
         fi;;
       *)
         if $highlight_glob && [[ ${arg[$i]} =~ ^[*?] || ${arg:$i-1} =~ ^\<[0-9]*-[0-9]*\> ]]; then
-	  (( i += $#MATCH - 1 ))
-          base_style=globbing
+          highlights+=($(( start_pos + i - 1 )) $(( start_pos + i + $#MATCH - 1)) globbing)
+          (( i += $#MATCH - 1 ))
           path_eligible=0
-          break
         else
           continue
         fi
diff --git a/highlighters/main/test-data/glob.zsh b/highlighters/main/test-data/glob.zsh
index 2fd9c6f..b8b542b 100644
--- a/highlighters/main/test-data/glob.zsh
+++ b/highlighters/main/test-data/glob.zsh
@@ -31,8 +31,11 @@ BUFFER=': foo* bar? *baz qux\?'
 
 expected_region_highlight=(
   "1 1 builtin" # :
-  "3 6 globbing" # foo*
-  "8 11 globbing" # bar?
-  "13 16 globbing" # *baz
+  "3 5 default" # foo
+  "6 6 globbing" # *
+  "8 10 default" # bar
+  "11 11 globbing" # ?
+  "13 13 globbing" # *
+  "14 16 default" # baz
   "18 22 default" # qux\?
 )
diff --git a/highlighters/main/test-data/globs-with-quoting.zsh b/highlighters/main/test-data/globs-with-quoting.zsh
new file mode 100644
index 0000000..b1ef63e
--- /dev/null
+++ b/highlighters/main/test-data/globs-with-quoting.zsh
@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 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=$': "foo"*\'bar\'?"baz?"<17-29>"qu*ux"'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 7 double-quoted-argument' # "foo"
+  '8 8 globbing' # *
+  '9 13 single-quoted-argument' # 'bar'
+  '14 14 globbing' # ?
+  '15 20 double-quoted-argument' # "baz?"
+  '21 27 globbing' # <17-29>
+  '28 34 double-quoted-argument' # "qu*ux"
+)
diff --git a/highlighters/main/test-data/number_range-glob.zsh b/highlighters/main/test-data/number_range-glob.zsh
index 1808492..c13c6b7 100644
--- a/highlighters/main/test-data/number_range-glob.zsh
+++ b/highlighters/main/test-data/number_range-glob.zsh
@@ -33,7 +33,9 @@ BUFFER='print <-> x<->y <foo2-3>'
 expected_region_highlight=(
   '1 5 builtin' # print
   '7 9 globbing' # <->
-  '11 15 globbing' # x<->
+  '11 11 default' # x
+  '12 14 globbing' # <->
+  '15 15 default' # y
   '17 17 redirection' # <
   '18 23 default' # foo2-3 (the filename)
   '24 24 redirection' # >