highlighters: Rename entry points.

This tracks the API change made in the previous commit, as suggested in the
(#if 0'd) deprecation warning.
This commit is contained in:
Daniel Shahaf 2016-07-21 03:33:28 +00:00
parent a3d5dfcbda
commit c793e0dcea
6 changed files with 13 additions and 13 deletions

View File

@ -38,13 +38,13 @@
: ${ZSH_HIGHLIGHT_STYLES[cursor-matchingbracket]:=standout} : ${ZSH_HIGHLIGHT_STYLES[cursor-matchingbracket]:=standout}
# Whether the brackets highlighter should be called or not. # Whether the brackets highlighter should be called or not.
_zsh_highlight_brackets_highlighter_predicate() _zsh_highlight_highlighter_brackets_predicate()
{ {
_zsh_highlight_cursor_moved || _zsh_highlight_buffer_modified _zsh_highlight_cursor_moved || _zsh_highlight_buffer_modified
} }
# Brackets highlighting function. # Brackets highlighting function.
_zsh_highlight_brackets_highlighter() _zsh_highlight_highlighter_brackets_paint()
{ {
local char style local char style
local -i bracket_color_size=${#ZSH_HIGHLIGHT_STYLES[(I)bracket-level-*]} buflen=${#BUFFER} level=0 matchingpos pos local -i bracket_color_size=${#ZSH_HIGHLIGHT_STYLES[(I)bracket-level-*]} buflen=${#BUFFER} level=0 matchingpos pos

View File

@ -32,7 +32,7 @@
: ${ZSH_HIGHLIGHT_STYLES[cursor]:=standout} : ${ZSH_HIGHLIGHT_STYLES[cursor]:=standout}
# Whether the cursor highlighter should be called or not. # Whether the cursor highlighter should be called or not.
_zsh_highlight_cursor_highlighter_predicate() _zsh_highlight_highlighter_cursor_predicate()
{ {
# accept-* may trigger removal of cursor highlighting # accept-* may trigger removal of cursor highlighting
[[ $WIDGET == accept-* ]] || [[ $WIDGET == accept-* ]] ||
@ -40,7 +40,7 @@ _zsh_highlight_cursor_highlighter_predicate()
} }
# Cursor highlighting function. # Cursor highlighting function.
_zsh_highlight_cursor_highlighter() _zsh_highlight_highlighter_cursor_paint()
{ {
[[ $WIDGET == accept-* ]] && return [[ $WIDGET == accept-* ]] && return

View File

@ -32,13 +32,13 @@
: ${ZSH_HIGHLIGHT_STYLES[line]:=} : ${ZSH_HIGHLIGHT_STYLES[line]:=}
# Whether the root highlighter should be called or not. # Whether the root highlighter should be called or not.
_zsh_highlight_line_highlighter_predicate() _zsh_highlight_highlighter_line_predicate()
{ {
_zsh_highlight_buffer_modified _zsh_highlight_buffer_modified
} }
# root highlighting function. # root highlighting function.
_zsh_highlight_line_highlighter() _zsh_highlight_highlighter_line_paint()
{ {
_zsh_highlight_add_highlight 0 $#BUFFER line _zsh_highlight_add_highlight 0 $#BUFFER line
} }

View File

@ -60,7 +60,7 @@
: ${ZSH_HIGHLIGHT_STYLES[comment]:=fg=black,bold} : ${ZSH_HIGHLIGHT_STYLES[comment]:=fg=black,bold}
# Whether the highlighter should be called or not. # Whether the highlighter should be called or not.
_zsh_highlight_main_highlighter_predicate() _zsh_highlight_highlighter_main_predicate()
{ {
# accept-* may trigger removal of path_prefix highlighting # accept-* may trigger removal of path_prefix highlighting
[[ $WIDGET == accept-* ]] || [[ $WIDGET == accept-* ]] ||
@ -150,7 +150,7 @@ _zsh_highlight_main__resolve_alias() {
} }
# Main syntax highlighting function. # Main syntax highlighting function.
_zsh_highlight_main_highlighter() _zsh_highlight_highlighter_main_paint()
{ {
## Before we even 'emulate -L', we must test a few options that would reset. ## Before we even 'emulate -L', we must test a few options that would reset.
if [[ -o interactive_comments ]]; then if [[ -o interactive_comments ]]; then
@ -166,7 +166,7 @@ _zsh_highlight_main_highlighter()
# At the PS3 prompt and in vared, highlight nothing. # At the PS3 prompt and in vared, highlight nothing.
# #
# (We can't check this in _zsh_highlight_main_highlighter_predicate because # (We can't check this in _zsh_highlight_highlighter_main_predicate because
# if the predicate returns false, the previous value of region_highlight # if the predicate returns false, the previous value of region_highlight
# would be reused.) # would be reused.)
if [[ $CONTEXT == (select|vared) ]]; then if [[ $CONTEXT == (select|vared) ]]; then

View File

@ -32,13 +32,13 @@
typeset -gA ZSH_HIGHLIGHT_PATTERNS typeset -gA ZSH_HIGHLIGHT_PATTERNS
# Whether the pattern highlighter should be called or not. # Whether the pattern highlighter should be called or not.
_zsh_highlight_pattern_highlighter_predicate() _zsh_highlight_highlighter_pattern_predicate()
{ {
_zsh_highlight_buffer_modified _zsh_highlight_buffer_modified
} }
# Pattern syntax highlighting function. # Pattern syntax highlighting function.
_zsh_highlight_pattern_highlighter() _zsh_highlight_highlighter_pattern_paint()
{ {
setopt localoptions extendedglob setopt localoptions extendedglob
local pattern local pattern

View File

@ -32,13 +32,13 @@
: ${ZSH_HIGHLIGHT_STYLES[root]:=standout} : ${ZSH_HIGHLIGHT_STYLES[root]:=standout}
# Whether the root highlighter should be called or not. # Whether the root highlighter should be called or not.
_zsh_highlight_root_highlighter_predicate() _zsh_highlight_highlighter_root_predicate()
{ {
_zsh_highlight_buffer_modified _zsh_highlight_buffer_modified
} }
# root highlighting function. # root highlighting function.
_zsh_highlight_root_highlighter() _zsh_highlight_highlighter_root_paint()
{ {
if (( EUID == 0 )) { _zsh_highlight_add_highlight 0 $#BUFFER root } if (( EUID == 0 )) { _zsh_highlight_add_highlight 0 $#BUFFER root }
} }