highlight path separators

This commit is based on the work done by
Jorge Israel Peña (blaenk) in #136.

Changes:
* Adjusted to changes on the latest master branch.
* Use regular path highlighter colors by default.
* Break out early if the separator color is the same to
  improve performance.
* Tests.

Author: m0vie

highlighters/main/main-highlighter.zsh

@@ -41,7 +41,9 @@
 : ${ZSH_HIGHLIGHT_STYLES[commandseparator]:=none}
 : ${ZSH_HIGHLIGHT_STYLES[hashed-command]:=fg=green}
 : ${ZSH_HIGHLIGHT_STYLES[path]:=underline}
+: ${ZSH_HIGHLIGHT_STYLES[path_pathseparator]:=${ZSH_HIGHLIGHT_STYLES[path_pathseparator]}}
 : ${ZSH_HIGHLIGHT_STYLES[path_prefix]:=underline}
+: ${ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]:=${ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]}}
 : ${ZSH_HIGHLIGHT_STYLES[globbing]:=fg=blue}
 : ${ZSH_HIGHLIGHT_STYLES[history-expansion]:=fg=blue}
 : ${ZSH_HIGHLIGHT_STYLES[single-hyphen-option]:=none}
@@ -215,6 +217,7 @@ _zsh_highlight_main_highlighter()
     # which add the entry early so escape sequences within the string override
     # the string's color.
     integer already_added=0
+    integer path_found=0
     local style_override=""
     if [[ $this_word == *':start:'* ]]; then
       in_array_assignment=false
@@ -379,6 +382,7 @@ _zsh_highlight_main_highlighter()
                         else
                           if _zsh_highlight_main_highlighter_check_path; then
                             style=path
+                            path_found=1
                           else
                             style=unknown-token
                           fi
@@ -427,6 +431,7 @@ _zsh_highlight_main_highlighter()
                  else
                    if _zsh_highlight_main_highlighter_check_path; then
                      style=path
+                     path_found=1
                    else
                      style=default
                    fi
@@ -436,7 +441,10 @@ _zsh_highlight_main_highlighter()
     fi
     # if a style_override was set (eg in _zsh_highlight_main_highlighter_check_path), use it
     [[ -n $style_override ]] && style=$style_override
-    (( already_added )) || _zsh_highlight_main_add_region_highlight $start_pos $end_pos $style
+    if ! (( already_added )); then
+      _zsh_highlight_main_add_region_highlight $start_pos $end_pos $style
+     (( path_found )) && _zsh_highlight_main_highlighter_highlight_path_separators
+    fi
     if [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR:#"$arg"} ]]; then
       next_word=':start:'
       highlight_glob=true
@@ -465,6 +473,18 @@ _zsh_highlight_main_highlighter_check_assign()
     [[ $arg == [[:alpha:]_][[:alnum:]_]#(|\[*\])(|[+])=* ]]
 }
 
+_zsh_highlight_main_highlighter_highlight_path_separators()
+{
+  local pos style_pathsep
+  style_pathsep=${style_override:-path}_pathseparator
+  [[ -z "$style_pathsep" || "$style" == "$style_pathsep" ]] && return 0
+  for (( pos = start_pos; $pos <= end_pos; pos++ )) ; do
+    if [[ $BUFFER[pos+1] == / ]]; then
+      _zsh_highlight_main_add_region_highlight $pos $((pos + 1)) $style_pathsep
+    fi
+  done
+}
+
 # Check if $arg is a path.
 _zsh_highlight_main_highlighter_check_path()
 {

highlighters/main/test-data/path.zsh

@@ -27,11 +27,15 @@
 # vim: ft=zsh sw=2 ts=2 et
 # -------------------------------------------------------------------------------------------------
 
+ZSH_HIGHLIGHT_STYLES[path]=$unused_highlight
+ZSH_HIGHLIGHT_STYLES[path_pathseparator]=$unused_highlight2
 mkdir A
 touch A/mu
 BUFFER='ls A/mu'
 
 expected_region_highlight=(
-  "1 2 command" # ls
-  "4 7 path"     # A/mu
+  "1 2 command"                # ls
+  "4 4 path"                   # A
+  "5 5 path_pathseparator"     # /
+  "6 7 path"                   # mu
 )

highlighters/main/test-data/path_prefix.zsh

@@ -31,8 +31,12 @@
 # Related to path_prefix2.zsh
 
 ZSH_HIGHLIGHT_STYLES[path_prefix]=$unused_highlight
+ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]=$unused_highlight2
 BUFFER='ls /bin/s'
 
 expected_region_highlight=(
-  "4 9 path_prefix"    # /bin/s
+  "4 4 path_prefix_pathseparator"    # /
+  "5 7 path_prefix"                  # bin
+  "8 8 path_prefix_pathseparator"    # /
+  "9 9 path_prefix"                  # s
 )

tests/test-highlighting.zsh

@@ -53,11 +53,18 @@
 # Activate the highlighter.
 ZSH_HIGHLIGHT_HIGHLIGHTERS=($1)
 
+# Set path separator styles to their respective non-separator values by default.
+# Otherwise all tests using paths would need to be unnecessarily verbose.
+# Tests that actually test the separator handling should set these to something else first.
+ZSH_HIGHLIGHT_STYLES[path_pathseparator]=$ZSH_HIGHLIGHT_STYLES[path]
+ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]=$ZSH_HIGHLIGHT_STYLES[path_prefix]
+
 # Runs a highlighting test
 # $1: data file
 run_test_internal() {
   local -a highlight_zone
   local unused_highlight='bg=red,underline' # a style unused by anything else, for tests to use
+  local unused_highlight2='bg=red,standout' # a style unused by anything else, for tests to use
 
   local tests_tempdir="$1"; shift
   local srcdir="$PWD"

tests/test-perfs.zsh

@@ -58,6 +58,7 @@ ZSH_HIGHLIGHT_HIGHLIGHTERS=($1)
 run_test_internal() {
   local -a highlight_zone
   local unused_highlight='bg=red,underline' # a style unused by anything else, for tests to use
+  local unused_highlight2='bg=red,standout' # a style unused by anything else, for tests to use
 
   local tests_tempdir="$1"; shift
   local srcdir="$PWD"