'main': Support more globbing characters

highlighters/main/main-highlighter.zsh

@@ -1325,7 +1325,7 @@ _zsh_highlight_main_highlighter_highlight_argument()
   # This loop is a hot path.  Keep it fast!
   (( --i ))
   while (( ++i <= $#arg )); do
-    i=${arg[(ib.i.)[\\\'\"\`\$\<\>\*\?]]}
+    i=${arg[(ib.i.)[\\\'\"\`\$\<\>\*\?\[\(\^\#]]}
     case "$arg[$i]" in
       "") break;;
       "\\") (( i += 1 )); continue;;
@@ -1402,7 +1402,13 @@ _zsh_highlight_main_highlighter_highlight_argument()
       *)
         if $highlight_glob &&
            [[ $zsyh_user_options[multios] == on || $in_redirection -eq 0 ]] &&
-           [[ ${arg[$i]} =~ ^[*?] || ${arg:$i-1} =~ ^\<[0-9]*-[0-9]*\> ]]; then
+           [[  ${arg[$i]} =~ ^[*?] ||
+               ${arg:$i-1} =~ ^\\[[^\]]+\\] ||
+               ${arg:$i-1} =~ ^\\\([^\)]*\\\). || ${arg:$i-1} =~ ^\\\([^\)]*\\\|[^\)]*\\\)$ ||
+               ${arg:$i-1} =~ ^\<[0-9]*-[0-9]*\> ||
+               $zsyh_user_options[extendedglob] == on && ${arg[$i]} =~ \\\^ ||
+               $zsyh_user_options[extendedglob] == on && ${arg[$i]} =~ \\\#
+           ]]; then
           highlights+=($(( start_pos + i - 1 )) $(( start_pos + i + $#MATCH - 1)) globbing)
           (( i += $#MATCH - 1 ))
           path_eligible=0

highlighters/main/test-data/glob-extended.zsh

@@ -0,0 +1,49 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 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
+# -------------------------------------------------------------------------------------------------
+
+setopt extendedglob
+
+BUFFER=': x~y *~y x# x## x###'
+
+expected_region_highlight=(
+  "1 1 builtin" # :
+  "3 5 default" # x~y
+  "7 9 default" # *~y
+  "7 7 globbing" # *
+# "8 8 globbing" # ~  # ~ should itself be marked as globbing if either a or b in a~b contain globs
+  "11 12 default" # x#
+  "12 12 globbing" # #
+  "14 16 default" # x##
+  "15 15 globbing" # #
+  "16 16 globbing" # #
+  "18 21 default" # x###
+  "19 19 globbing" # #
+  "20 20 globbing" # #
+  "21 21 globbing" # #
+)

highlighters/main/test-data/glob.zsh

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------------------------------
-# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification, are permitted
@@ -27,7 +27,9 @@
 # vim: ft=zsh sw=2 ts=2 et
 # -------------------------------------------------------------------------------------------------
 
-BUFFER=': foo* bar? *baz qux\?'
+unsetopt extendedglob
+
+BUFFER=': foo* bar? *baz qux\? a[0-9] a[0 <5-10> <a-c> (a|b) x#'
 
 expected_region_highlight=(
   "1 1 builtin" # :
@@ -38,4 +40,15 @@ expected_region_highlight=(
   "13 16 default" # *baz
   "13 13 globbing" # *
   "18 22 default" # qux\?
+  "24 29 default" # a[0-9]
+  "25 29 globbing" # a[0-9]
+  "31 33 default" # a[0
+  "35 40 default" # <5-10>
+  "35 40 globbing" # <5-10>
+  "42 42 redirection" # <
+  "43 45 default" # a-c
+  "46 46 redirection" # >
+  "48 52 default" # (a|b)
+  "48 52 globbing" # (a|b)
+  "54 55 default" # x#
 )