linux/zsh-syntax-highlighting
1
0
Fork 0
mirror of https://github.com/zsh-users/zsh-syntax-highlighting.git synced 2025-12-11 22:02:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 56b81a9b66 into add6825898

Browse source
This commit is contained in:
m0vie 2016-07-29 19:05:47 +00:00 • committed by GitHub
commit 78ed2f7a66
5 changed files with 41 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

26
zsh-syntax-highlighting.zsh
View file

@ -58,6 +58,14 @@ _zsh_highlight()
# Store the previous command return code to restore it whatever happens.
local ret=$?
# Remove all highlighting in isearch, so that only the underlining done by zsh itself remains.
# For details see FAQ entry 'Why does syntax highlighting not work while searching history?'
# and http://www.zsh.org/mla/users/2016/msg00415.html.
if [[ $WIDGET == zle-isearch-update ]]; then
region_highlight=()
return $ret
fi
setopt localoptions warncreateglobal
setopt localoptions noksharrays
local REPLY # don't leak $REPLY into global scope
@ -250,8 +258,20 @@ _zsh_highlight_bind_widgets()
}
# Override ZLE widgets to make them invoke _zsh_highlight.
local -U widgets_to_bind
widgets_to_bind=(${${(k)widgets}:#(.*|orig-*|run-help|which-command|beep|set-local-history|yank)})
# Always wrap special zle-line-finish widget. This is needed to decide if the
# current line ends and special highlighting logic needs to be applied.
# E.g. remove cursor imprint, don't highlight partial paths, ...
widgets_to_bind+=(zle-line-finish)
# Always wrap special zle-isearch-update widget to be notified of updates in isearch.
# This is needed because we need to disable highlighting in that case.
widgets_to_bind+=(zle-isearch-update)
local cur_widget
for cur_widget in ${${(k)widgets}:#(.*|orig-*|run-help|which-command|beep|set-local-history|yank)}; do
for cur_widget in $widgets_to_bind; do
case $widgets[$cur_widget] in
# Already rebound event: do nothing.
@ -277,6 +297,10 @@ _zsh_highlight_bind_widgets()
builtin) eval "_zsh_highlight_widget_${(q)cur_widget}() { _zsh_highlight_call_widget .${(q)cur_widget} -- \"\$@\" }"
zle -N $cur_widget _zsh_highlight_widget_$cur_widget;;
# Special zle-* hook that is currently not bound at all: Bind to z-sy-h driectly.
'') eval "_zsh_highlight_widget_${(q)cur_widget}() { :; _zsh_highlight }"
zle -N $cur_widget _zsh_highlight_widget_$cur_widget;;
# Default: unhandled case.
*) print -r -- >&2 "zsh-syntax-highlighting: unhandled ZLE widget '$cur_widget'" ;;
esac