Fix compatibility with latest zsh-syntax-highlighting
zsh-syntax-highlighting started using zle-line-pre-redraw hook instead
of the legacy "bind all widgets" if 1) zsh has the memo= feature (added
in version 5.9) and 2) add-zle-hook-widget is available.
Now when zsh-history-substring-search is loaded before
zsh-syntax-highlighting, it causes error:
_zsh_highlight_widget_zle-line-pre-redraw: job table full or recursion limit exceeded
See https://github.com/zsh-users/zsh-syntax-highlighting/pull/749
This commit is contained in:
Jakub Jirutka
parent
563a551165
commit
b4fb93de0e
1 changed files with 112 additions and 38 deletions
|
|
@ -106,6 +106,8 @@ zmodload -F zsh/parameter
|
||||||
# https://github.com/nicoulaj/zsh-syntax-highlighting
|
# https://github.com/nicoulaj/zsh-syntax-highlighting
|
||||||
#
|
#
|
||||||
if [[ $+functions[_zsh_highlight] -eq 0 ]]; then
|
if [[ $+functions[_zsh_highlight] -eq 0 ]]; then
|
||||||
|
autoload -U is-at-least
|
||||||
|
|
||||||
#
|
#
|
||||||
# Dummy implementation of _zsh_highlight() that
|
# Dummy implementation of _zsh_highlight() that
|
||||||
# simply removes any existing highlights when the
|
# simply removes any existing highlights when the
|
||||||
|
|
@ -118,53 +120,125 @@ if [[ $+functions[_zsh_highlight] -eq 0 ]]; then
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
# The following snippet was taken from the zsh-syntax-highlighting project:
|
# Check if $1 denotes the name of a callable function, i.e. it is fully
|
||||||
# https://github.com/zsh-users/zsh-syntax-highlighting/blob/56b134f5d62ae3d4e66c7f52bd0cc2595f9b305b/zsh-syntax-highlighting.zsh#L126-161
|
# defined or it is marked for autoloading and autoloading it at the first
|
||||||
|
# call to it will succeed. In particular, if $1 has been marked for
|
||||||
|
# autoloading but is not available in $fpath, then it will return 1 (false).
|
||||||
#
|
#
|
||||||
# SPDX-SnippetBegin
|
# This is based on the zsh-syntax-highlighting plugin.
|
||||||
# SPDX-License-Identifier: BSD-3-Clause
|
#
|
||||||
# SPDX-SnippetCopyrightText: 2010-2011 zsh-syntax-highlighting contributors
|
_history-substring-search-function-callable() {
|
||||||
#--------------8<-------------------8<-------------------8<-----------------
|
if (( ${+functions[$1]} )) && ! [[ "$functions[$1]" == *"builtin autoload -X"* ]]; then
|
||||||
# Rebind all ZLE widgets to make them invoke _zsh_highlights.
|
return 0 # already fully loaded
|
||||||
_zsh_highlight_bind_widgets()
|
else
|
||||||
{
|
# "$1" is either an autoload stub, or not a function at all.
|
||||||
# Load ZSH module zsh/zleparameter, needed to override user defined widgets.
|
# We expect 'autoload +X' to return non-zero if it fails to fully load
|
||||||
zmodload zsh/zleparameter 2>/dev/null || {
|
# the function.
|
||||||
echo 'zsh-syntax-highlighting: failed loading zsh/zleparameter.' >&2
|
( autoload -U +X -- "$1" 2>/dev/null )
|
||||||
return 1
|
return $?
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
#
|
||||||
|
# The zsh-syntax-highlighting plugin uses zle-line-pre-redraw hook instead
|
||||||
|
# of the legacy "bind all widgets" if 1) zsh has the memo= feature (added in
|
||||||
|
# version 5.9) and 2) add-zle-hook-widget is available.
|
||||||
|
#
|
||||||
|
if is-at-least 5.9 $ZSH_VERSION && _history-substring-search-function-callable add-zle-hook-widget; then
|
||||||
|
#
|
||||||
|
# The following code is based on the zsh-syntax-highlighting plugin.
|
||||||
|
#
|
||||||
|
autoload -U add-zle-hook-widget
|
||||||
|
|
||||||
|
_history-substring-search-zle-line-finish() {
|
||||||
|
#
|
||||||
|
# Reset $WIDGET since the 'main' highlighter depends on it.
|
||||||
|
#
|
||||||
|
# Since $WIDGET is declared by zle as read-only in this function's scope,
|
||||||
|
# a nested function is required in order to shadow its built-in value;
|
||||||
|
# see "User-defined widgets" in zshall.
|
||||||
|
#
|
||||||
|
() {
|
||||||
|
local -h -r WIDGET=zle-line-finish
|
||||||
|
_zsh_highlight
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# Override ZLE widgets to make them invoke _zsh_highlight.
|
_history-substring-search-zle-line-pre-redraw() {
|
||||||
local cur_widget
|
#
|
||||||
for cur_widget in ${${(f)"$(builtin zle -la)"}:#(.*|_*|orig-*|run-help|which-command|beep|yank*)}; do
|
# If the zsh-syntax-highlighting plugin has been loaded (after our plugin
|
||||||
case $widgets[$cur_widget] in
|
# plugin, otherwise this hook wouldn't be called), remove our hooks.
|
||||||
|
#
|
||||||
|
if [[ $+ZSH_HIGHLIGHT_VERSION -eq 1 ]]; then
|
||||||
|
autoload -U add-zle-hook-widget
|
||||||
|
add-zle-hook-widget -d zle-line-pre-redraw _history-substring-search-zle-line-pre-redraw
|
||||||
|
add-zle-hook-widget -d zle-line-finish _history-substring-search-zle-line-finish
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
#
|
||||||
|
# Set $? to 0 for _zsh_highlight. Without this, subsequent
|
||||||
|
# zle-line-pre-redraw hooks won't run, since add-zle-hook-widget happens to
|
||||||
|
# call us with $? == 1 in the common case.
|
||||||
|
#
|
||||||
|
true && _zsh_highlight "$@"
|
||||||
|
}
|
||||||
|
|
||||||
# Already rebound event: do nothing.
|
if [[ -o zle ]]; then
|
||||||
user:$cur_widget|user:_zsh_highlight_widget_*);;
|
add-zle-hook-widget zle-line-pre-redraw _history-substring-search-zle-line-pre-redraw
|
||||||
|
add-zle-hook-widget zle-line-finish _history-substring-search-zle-line-finish
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
#
|
||||||
|
# The following snippet was taken from the zsh-syntax-highlighting project:
|
||||||
|
# https://github.com/zsh-users/zsh-syntax-highlighting/blob/56b134f5d62ae3d4e66c7f52bd0cc2595f9b305b/zsh-syntax-highlighting.zsh#L126-161
|
||||||
|
#
|
||||||
|
# SPDX-SnippetBegin
|
||||||
|
# SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
# SPDX-SnippetCopyrightText: 2010-2011 zsh-syntax-highlighting contributors
|
||||||
|
#--------------8<-------------------8<-------------------8<-----------------
|
||||||
|
# Rebind all ZLE widgets to make them invoke _zsh_highlights.
|
||||||
|
_zsh_highlight_bind_widgets()
|
||||||
|
{
|
||||||
|
# Load ZSH module zsh/zleparameter, needed to override user defined widgets.
|
||||||
|
zmodload zsh/zleparameter 2>/dev/null || {
|
||||||
|
echo 'zsh-syntax-highlighting: failed loading zsh/zleparameter.' >&2
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
# User defined widget: override and rebind old one with prefix "orig-".
|
# Override ZLE widgets to make them invoke _zsh_highlight.
|
||||||
user:*) eval "zle -N orig-$cur_widget ${widgets[$cur_widget]#*:}; \
|
local cur_widget
|
||||||
_zsh_highlight_widget_$cur_widget() { builtin zle orig-$cur_widget -- \"\$@\" && _zsh_highlight }; \
|
for cur_widget in ${${(f)"$(builtin zle -la)"}:#(.*|_*|orig-*|run-help|which-command|beep|yank*)}; do
|
||||||
zle -N $cur_widget _zsh_highlight_widget_$cur_widget";;
|
case $widgets[$cur_widget] in
|
||||||
|
|
||||||
# Completion widget: override and rebind old one with prefix "orig-".
|
# Already rebound event: do nothing.
|
||||||
completion:*) eval "zle -C orig-$cur_widget ${${widgets[$cur_widget]#*:}/:/ }; \
|
user:$cur_widget|user:_zsh_highlight_widget_*);;
|
||||||
_zsh_highlight_widget_$cur_widget() { builtin zle orig-$cur_widget -- \"\$@\" && _zsh_highlight }; \
|
|
||||||
zle -N $cur_widget _zsh_highlight_widget_$cur_widget";;
|
|
||||||
|
|
||||||
# Builtin widget: override and make it call the builtin ".widget".
|
# User defined widget: override and rebind old one with prefix "orig-".
|
||||||
builtin) eval "_zsh_highlight_widget_$cur_widget() { builtin zle .$cur_widget -- \"\$@\" && _zsh_highlight }; \
|
user:*) eval "zle -N orig-$cur_widget ${widgets[$cur_widget]#*:}; \
|
||||||
zle -N $cur_widget _zsh_highlight_widget_$cur_widget";;
|
_zsh_highlight_widget_$cur_widget() { builtin zle orig-$cur_widget -- \"\$@\" && _zsh_highlight }; \
|
||||||
|
zle -N $cur_widget _zsh_highlight_widget_$cur_widget";;
|
||||||
|
|
||||||
# Default: unhandled case.
|
# Completion widget: override and rebind old one with prefix "orig-".
|
||||||
*) echo "zsh-syntax-highlighting: unhandled ZLE widget '$cur_widget'" >&2 ;;
|
completion:*) eval "zle -C orig-$cur_widget ${${widgets[$cur_widget]#*:}/:/ }; \
|
||||||
esac
|
_zsh_highlight_widget_$cur_widget() { builtin zle orig-$cur_widget -- \"\$@\" && _zsh_highlight }; \
|
||||||
done
|
zle -N $cur_widget _zsh_highlight_widget_$cur_widget";;
|
||||||
}
|
|
||||||
#-------------->8------------------->8------------------->8-----------------
|
|
||||||
# SPDX-SnippetEnd
|
|
||||||
|
|
||||||
_zsh_highlight_bind_widgets
|
# Builtin widget: override and make it call the builtin ".widget".
|
||||||
|
builtin) eval "_zsh_highlight_widget_$cur_widget() { builtin zle .$cur_widget -- \"\$@\" && _zsh_highlight }; \
|
||||||
|
zle -N $cur_widget _zsh_highlight_widget_$cur_widget";;
|
||||||
|
|
||||||
|
# Default: unhandled case.
|
||||||
|
*) echo "zsh-syntax-highlighting: unhandled ZLE widget '$cur_widget'" >&2 ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
}
|
||||||
|
#-------------->8------------------->8------------------->8-----------------
|
||||||
|
# SPDX-SnippetEnd
|
||||||
|
|
||||||
|
_zsh_highlight_bind_widgets
|
||||||
|
fi
|
||||||
|
|
||||||
|
unfunction _history-substring-search-function-callable
|
||||||
fi
|
fi
|
||||||
|
|
||||||
_history-substring-search-begin() {
|
_history-substring-search-begin() {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue