highlighters: Use _zsh_highlight_add_highlight

_zsh_highlight_add_highlight appends to region_highlight $1 $2 and the
next non-null parameter. If there is no non-null parameter, do nothing,
This is so that highlighters can add a style with fallbacks if the most
specific style is not defined. If none of the applicable styles are
defined, do the right thing and don't add an invalid entry to
region_highlight.

The pattern highlighter doesn't use this function as it'd need too large
of an API change.
This commit is contained in:
Matthew Martin
2016-04-29 09:48:39 -05:00
parent 089329660b
commit 341a3ae1f0
6 changed files with 25 additions and 9 deletions

View File

@@ -68,7 +68,7 @@ _zsh_highlight_main_highlighter_predicate()
# Helper to deal with tokens crossing line boundaries.
_zsh_highlight_main_add_region_highlight() {
integer start=$1 end=$2
local style=$ZSH_HIGHLIGHT_STYLES[$3]
local style=$3
# The calculation was relative to $PREBUFFER$BUFFER, but region_highlight is
# relative to $BUFFER.
@@ -77,7 +77,7 @@ _zsh_highlight_main_add_region_highlight() {
(( end < 0 )) && return # having end<0 would be a bug
(( start < 0 )) && start=0 # having start<0 is normal with e.g. multiline strings
region_highlight+=("$start $end $style")
_zsh_highlight_add_highlight $start $end $style
}
# Wrapper around 'type -w'.
@@ -126,7 +126,6 @@ _zsh_highlight_main_highlighter()
local -a options_to_set # used in callees
local buf="$PREBUFFER$BUFFER"
integer len="${#buf}"
region_highlight=()
if (( path_dirs_was_set )); then
options_to_set+=( PATH_DIRS )