sddm-not-working
This commit is contained in:
@@ -3,6 +3,7 @@
|
|||||||
{
|
{
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
zsh
|
zsh
|
||||||
|
fzf
|
||||||
python3
|
python3
|
||||||
zsh-nix-shell
|
zsh-nix-shell
|
||||||
nix-zsh-completions
|
nix-zsh-completions
|
||||||
@@ -69,13 +70,4 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
#xdg.configFile = {
|
|
||||||
# "zsh/zsh-syntax-highlighting" = {
|
|
||||||
# source = ./zsh-syntax-highlighting.zsh;
|
|
||||||
# };
|
|
||||||
# "zsh/zsh-history-substring-search" = {
|
|
||||||
# source = ./zsh-history-substring-search.zsh;
|
|
||||||
# };
|
|
||||||
#};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,846 +0,0 @@
|
|||||||
#!/usr/bin/env zsh
|
|
||||||
##############################################################################
|
|
||||||
#
|
|
||||||
# Copyright (c) 2009 Peter Stephenson
|
|
||||||
# Copyright (c) 2011 Guido van Steen
|
|
||||||
# Copyright (c) 2011 Suraj N. Kurapati
|
|
||||||
# Copyright (c) 2011 Sorin Ionescu
|
|
||||||
# Copyright (c) 2011 Vincent Guerci
|
|
||||||
# Copyright (c) 2016 Geza Lore
|
|
||||||
# Copyright (c) 2017 Bengt Brodersen
|
|
||||||
# All rights reserved.
|
|
||||||
#
|
|
||||||
# Redistribution and use in source and binary forms, with or without
|
|
||||||
# modification, are permitted provided that the following conditions are met:
|
|
||||||
#
|
|
||||||
# * Redistributions of source code must retain the above copyright
|
|
||||||
# notice, this list of conditions and the following disclaimer.
|
|
||||||
#
|
|
||||||
# * Redistributions in binary form must reproduce the above
|
|
||||||
# copyright notice, this list of conditions and the following
|
|
||||||
# disclaimer in the documentation and/or other materials provided
|
|
||||||
# with the distribution.
|
|
||||||
#
|
|
||||||
# * Neither the name of the FIZSH nor the names of its contributors
|
|
||||||
# may be used to endorse or promote products derived from this
|
|
||||||
# software without specific prior written permission.
|
|
||||||
#
|
|
||||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
||||||
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
||||||
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
|
||||||
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
||||||
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
||||||
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
||||||
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
||||||
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
||||||
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
||||||
# POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
|
||||||
# declare global configuration variables
|
|
||||||
#-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
: ${HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND='bg=magenta,fg=white,bold'}
|
|
||||||
: ${HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND='bg=red,fg=white,bold'}
|
|
||||||
: ${HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS='i'}
|
|
||||||
: ${HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE=''}
|
|
||||||
: ${HISTORY_SUBSTRING_SEARCH_FUZZY=''}
|
|
||||||
: ${HISTORY_SUBSTRING_SEARCH_PREFIXED=''}
|
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
|
||||||
# declare internal global variables
|
|
||||||
#-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
typeset -g BUFFER MATCH MBEGIN MEND CURSOR
|
|
||||||
typeset -g _history_substring_search_refresh_display
|
|
||||||
typeset -g _history_substring_search_query_highlight
|
|
||||||
typeset -g _history_substring_search_result
|
|
||||||
typeset -g _history_substring_search_query
|
|
||||||
typeset -g -a _history_substring_search_query_parts
|
|
||||||
typeset -g -a _history_substring_search_raw_matches
|
|
||||||
typeset -g -i _history_substring_search_raw_match_index
|
|
||||||
typeset -g -a _history_substring_search_matches
|
|
||||||
typeset -g -i _history_substring_search_match_index
|
|
||||||
typeset -g -A _history_substring_search_unique_filter
|
|
||||||
typeset -g -i _history_substring_search_zsh_5_9
|
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
|
||||||
# the main ZLE widgets
|
|
||||||
#-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
history-substring-search-up() {
|
|
||||||
_history-substring-search-begin
|
|
||||||
|
|
||||||
_history-substring-search-up-history ||
|
|
||||||
_history-substring-search-up-buffer ||
|
|
||||||
_history-substring-search-up-search
|
|
||||||
|
|
||||||
_history-substring-search-end
|
|
||||||
}
|
|
||||||
|
|
||||||
history-substring-search-down() {
|
|
||||||
_history-substring-search-begin
|
|
||||||
|
|
||||||
_history-substring-search-down-history ||
|
|
||||||
_history-substring-search-down-buffer ||
|
|
||||||
_history-substring-search-down-search
|
|
||||||
|
|
||||||
_history-substring-search-end
|
|
||||||
}
|
|
||||||
|
|
||||||
zle -N history-substring-search-up
|
|
||||||
zle -N history-substring-search-down
|
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
|
||||||
# implementation details
|
|
||||||
#-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
zmodload -F zsh/parameter
|
|
||||||
autoload -Uz is-at-least
|
|
||||||
|
|
||||||
if is-at-least 5.9 $ZSH_VERSION; then
|
|
||||||
_history_substring_search_zsh_5_9=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# We have to "override" some keys and widgets if the
|
|
||||||
# zsh-syntax-highlighting plugin has not been loaded:
|
|
||||||
#
|
|
||||||
# https://github.com/nicoulaj/zsh-syntax-highlighting
|
|
||||||
#
|
|
||||||
if [[ $+functions[_zsh_highlight] -eq 0 ]]; then
|
|
||||||
#
|
|
||||||
# Dummy implementation of _zsh_highlight() that
|
|
||||||
# simply removes any existing highlights when the
|
|
||||||
# user inserts printable characters into $BUFFER.
|
|
||||||
#
|
|
||||||
_zsh_highlight() {
|
|
||||||
if [[ $KEYS == [[:print:]] ]]; then
|
|
||||||
region_highlight=()
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
#
|
|
||||||
# Check if $1 denotes the name of a callable function, i.e. it is fully
|
|
||||||
# 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).
|
|
||||||
#
|
|
||||||
# This is based on the zsh-syntax-highlighting plugin.
|
|
||||||
#
|
|
||||||
_history-substring-search-function-callable() {
|
|
||||||
if (( ${+functions[$1]} )) && ! [[ "$functions[$1]" == *"builtin autoload -X"* ]]; then
|
|
||||||
return 0 # already fully loaded
|
|
||||||
else
|
|
||||||
# "$1" is either an autoload stub, or not a function at all.
|
|
||||||
# We expect 'autoload +X' to return non-zero if it fails to fully load
|
|
||||||
# the function.
|
|
||||||
( autoload -U +X -- "$1" 2>/dev/null )
|
|
||||||
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 [[ $_history_substring_search_zsh_5_9 -eq 1 ]] && _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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
_history-substring-search-zle-line-pre-redraw() {
|
|
||||||
#
|
|
||||||
# If the zsh-syntax-highlighting plugin has been loaded (after our plugin
|
|
||||||
# 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 "$@"
|
|
||||||
}
|
|
||||||
|
|
||||||
if [[ -o zle ]]; then
|
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
# Override ZLE widgets to make them invoke _zsh_highlight.
|
|
||||||
local cur_widget
|
|
||||||
for cur_widget in ${${(f)"$(builtin zle -la)"}:#(.*|_*|orig-*|run-help|which-command|beep|yank*)}; do
|
|
||||||
case $widgets[$cur_widget] in
|
|
||||||
|
|
||||||
# Already rebound event: do nothing.
|
|
||||||
user:$cur_widget|user:_zsh_highlight_widget_*);;
|
|
||||||
|
|
||||||
# User defined widget: override and rebind old one with prefix "orig-".
|
|
||||||
user:*) eval "zle -N orig-$cur_widget ${widgets[$cur_widget]#*:}; \
|
|
||||||
_zsh_highlight_widget_$cur_widget() { builtin zle orig-$cur_widget -- \"\$@\" && _zsh_highlight }; \
|
|
||||||
zle -N $cur_widget _zsh_highlight_widget_$cur_widget";;
|
|
||||||
|
|
||||||
# Completion widget: override and rebind old one with prefix "orig-".
|
|
||||||
completion:*) eval "zle -C orig-$cur_widget ${${widgets[$cur_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".
|
|
||||||
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
|
|
||||||
|
|
||||||
_history-substring-search-begin() {
|
|
||||||
setopt localoptions extendedglob
|
|
||||||
|
|
||||||
_history_substring_search_refresh_display=
|
|
||||||
_history_substring_search_query_highlight=
|
|
||||||
|
|
||||||
#
|
|
||||||
# If the buffer is the same as the previously displayed history substring
|
|
||||||
# search result, then just keep stepping through the match list. Otherwise
|
|
||||||
# start a new search.
|
|
||||||
#
|
|
||||||
if [[ -n $BUFFER && $BUFFER == ${_history_substring_search_result:-} ]]; then
|
|
||||||
return;
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# Clear the previous result.
|
|
||||||
#
|
|
||||||
_history_substring_search_result=''
|
|
||||||
|
|
||||||
if [[ -z $BUFFER ]]; then
|
|
||||||
#
|
|
||||||
# If the buffer is empty, we will just act like up-history/down-history
|
|
||||||
# in ZSH, so we do not need to actually search the history. This should
|
|
||||||
# speed things up a little.
|
|
||||||
#
|
|
||||||
_history_substring_search_query=
|
|
||||||
_history_substring_search_query_parts=()
|
|
||||||
_history_substring_search_raw_matches=()
|
|
||||||
|
|
||||||
else
|
|
||||||
#
|
|
||||||
# For the purpose of highlighting we keep a copy of the original
|
|
||||||
# query string.
|
|
||||||
#
|
|
||||||
_history_substring_search_query=$BUFFER
|
|
||||||
|
|
||||||
#
|
|
||||||
# compose search pattern
|
|
||||||
#
|
|
||||||
if [[ -n $HISTORY_SUBSTRING_SEARCH_FUZZY ]]; then
|
|
||||||
#
|
|
||||||
# `=` split string in arguments
|
|
||||||
#
|
|
||||||
_history_substring_search_query_parts=(${=_history_substring_search_query})
|
|
||||||
else
|
|
||||||
_history_substring_search_query_parts=(${==_history_substring_search_query})
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# Escape and join query parts with wildcard character '*' as seperator
|
|
||||||
# `(j:CHAR:)` join array to string with CHAR as seperator
|
|
||||||
#
|
|
||||||
local search_pattern="${(j:*:)_history_substring_search_query_parts[@]//(#m)[\][()|\\*?#<>~^]/\\$MATCH}*"
|
|
||||||
|
|
||||||
#
|
|
||||||
# Support anchoring history search to the beginning of the command
|
|
||||||
#
|
|
||||||
if [[ -z $HISTORY_SUBSTRING_SEARCH_PREFIXED ]]; then
|
|
||||||
search_pattern="*${search_pattern}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# Find all occurrences of the search pattern in the history file.
|
|
||||||
#
|
|
||||||
# (k) returns the "keys" (history index numbers) instead of the values
|
|
||||||
# (R) returns values in reverse older, so the index of the youngest
|
|
||||||
# matching history entry is at the head of the list.
|
|
||||||
#
|
|
||||||
_history_substring_search_raw_matches=(${(k)history[(R)(#$HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS)${search_pattern}]})
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# In order to stay as responsive as possible, we will process the raw
|
|
||||||
# matches lazily (when the user requests the next match) to choose items
|
|
||||||
# that need to be displayed to the user.
|
|
||||||
# _history_substring_search_raw_match_index holds the index of the last
|
|
||||||
# unprocessed entry in _history_substring_search_raw_matches. Any items
|
|
||||||
# that need to be displayed will be added to
|
|
||||||
# _history_substring_search_matches.
|
|
||||||
#
|
|
||||||
# We use an associative array (_history_substring_search_unique_filter) as
|
|
||||||
# a 'set' data structure to ensure uniqueness of the results if desired.
|
|
||||||
# If an entry (key) is in the set (non-empty value), then we have already
|
|
||||||
# added that entry to _history_substring_search_matches.
|
|
||||||
#
|
|
||||||
_history_substring_search_raw_match_index=0
|
|
||||||
_history_substring_search_matches=()
|
|
||||||
_history_substring_search_unique_filter=()
|
|
||||||
|
|
||||||
#
|
|
||||||
# If $_history_substring_search_match_index is equal to
|
|
||||||
# $#_history_substring_search_matches + 1, this indicates that we
|
|
||||||
# are beyond the end of $_history_substring_search_matches and that we
|
|
||||||
# have also processed all entries in
|
|
||||||
# _history_substring_search_raw_matches.
|
|
||||||
#
|
|
||||||
# If $#_history_substring_search_match_index is equal to 0, this indicates
|
|
||||||
# that we are beyond the beginning of $_history_substring_search_matches.
|
|
||||||
#
|
|
||||||
# If we have initially pressed "up" we have to initialize
|
|
||||||
# $_history_substring_search_match_index to 0 so that it will be
|
|
||||||
# incremented to 1.
|
|
||||||
#
|
|
||||||
# If we have initially pressed "down" we have to initialize
|
|
||||||
# $_history_substring_search_match_index to 1 so that it will be
|
|
||||||
# decremented to 0.
|
|
||||||
#
|
|
||||||
if [[ $WIDGET == history-substring-search-down ]]; then
|
|
||||||
_history_substring_search_match_index=1
|
|
||||||
else
|
|
||||||
_history_substring_search_match_index=0
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
_history-substring-search-end() {
|
|
||||||
setopt localoptions extendedglob
|
|
||||||
|
|
||||||
local highlight_memo=
|
|
||||||
_history_substring_search_result=$BUFFER
|
|
||||||
|
|
||||||
if [[ $_history_substring_search_zsh_5_9 -eq 1 ]]; then
|
|
||||||
highlight_memo='memo=history-substring-search'
|
|
||||||
fi
|
|
||||||
|
|
||||||
# the search was successful so display the result properly by clearing away
|
|
||||||
# existing highlights and moving the cursor to the end of the result buffer
|
|
||||||
if [[ $_history_substring_search_refresh_display -eq 1 ]]; then
|
|
||||||
if [[ -n $highlight_memo ]]; then
|
|
||||||
region_highlight=( "${(@)region_highlight:#*${highlight_memo}*}" )
|
|
||||||
else
|
|
||||||
region_highlight=()
|
|
||||||
fi
|
|
||||||
CURSOR=${#BUFFER}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# highlight command line using zsh-syntax-highlighting
|
|
||||||
_zsh_highlight
|
|
||||||
|
|
||||||
# highlight the search query inside the command line
|
|
||||||
if [[ -n $_history_substring_search_query_highlight ]]; then
|
|
||||||
# highlight first matching query parts
|
|
||||||
local highlight_start_index=0
|
|
||||||
local highlight_end_index=0
|
|
||||||
local query_part
|
|
||||||
for query_part in $_history_substring_search_query_parts; do
|
|
||||||
local escaped_query_part=${query_part//(#m)[\][()|\\*?#<>~^]/\\$MATCH}
|
|
||||||
# (i) get index of pattern
|
|
||||||
local query_part_match_index="${${BUFFER:$highlight_start_index}[(i)(#$HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS)${escaped_query_part}]}"
|
|
||||||
if [[ $query_part_match_index -le ${#BUFFER:$highlight_start_index} ]]; then
|
|
||||||
highlight_start_index=$(( $highlight_start_index + $query_part_match_index ))
|
|
||||||
highlight_end_index=$(( $highlight_start_index + ${#query_part} ))
|
|
||||||
region_highlight+=(
|
|
||||||
"$(($highlight_start_index - 1)) $(($highlight_end_index - 1)) ${_history_substring_search_query_highlight}${highlight_memo:+,$highlight_memo}"
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
# For debugging purposes:
|
|
||||||
# zle -R "mn: "$_history_substring_search_match_index" m#: "${#_history_substring_search_matches}
|
|
||||||
# read -k -t 200 && zle -U $REPLY
|
|
||||||
|
|
||||||
#
|
|
||||||
# When this function returns, z-sy-h runs its line-pre-redraw hook. It has no
|
|
||||||
# logic for determining highlight priority, when two different memo= marked
|
|
||||||
# region highlights overlap; instead, it always prioritises itself. Below is
|
|
||||||
# a workaround for dealing with it.
|
|
||||||
#
|
|
||||||
if [[ $_history_substring_search_zsh_5_9 -eq 1 ]]; then
|
|
||||||
zle -R
|
|
||||||
#
|
|
||||||
# After line redraw with desired highlight, wait for timeout or user input
|
|
||||||
# before removing search highlight and exiting. This ensures no highlights
|
|
||||||
# are left lingering after search is finished.
|
|
||||||
#
|
|
||||||
read -k -t ${HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_TIMEOUT:-1} && zle -U $REPLY
|
|
||||||
region_highlight=( "${(@)region_highlight:#*${highlight_memo}*}" )
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Exit successfully from the history-substring-search-* widgets.
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
_history-substring-search-up-buffer() {
|
|
||||||
#
|
|
||||||
# Check if the UP arrow was pressed to move the cursor within a multi-line
|
|
||||||
# buffer. This amounts to three tests:
|
|
||||||
#
|
|
||||||
# 1. $#buflines -gt 1.
|
|
||||||
#
|
|
||||||
# 2. $CURSOR -ne $#BUFFER.
|
|
||||||
#
|
|
||||||
# 3. Check if we are on the first line of the current multi-line buffer.
|
|
||||||
# If so, pressing UP would amount to leaving the multi-line buffer.
|
|
||||||
#
|
|
||||||
# We check this by adding an extra "x" to $LBUFFER, which makes
|
|
||||||
# sure that xlbuflines is always equal to the number of lines
|
|
||||||
# until $CURSOR (including the line with the cursor on it).
|
|
||||||
#
|
|
||||||
local buflines XLBUFFER xlbuflines
|
|
||||||
buflines=(${(f)BUFFER})
|
|
||||||
XLBUFFER=$LBUFFER"x"
|
|
||||||
xlbuflines=(${(f)XLBUFFER})
|
|
||||||
|
|
||||||
if [[ $#buflines -gt 1 && $CURSOR -ne $#BUFFER && $#xlbuflines -ne 1 ]]; then
|
|
||||||
zle up-line-or-history
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
_history-substring-search-down-buffer() {
|
|
||||||
#
|
|
||||||
# Check if the DOWN arrow was pressed to move the cursor within a multi-line
|
|
||||||
# buffer. This amounts to three tests:
|
|
||||||
#
|
|
||||||
# 1. $#buflines -gt 1.
|
|
||||||
#
|
|
||||||
# 2. $CURSOR -ne $#BUFFER.
|
|
||||||
#
|
|
||||||
# 3. Check if we are on the last line of the current multi-line buffer.
|
|
||||||
# If so, pressing DOWN would amount to leaving the multi-line buffer.
|
|
||||||
#
|
|
||||||
# We check this by adding an extra "x" to $RBUFFER, which makes
|
|
||||||
# sure that xrbuflines is always equal to the number of lines
|
|
||||||
# from $CURSOR (including the line with the cursor on it).
|
|
||||||
#
|
|
||||||
local buflines XRBUFFER xrbuflines
|
|
||||||
buflines=(${(f)BUFFER})
|
|
||||||
XRBUFFER="x"$RBUFFER
|
|
||||||
xrbuflines=(${(f)XRBUFFER})
|
|
||||||
|
|
||||||
if [[ $#buflines -gt 1 && $CURSOR -ne $#BUFFER && $#xrbuflines -ne 1 ]]; then
|
|
||||||
zle down-line-or-history
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
_history-substring-search-up-history() {
|
|
||||||
#
|
|
||||||
# Behave like up in ZSH, except clear the $BUFFER
|
|
||||||
# when beginning of history is reached like in Fish.
|
|
||||||
#
|
|
||||||
if [[ -z $_history_substring_search_query ]]; then
|
|
||||||
|
|
||||||
# we have reached the absolute top of history
|
|
||||||
if [[ $HISTNO -eq 1 ]]; then
|
|
||||||
BUFFER=
|
|
||||||
|
|
||||||
# going up from somewhere below the top of history
|
|
||||||
else
|
|
||||||
zle up-line-or-history
|
|
||||||
fi
|
|
||||||
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
_history-substring-search-down-history() {
|
|
||||||
#
|
|
||||||
# Behave like down-history in ZSH, except clear the
|
|
||||||
# $BUFFER when end of history is reached like in Fish.
|
|
||||||
#
|
|
||||||
if [[ -z $_history_substring_search_query ]]; then
|
|
||||||
|
|
||||||
# going down from the absolute top of history
|
|
||||||
if [[ $HISTNO -eq 1 && -z $BUFFER ]]; then
|
|
||||||
BUFFER=${history[1]}
|
|
||||||
_history_substring_search_refresh_display=1
|
|
||||||
|
|
||||||
# going down from somewhere above the bottom of history
|
|
||||||
else
|
|
||||||
zle down-line-or-history
|
|
||||||
fi
|
|
||||||
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
_history_substring_search_process_raw_matches() {
|
|
||||||
#
|
|
||||||
# Process more outstanding raw matches and append any matches that need to
|
|
||||||
# be displayed to the user to _history_substring_search_matches.
|
|
||||||
# Return whether there were any more results appended.
|
|
||||||
#
|
|
||||||
|
|
||||||
#
|
|
||||||
# While we have more raw matches. Process them to see if there are any more
|
|
||||||
# matches that need to be displayed to the user.
|
|
||||||
#
|
|
||||||
while [[ $_history_substring_search_raw_match_index -lt $#_history_substring_search_raw_matches ]]; do
|
|
||||||
#
|
|
||||||
# Move on to the next raw entry and get its history index.
|
|
||||||
#
|
|
||||||
_history_substring_search_raw_match_index+=1
|
|
||||||
local index=${_history_substring_search_raw_matches[$_history_substring_search_raw_match_index]}
|
|
||||||
|
|
||||||
#
|
|
||||||
# If HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE is set to a non-empty value,
|
|
||||||
# then ensure that only unique matches are presented to the user.
|
|
||||||
# When HIST_IGNORE_ALL_DUPS is set, ZSH already ensures a unique history,
|
|
||||||
# so in this case we do not need to do anything.
|
|
||||||
#
|
|
||||||
if [[ ! -o HIST_IGNORE_ALL_DUPS && -n $HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE ]]; then
|
|
||||||
#
|
|
||||||
# Get the actual history entry at the new index, and check if we have
|
|
||||||
# already added it to _history_substring_search_matches.
|
|
||||||
#
|
|
||||||
local entry=${history[$index]}
|
|
||||||
|
|
||||||
if [[ -z ${_history_substring_search_unique_filter[$entry]} ]]; then
|
|
||||||
#
|
|
||||||
# This is a new unique entry. Add it to the filter and append the
|
|
||||||
# index to _history_substring_search_matches.
|
|
||||||
#
|
|
||||||
_history_substring_search_unique_filter[$entry]=1
|
|
||||||
_history_substring_search_matches+=($index)
|
|
||||||
|
|
||||||
#
|
|
||||||
# Indicate that we did find a match.
|
|
||||||
#
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
else
|
|
||||||
#
|
|
||||||
# Just append the new history index to the processed matches.
|
|
||||||
#
|
|
||||||
_history_substring_search_matches+=($index)
|
|
||||||
|
|
||||||
#
|
|
||||||
# Indicate that we did find a match.
|
|
||||||
#
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
done
|
|
||||||
|
|
||||||
#
|
|
||||||
# We are beyond the end of the list of raw matches. Indicate that no
|
|
||||||
# more matches are available.
|
|
||||||
#
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
_history-substring-search-has-next() {
|
|
||||||
#
|
|
||||||
# Predicate function that returns whether any more older matches are
|
|
||||||
# available.
|
|
||||||
#
|
|
||||||
|
|
||||||
if [[ $_history_substring_search_match_index -lt $#_history_substring_search_matches ]]; then
|
|
||||||
#
|
|
||||||
# We did not reach the end of the processed list, so we do have further
|
|
||||||
# matches.
|
|
||||||
#
|
|
||||||
return 0
|
|
||||||
|
|
||||||
else
|
|
||||||
#
|
|
||||||
# We are at the end of the processed list. Try to process further
|
|
||||||
# unprocessed matches. _history_substring_search_process_raw_matches
|
|
||||||
# returns whether any more matches were available, so just return
|
|
||||||
# that result.
|
|
||||||
#
|
|
||||||
_history_substring_search_process_raw_matches
|
|
||||||
return $?
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
_history-substring-search-has-prev() {
|
|
||||||
#
|
|
||||||
# Predicate function that returns whether any more younger matches are
|
|
||||||
# available.
|
|
||||||
#
|
|
||||||
|
|
||||||
if [[ $_history_substring_search_match_index -gt 1 ]]; then
|
|
||||||
#
|
|
||||||
# We did not reach the beginning of the processed list, so we do have
|
|
||||||
# further matches.
|
|
||||||
#
|
|
||||||
return 0
|
|
||||||
|
|
||||||
else
|
|
||||||
#
|
|
||||||
# We are at the beginning of the processed list. We do not have any more
|
|
||||||
# matches.
|
|
||||||
#
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
_history-substring-search-found() {
|
|
||||||
#
|
|
||||||
# A match is available. The index of the match is held in
|
|
||||||
# $_history_substring_search_match_index
|
|
||||||
#
|
|
||||||
# 1. Make $BUFFER equal to the matching history entry.
|
|
||||||
#
|
|
||||||
# 2. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
|
|
||||||
# to highlight the current buffer.
|
|
||||||
#
|
|
||||||
BUFFER=$history[$_history_substring_search_matches[$_history_substring_search_match_index]]
|
|
||||||
_history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
|
|
||||||
}
|
|
||||||
|
|
||||||
_history-substring-search-not-found() {
|
|
||||||
#
|
|
||||||
# No more matches are available.
|
|
||||||
#
|
|
||||||
# 1. Make $BUFFER equal to $_history_substring_search_query so the user can
|
|
||||||
# revise it and search again.
|
|
||||||
#
|
|
||||||
# 2. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
|
|
||||||
# to highlight the current buffer.
|
|
||||||
#
|
|
||||||
BUFFER=$_history_substring_search_query
|
|
||||||
_history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
|
|
||||||
}
|
|
||||||
|
|
||||||
_history-substring-search-up-search() {
|
|
||||||
_history_substring_search_refresh_display=1
|
|
||||||
|
|
||||||
#
|
|
||||||
# Select history entry during history-substring-down-search:
|
|
||||||
#
|
|
||||||
# The following variables have been initialized in
|
|
||||||
# _history-substring-search-up/down-search():
|
|
||||||
#
|
|
||||||
# $_history_substring_search_matches is the current list of matches that
|
|
||||||
# need to be displayed to the user.
|
|
||||||
# $_history_substring_search_match_index is the index of the current match
|
|
||||||
# that is being displayed to the user.
|
|
||||||
#
|
|
||||||
# The range of values that $_history_substring_search_match_index can take
|
|
||||||
# is: [0, $#_history_substring_search_matches + 1]. A value of 0
|
|
||||||
# indicates that we are beyond the beginning of
|
|
||||||
# $_history_substring_search_matches. A value of
|
|
||||||
# $#_history_substring_search_matches + 1 indicates that we are beyond
|
|
||||||
# the end of $_history_substring_search_matches and that we have also
|
|
||||||
# processed all entries in _history_substring_search_raw_matches.
|
|
||||||
#
|
|
||||||
# If $_history_substring_search_match_index equals
|
|
||||||
# $#_history_substring_search_matches and
|
|
||||||
# $_history_substring_search_raw_match_index is not greater than
|
|
||||||
# $#_history_substring_search_raw_matches, then we need to further process
|
|
||||||
# $_history_substring_search_raw_matches to see if there are any more
|
|
||||||
# entries that need to be displayed to the user.
|
|
||||||
#
|
|
||||||
# In _history-substring-search-up-search() the initial value of
|
|
||||||
# $_history_substring_search_match_index is 0. This value is set in
|
|
||||||
# _history-substring-search-begin(). _history-substring-search-up-search()
|
|
||||||
# will initially increment it to 1.
|
|
||||||
#
|
|
||||||
|
|
||||||
if [[ $_history_substring_search_match_index -gt $#_history_substring_search_matches ]]; then
|
|
||||||
#
|
|
||||||
# We are beyond the end of $_history_substring_search_matches. This
|
|
||||||
# can only happen if we have also exhausted the unprocessed matches in
|
|
||||||
# _history_substring_search_raw_matches.
|
|
||||||
#
|
|
||||||
# 1. Update display to indicate search not found.
|
|
||||||
#
|
|
||||||
_history-substring-search-not-found
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
if _history-substring-search-has-next; then
|
|
||||||
#
|
|
||||||
# We do have older matches.
|
|
||||||
#
|
|
||||||
# 1. Move index to point to the next match.
|
|
||||||
# 2. Update display to indicate search found.
|
|
||||||
#
|
|
||||||
_history_substring_search_match_index+=1
|
|
||||||
_history-substring-search-found
|
|
||||||
|
|
||||||
else
|
|
||||||
#
|
|
||||||
# We do not have older matches.
|
|
||||||
#
|
|
||||||
# 1. Move the index beyond the end of
|
|
||||||
# _history_substring_search_matches.
|
|
||||||
# 2. Update display to indicate search not found.
|
|
||||||
#
|
|
||||||
_history_substring_search_match_index+=1
|
|
||||||
_history-substring-search-not-found
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# When HIST_FIND_NO_DUPS is set, meaning that only unique command lines from
|
|
||||||
# history should be matched, make sure the new and old results are different.
|
|
||||||
#
|
|
||||||
# However, if the HIST_IGNORE_ALL_DUPS shell option, or
|
|
||||||
# HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE is set, then we already have a
|
|
||||||
# unique history, so in this case we do not need to do anything.
|
|
||||||
#
|
|
||||||
if [[ -o HIST_IGNORE_ALL_DUPS || -n $HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE ]]; then
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -o HIST_FIND_NO_DUPS && $BUFFER == $_history_substring_search_result ]]; then
|
|
||||||
#
|
|
||||||
# Repeat the current search so that a different (unique) match is found.
|
|
||||||
#
|
|
||||||
_history-substring-search-up-search
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
_history-substring-search-down-search() {
|
|
||||||
_history_substring_search_refresh_display=1
|
|
||||||
|
|
||||||
#
|
|
||||||
# Select history entry during history-substring-down-search:
|
|
||||||
#
|
|
||||||
# The following variables have been initialized in
|
|
||||||
# _history-substring-search-up/down-search():
|
|
||||||
#
|
|
||||||
# $_history_substring_search_matches is the current list of matches that
|
|
||||||
# need to be displayed to the user.
|
|
||||||
# $_history_substring_search_match_index is the index of the current match
|
|
||||||
# that is being displayed to the user.
|
|
||||||
#
|
|
||||||
# The range of values that $_history_substring_search_match_index can take
|
|
||||||
# is: [0, $#_history_substring_search_matches + 1]. A value of 0
|
|
||||||
# indicates that we are beyond the beginning of
|
|
||||||
# $_history_substring_search_matches. A value of
|
|
||||||
# $#_history_substring_search_matches + 1 indicates that we are beyond
|
|
||||||
# the end of $_history_substring_search_matches and that we have also
|
|
||||||
# processed all entries in _history_substring_search_raw_matches.
|
|
||||||
#
|
|
||||||
# In _history-substring-search-down-search() the initial value of
|
|
||||||
# $_history_substring_search_match_index is 1. This value is set in
|
|
||||||
# _history-substring-search-begin(). _history-substring-search-down-search()
|
|
||||||
# will initially decrement it to 0.
|
|
||||||
#
|
|
||||||
|
|
||||||
if [[ $_history_substring_search_match_index -lt 1 ]]; then
|
|
||||||
#
|
|
||||||
# We are beyond the beginning of $_history_substring_search_matches.
|
|
||||||
#
|
|
||||||
# 1. Update display to indicate search not found.
|
|
||||||
#
|
|
||||||
_history-substring-search-not-found
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
if _history-substring-search-has-prev; then
|
|
||||||
#
|
|
||||||
# We do have younger matches.
|
|
||||||
#
|
|
||||||
# 1. Move index to point to the previous match.
|
|
||||||
# 2. Update display to indicate search found.
|
|
||||||
#
|
|
||||||
_history_substring_search_match_index+=-1
|
|
||||||
_history-substring-search-found
|
|
||||||
|
|
||||||
else
|
|
||||||
#
|
|
||||||
# We do not have younger matches.
|
|
||||||
#
|
|
||||||
# 1. Move the index beyond the beginning of
|
|
||||||
# _history_substring_search_matches.
|
|
||||||
# 2. Update display to indicate search not found.
|
|
||||||
#
|
|
||||||
_history_substring_search_match_index+=-1
|
|
||||||
_history-substring-search-not-found
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# When HIST_FIND_NO_DUPS is set, meaning that only unique command lines from
|
|
||||||
# history should be matched, make sure the new and old results are different.
|
|
||||||
#
|
|
||||||
# However, if the HIST_IGNORE_ALL_DUPS shell option, or
|
|
||||||
# HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE is set, then we already have a
|
|
||||||
# unique history, so in this case we do not need to do anything.
|
|
||||||
#
|
|
||||||
if [[ -o HIST_IGNORE_ALL_DUPS || -n $HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE ]]; then
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -o HIST_FIND_NO_DUPS && $BUFFER == $_history_substring_search_result ]]; then
|
|
||||||
#
|
|
||||||
# Repeat the current search so that a different (unique) match is found.
|
|
||||||
#
|
|
||||||
_history-substring-search-down-search
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
|
|
||||||
# vim: ft=zsh sw=2 ts=2 et
|
|
||||||
@@ -1,587 +0,0 @@
|
|||||||
# -------------------------------------------------------------------------------------------------
|
|
||||||
# Copyright (c) 2010-2020 zsh-syntax-highlighting contributors
|
|
||||||
# All rights reserved.
|
|
||||||
#
|
|
||||||
# Redistribution and use in source and binary forms, with or without modification, are permitted
|
|
||||||
# provided that the following conditions are met:
|
|
||||||
#
|
|
||||||
# * Redistributions of source code must retain the above copyright notice, this list of conditions
|
|
||||||
# and the following disclaimer.
|
|
||||||
# * Redistributions in binary form must reproduce the above copyright notice, this list of
|
|
||||||
# conditions and the following disclaimer in the documentation and/or other materials provided
|
|
||||||
# with the distribution.
|
|
||||||
# * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
|
|
||||||
# may be used to endorse or promote products derived from this software without specific prior
|
|
||||||
# written permission.
|
|
||||||
#
|
|
||||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
|
|
||||||
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
|
||||||
# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
|
|
||||||
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
||||||
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
|
|
||||||
# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
|
||||||
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
# -------------------------------------------------------------------------------------------------
|
|
||||||
# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
|
|
||||||
# vim: ft=zsh sw=2 ts=2 et
|
|
||||||
# -------------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# First of all, ensure predictable parsing.
|
|
||||||
typeset zsh_highlight__aliases="$(builtin alias -Lm '[^+]*')"
|
|
||||||
# In zsh <= 5.2, aliases that begin with a plus sign ('alias -- +foo=42')
|
|
||||||
# are emitted by `alias -L` without a '--' guard, so they don't round trip.
|
|
||||||
#
|
|
||||||
# Hence, we exclude them from unaliasing:
|
|
||||||
builtin unalias -m '[^+]*'
|
|
||||||
|
|
||||||
# Set $0 to the expected value, regardless of functionargzero.
|
|
||||||
0=${(%):-%N}
|
|
||||||
if true; then
|
|
||||||
# $0 is reliable
|
|
||||||
typeset -g ZSH_HIGHLIGHT_VERSION=$(<"${0:A:h}"/.version)
|
|
||||||
typeset -g ZSH_HIGHLIGHT_REVISION=$(<"${0:A:h}"/.revision-hash)
|
|
||||||
if [[ $ZSH_HIGHLIGHT_REVISION == \$Format:* ]]; then
|
|
||||||
# When running from a source tree without 'make install', $ZSH_HIGHLIGHT_REVISION
|
|
||||||
# would be set to '$Format:%H$' literally. That's an invalid value, and obtaining
|
|
||||||
# the valid value (via `git rev-parse HEAD`, as Makefile does) might be costly, so:
|
|
||||||
ZSH_HIGHLIGHT_REVISION=HEAD
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# This function takes a single argument F and returns True iff F is an autoload stub.
|
|
||||||
_zsh_highlight__function_is_autoload_stub_p() {
|
|
||||||
if zmodload -e zsh/parameter; then
|
|
||||||
#(( ${+functions[$1]} )) &&
|
|
||||||
[[ "$functions[$1]" == *"builtin autoload -X"* ]]
|
|
||||||
else
|
|
||||||
#[[ $(type -wa -- "$1") == *'function'* ]] &&
|
|
||||||
[[ "${${(@f)"$(which -- "$1")"}[2]}" == $'\t'$histchars[3]' undefined' ]]
|
|
||||||
fi
|
|
||||||
# Do nothing here: return the exit code of the if.
|
|
||||||
}
|
|
||||||
|
|
||||||
# Return True iff the argument denotes a function name.
|
|
||||||
_zsh_highlight__is_function_p() {
|
|
||||||
if zmodload -e zsh/parameter; then
|
|
||||||
(( ${+functions[$1]} ))
|
|
||||||
else
|
|
||||||
[[ $(type -wa -- "$1") == *'function'* ]]
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# This function takes a single argument F and returns True iff F denotes the
|
|
||||||
# name of a callable function. A function is callable if it is fully defined
|
|
||||||
# or if it is marked for autoloading and autoloading it at the first call to it
|
|
||||||
# will succeed. In particular, if F has been marked for autoloading
|
|
||||||
# but is not available in $fpath, then calling this function on F will return False.
|
|
||||||
#
|
|
||||||
# See users/21671 https://www.zsh.org/cgi-bin/mla/redirect?USERNUMBER=21671
|
|
||||||
_zsh_highlight__function_callable_p() {
|
|
||||||
if _zsh_highlight__is_function_p "$1" &&
|
|
||||||
! _zsh_highlight__function_is_autoload_stub_p "$1"
|
|
||||||
then
|
|
||||||
# Already fully loaded.
|
|
||||||
return 0 # true
|
|
||||||
else
|
|
||||||
# "$1" is either an autoload stub, or not a function at all.
|
|
||||||
#
|
|
||||||
# Use a subshell to avoid affecting the calling shell.
|
|
||||||
#
|
|
||||||
# We expect 'autoload +X' to return non-zero if it fails to fully load
|
|
||||||
# the function.
|
|
||||||
( autoload -U +X -- "$1" 2>/dev/null )
|
|
||||||
return $?
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# -------------------------------------------------------------------------------------------------
|
|
||||||
# Core highlighting update system
|
|
||||||
# -------------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Use workaround for bug in ZSH?
|
|
||||||
# zsh-users/zsh@48cadf4 https://www.zsh.org/mla/workers/2017/msg00034.html
|
|
||||||
autoload -Uz is-at-least
|
|
||||||
if is-at-least 5.4; then
|
|
||||||
typeset -g zsh_highlight__pat_static_bug=false
|
|
||||||
else
|
|
||||||
typeset -g zsh_highlight__pat_static_bug=true
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Array declaring active highlighters names.
|
|
||||||
typeset -ga ZSH_HIGHLIGHT_HIGHLIGHTERS
|
|
||||||
|
|
||||||
# Update ZLE buffer syntax highlighting.
|
|
||||||
#
|
|
||||||
# Invokes each highlighter that needs updating.
|
|
||||||
# This function is supposed to be called whenever the ZLE state changes.
|
|
||||||
_zsh_highlight()
|
|
||||||
{
|
|
||||||
# Store the previous command return code to restore it whatever happens.
|
|
||||||
local ret=$?
|
|
||||||
# Make it read-only. Can't combine this with the previous line when POSIX_BUILTINS may be set.
|
|
||||||
typeset -r ret
|
|
||||||
|
|
||||||
# $region_highlight should be predefined, either by zle or by the test suite's mock (non-special) array.
|
|
||||||
(( ${+region_highlight[@]} )) || {
|
|
||||||
echo >&2 'zsh-syntax-highlighting: error: $region_highlight is not defined'
|
|
||||||
echo >&2 'zsh-syntax-highlighting: (Check whether zsh-syntax-highlighting was installed according to the instructions.)'
|
|
||||||
return $ret
|
|
||||||
}
|
|
||||||
|
|
||||||
# Probe the memo= feature, once.
|
|
||||||
(( ${+zsh_highlight__memo_feature} )) || {
|
|
||||||
region_highlight+=( " 0 0 fg=red, memo=zsh-syntax-highlighting" )
|
|
||||||
case ${region_highlight[-1]} in
|
|
||||||
("0 0 fg=red")
|
|
||||||
# zsh 5.8 or earlier
|
|
||||||
integer -gr zsh_highlight__memo_feature=0
|
|
||||||
;;
|
|
||||||
("0 0 fg=red memo=zsh-syntax-highlighting")
|
|
||||||
# zsh 5.9 or later
|
|
||||||
integer -gr zsh_highlight__memo_feature=1
|
|
||||||
;;
|
|
||||||
(" 0 0 fg=red, memo=zsh-syntax-highlighting") ;&
|
|
||||||
(*)
|
|
||||||
# We can get here in two ways:
|
|
||||||
#
|
|
||||||
# 1. When not running as a widget. In that case, $region_highlight is
|
|
||||||
# not a special variable (= one with custom getter/setter functions
|
|
||||||
# written in C) but an ordinary one, so the third case pattern matches
|
|
||||||
# and we fall through to this block. (The test suite uses this codepath.)
|
|
||||||
#
|
|
||||||
# 2. When running under a future version of zsh that will have changed
|
|
||||||
# the serialization of $region_highlight elements from their underlying
|
|
||||||
# C structs, so that none of the previous case patterns will match.
|
|
||||||
#
|
|
||||||
# In either case, fall back to a version check.
|
|
||||||
if is-at-least 5.9; then
|
|
||||||
integer -gr zsh_highlight__memo_feature=1
|
|
||||||
else
|
|
||||||
integer -gr zsh_highlight__memo_feature=0
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
region_highlight[-1]=()
|
|
||||||
}
|
|
||||||
|
|
||||||
# Reset region_highlight to build it from scratch
|
|
||||||
if (( zsh_highlight__memo_feature )); then
|
|
||||||
region_highlight=( "${(@)region_highlight:#*memo=zsh-syntax-highlighting*}" )
|
|
||||||
else
|
|
||||||
# Legacy codepath. Not very interoperable with other plugins (issue #418).
|
|
||||||
region_highlight=()
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 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?'.
|
|
||||||
# This disables highlighting during isearch (for reasons explained in README.md) unless zsh is new enough
|
|
||||||
# and doesn't have the pattern matching bug
|
|
||||||
if [[ $WIDGET == zle-isearch-update ]] && { $zsh_highlight__pat_static_bug || ! (( $+ISEARCHMATCH_ACTIVE )) }; then
|
|
||||||
return $ret
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Before we 'emulate -L', save the user's options
|
|
||||||
local -A zsyh_user_options
|
|
||||||
if zmodload -e zsh/parameter; then
|
|
||||||
zsyh_user_options=("${(kv)options[@]}")
|
|
||||||
else
|
|
||||||
local canonical_options onoff option raw_options
|
|
||||||
raw_options=(${(f)"$(emulate -R zsh; set -o)"})
|
|
||||||
canonical_options=(${${${(M)raw_options:#*off}%% *}#no} ${${(M)raw_options:#*on}%% *})
|
|
||||||
for option in "${canonical_options[@]}"; do
|
|
||||||
[[ -o $option ]]
|
|
||||||
case $? in
|
|
||||||
(0) zsyh_user_options+=($option on);;
|
|
||||||
(1) zsyh_user_options+=($option off);;
|
|
||||||
(*) # Can't happen, surely?
|
|
||||||
echo "zsh-syntax-highlighting: warning: '[[ -o $option ]]' returned $?"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
typeset -r zsyh_user_options
|
|
||||||
|
|
||||||
emulate -L zsh
|
|
||||||
setopt localoptions warncreateglobal nobashrematch
|
|
||||||
local REPLY # don't leak $REPLY into global scope
|
|
||||||
|
|
||||||
# Do not highlight if there are more than 300 chars in the buffer. It's most
|
|
||||||
# likely a pasted command or a huge list of files in that case..
|
|
||||||
[[ -n ${ZSH_HIGHLIGHT_MAXLENGTH:-} ]] && [[ $#BUFFER -gt $ZSH_HIGHLIGHT_MAXLENGTH ]] && return $ret
|
|
||||||
|
|
||||||
# Do not highlight if there are pending inputs (copy/paste).
|
|
||||||
(( KEYS_QUEUED_COUNT > 0 )) && return $ret
|
|
||||||
(( PENDING > 0 )) && return $ret
|
|
||||||
|
|
||||||
{
|
|
||||||
local cache_place
|
|
||||||
local -a region_highlight_copy
|
|
||||||
|
|
||||||
# Select which highlighters in ZSH_HIGHLIGHT_HIGHLIGHTERS need to be invoked.
|
|
||||||
local highlighter; for highlighter in $ZSH_HIGHLIGHT_HIGHLIGHTERS; do
|
|
||||||
|
|
||||||
# eval cache place for current highlighter and prepare it
|
|
||||||
cache_place="_zsh_highlight__highlighter_${highlighter}_cache"
|
|
||||||
typeset -ga ${cache_place}
|
|
||||||
|
|
||||||
# If highlighter needs to be invoked
|
|
||||||
if ! type "_zsh_highlight_highlighter_${highlighter}_predicate" >&/dev/null; then
|
|
||||||
echo "zsh-syntax-highlighting: warning: disabling the ${(qq)highlighter} highlighter as it has not been loaded" >&2
|
|
||||||
# TODO: use ${(b)} rather than ${(q)} if supported
|
|
||||||
ZSH_HIGHLIGHT_HIGHLIGHTERS=( ${ZSH_HIGHLIGHT_HIGHLIGHTERS:#${highlighter}} )
|
|
||||||
elif "_zsh_highlight_highlighter_${highlighter}_predicate"; then
|
|
||||||
|
|
||||||
# save a copy, and cleanup region_highlight
|
|
||||||
region_highlight_copy=("${region_highlight[@]}")
|
|
||||||
region_highlight=()
|
|
||||||
|
|
||||||
# Execute highlighter and save result
|
|
||||||
{
|
|
||||||
"_zsh_highlight_highlighter_${highlighter}_paint"
|
|
||||||
} always {
|
|
||||||
: ${(AP)cache_place::="${region_highlight[@]}"}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Restore saved region_highlight
|
|
||||||
region_highlight=("${region_highlight_copy[@]}")
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Use value form cache if any cached
|
|
||||||
region_highlight+=("${(@P)cache_place}")
|
|
||||||
|
|
||||||
done
|
|
||||||
|
|
||||||
# Re-apply zle_highlight settings
|
|
||||||
|
|
||||||
# region
|
|
||||||
() {
|
|
||||||
(( REGION_ACTIVE )) || return
|
|
||||||
integer min max
|
|
||||||
if (( MARK > CURSOR )) ; then
|
|
||||||
min=$CURSOR max=$MARK
|
|
||||||
else
|
|
||||||
min=$MARK max=$CURSOR
|
|
||||||
fi
|
|
||||||
if (( REGION_ACTIVE == 1 )); then
|
|
||||||
[[ $KEYMAP = vicmd ]] && (( max++ ))
|
|
||||||
elif (( REGION_ACTIVE == 2 )); then
|
|
||||||
local needle=$'\n'
|
|
||||||
# CURSOR and MARK are 0 indexed between letters like region_highlight
|
|
||||||
# Do not include the newline in the highlight
|
|
||||||
(( min = ${BUFFER[(Ib:min:)$needle]} ))
|
|
||||||
(( max = ${BUFFER[(ib:max:)$needle]} - 1 ))
|
|
||||||
fi
|
|
||||||
_zsh_highlight_apply_zle_highlight region standout "$min" "$max"
|
|
||||||
}
|
|
||||||
|
|
||||||
# yank / paste (zsh-5.1.1 and newer)
|
|
||||||
(( $+YANK_ACTIVE )) && (( YANK_ACTIVE )) && _zsh_highlight_apply_zle_highlight paste standout "$YANK_START" "$YANK_END"
|
|
||||||
|
|
||||||
# isearch
|
|
||||||
(( $+ISEARCHMATCH_ACTIVE )) && (( ISEARCHMATCH_ACTIVE )) && _zsh_highlight_apply_zle_highlight isearch underline "$ISEARCHMATCH_START" "$ISEARCHMATCH_END"
|
|
||||||
|
|
||||||
# suffix
|
|
||||||
(( $+SUFFIX_ACTIVE )) && (( SUFFIX_ACTIVE )) && _zsh_highlight_apply_zle_highlight suffix bold "$SUFFIX_START" "$SUFFIX_END"
|
|
||||||
|
|
||||||
|
|
||||||
return $ret
|
|
||||||
|
|
||||||
|
|
||||||
} always {
|
|
||||||
typeset -g _ZSH_HIGHLIGHT_PRIOR_BUFFER="$BUFFER"
|
|
||||||
typeset -gi _ZSH_HIGHLIGHT_PRIOR_CURSOR=$CURSOR
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Apply highlighting based on entries in the zle_highlight array.
|
|
||||||
# This function takes four arguments:
|
|
||||||
# 1. The exact entry (no patterns) in the zle_highlight array:
|
|
||||||
# region, paste, isearch, or suffix
|
|
||||||
# 2. The default highlighting that should be applied if the entry is unset
|
|
||||||
# 3. and 4. Two integer values describing the beginning and end of the
|
|
||||||
# range. The order does not matter.
|
|
||||||
_zsh_highlight_apply_zle_highlight() {
|
|
||||||
local entry="$1" default="$2"
|
|
||||||
integer first="$3" second="$4"
|
|
||||||
|
|
||||||
# read the relevant entry from zle_highlight
|
|
||||||
#
|
|
||||||
# ### In zsh≥5.0.8 we'd use ${(b)entry}, but we support older zsh's, so we don't
|
|
||||||
# ### add (b). The only effect is on the failure mode for callers that violate
|
|
||||||
# ### the precondition.
|
|
||||||
local region="${zle_highlight[(r)${entry}:*]-}"
|
|
||||||
|
|
||||||
if [[ -z "$region" ]]; then
|
|
||||||
# entry not specified at all, use default value
|
|
||||||
region=$default
|
|
||||||
else
|
|
||||||
# strip prefix
|
|
||||||
region="${region#${entry}:}"
|
|
||||||
|
|
||||||
# no highlighting when set to the empty string or to 'none'
|
|
||||||
if [[ -z "$region" ]] || [[ "$region" == none ]]; then
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
integer start end
|
|
||||||
if (( first < second )); then
|
|
||||||
start=$first end=$second
|
|
||||||
else
|
|
||||||
start=$second end=$first
|
|
||||||
fi
|
|
||||||
region_highlight+=("$start $end $region, memo=zsh-syntax-highlighting")
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# -------------------------------------------------------------------------------------------------
|
|
||||||
# API/utility functions for highlighters
|
|
||||||
# -------------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Array used by highlighters to declare user overridable styles.
|
|
||||||
typeset -gA ZSH_HIGHLIGHT_STYLES
|
|
||||||
|
|
||||||
# Whether the command line buffer has been modified or not.
|
|
||||||
#
|
|
||||||
# Returns 0 if the buffer has changed since _zsh_highlight was last called.
|
|
||||||
_zsh_highlight_buffer_modified()
|
|
||||||
{
|
|
||||||
[[ "${_ZSH_HIGHLIGHT_PRIOR_BUFFER:-}" != "$BUFFER" ]]
|
|
||||||
}
|
|
||||||
|
|
||||||
# Whether the cursor has moved or not.
|
|
||||||
#
|
|
||||||
# Returns 0 if the cursor has moved since _zsh_highlight was last called.
|
|
||||||
_zsh_highlight_cursor_moved()
|
|
||||||
{
|
|
||||||
[[ -n $CURSOR ]] && [[ -n ${_ZSH_HIGHLIGHT_PRIOR_CURSOR-} ]] && (($_ZSH_HIGHLIGHT_PRIOR_CURSOR != $CURSOR))
|
|
||||||
}
|
|
||||||
|
|
||||||
# Add a highlight defined by ZSH_HIGHLIGHT_STYLES.
|
|
||||||
#
|
|
||||||
# Should be used by all highlighters aside from 'pattern' (cf. ZSH_HIGHLIGHT_PATTERN).
|
|
||||||
# Overwritten in tests/test-highlighting.zsh when testing.
|
|
||||||
_zsh_highlight_add_highlight()
|
|
||||||
{
|
|
||||||
local -i start end
|
|
||||||
local highlight
|
|
||||||
start=$1
|
|
||||||
end=$2
|
|
||||||
shift 2
|
|
||||||
for highlight; do
|
|
||||||
if (( $+ZSH_HIGHLIGHT_STYLES[$highlight] )); then
|
|
||||||
region_highlight+=("$start $end $ZSH_HIGHLIGHT_STYLES[$highlight], memo=zsh-syntax-highlighting")
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
# -------------------------------------------------------------------------------------------------
|
|
||||||
# Setup functions
|
|
||||||
# -------------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Helper for _zsh_highlight_bind_widgets
|
|
||||||
# $1 is name of widget to call
|
|
||||||
_zsh_highlight_call_widget()
|
|
||||||
{
|
|
||||||
builtin zle "$@" &&
|
|
||||||
_zsh_highlight
|
|
||||||
}
|
|
||||||
|
|
||||||
# Decide whether to use the zle-line-pre-redraw codepath (colloquially known as
|
|
||||||
# "feature/redrawhook", after the topic branch's name) or the legacy "bind all
|
|
||||||
# widgets" codepath.
|
|
||||||
#
|
|
||||||
# We use the new codepath under two conditions:
|
|
||||||
#
|
|
||||||
# 1. If it's available, which we check by testing for add-zle-hook-widget's availability.
|
|
||||||
#
|
|
||||||
# 2. If zsh has the memo= feature, which is required for interoperability reasons.
|
|
||||||
# See issues #579 and #735, and the issues referenced from them.
|
|
||||||
#
|
|
||||||
# We check this with a plain version number check, since a functional check,
|
|
||||||
# as done by _zsh_highlight, can only be done from inside a widget
|
|
||||||
# function — a catch-22.
|
|
||||||
if is-at-least 5.9 && _zsh_highlight__function_callable_p add-zle-hook-widget
|
|
||||||
then
|
|
||||||
autoload -U add-zle-hook-widget
|
|
||||||
_zsh_highlight__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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_zsh_highlight__zle-line-pre-redraw() {
|
|
||||||
# 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 "$@"
|
|
||||||
}
|
|
||||||
_zsh_highlight_bind_widgets(){}
|
|
||||||
if [[ -o zle ]]; then
|
|
||||||
add-zle-hook-widget zle-line-pre-redraw _zsh_highlight__zle-line-pre-redraw
|
|
||||||
add-zle-hook-widget zle-line-finish _zsh_highlight__zle-line-finish
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
# Rebind all ZLE widgets to make them invoke _zsh_highlights.
|
|
||||||
_zsh_highlight_bind_widgets()
|
|
||||||
{
|
|
||||||
setopt localoptions noksharrays
|
|
||||||
typeset -F SECONDS
|
|
||||||
local prefix=orig-s$SECONDS-r$RANDOM # unique each time, in case we're sourced more than once
|
|
||||||
|
|
||||||
# Load ZSH module zsh/zleparameter, needed to override user defined widgets.
|
|
||||||
zmodload zsh/zleparameter 2>/dev/null || {
|
|
||||||
print -r -- >&2 'zsh-syntax-highlighting: failed loading zsh/zleparameter.'
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# Override ZLE widgets to make them invoke _zsh_highlight.
|
|
||||||
local -U widgets_to_bind
|
|
||||||
widgets_to_bind=(${${(k)widgets}:#(.*|run-help|which-command|beep|set-local-history|yank|yank-pop)})
|
|
||||||
|
|
||||||
# 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 $widgets_to_bind; do
|
|
||||||
case ${widgets[$cur_widget]:-""} in
|
|
||||||
|
|
||||||
# Already rebound event: do nothing.
|
|
||||||
user:_zsh_highlight_widget_*);;
|
|
||||||
|
|
||||||
# The "eval"'s are required to make $cur_widget a closure: the value of the parameter at function
|
|
||||||
# definition time is used.
|
|
||||||
#
|
|
||||||
# We can't use ${0/_zsh_highlight_widget_} because these widgets are always invoked with
|
|
||||||
# NO_function_argzero, regardless of the option's setting here.
|
|
||||||
|
|
||||||
# User defined widget: override and rebind old one with prefix "orig-".
|
|
||||||
user:*) zle -N $prefix-$cur_widget ${widgets[$cur_widget]#*:}
|
|
||||||
eval "_zsh_highlight_widget_${(q)prefix}-${(q)cur_widget}() { _zsh_highlight_call_widget ${(q)prefix}-${(q)cur_widget} -- \"\$@\" }"
|
|
||||||
zle -N $cur_widget _zsh_highlight_widget_$prefix-$cur_widget;;
|
|
||||||
|
|
||||||
# Completion widget: override and rebind old one with prefix "orig-".
|
|
||||||
completion:*) zle -C $prefix-$cur_widget ${${(s.:.)widgets[$cur_widget]}[2,3]}
|
|
||||||
eval "_zsh_highlight_widget_${(q)prefix}-${(q)cur_widget}() { _zsh_highlight_call_widget ${(q)prefix}-${(q)cur_widget} -- \"\$@\" }"
|
|
||||||
zle -N $cur_widget _zsh_highlight_widget_$prefix-$cur_widget;;
|
|
||||||
|
|
||||||
# Builtin widget: override and make it call the builtin ".widget".
|
|
||||||
builtin) eval "_zsh_highlight_widget_${(q)prefix}-${(q)cur_widget}() { _zsh_highlight_call_widget .${(q)cur_widget} -- \"\$@\" }"
|
|
||||||
zle -N $cur_widget _zsh_highlight_widget_$prefix-$cur_widget;;
|
|
||||||
|
|
||||||
# Incomplete or nonexistent widget: Bind to z-sy-h directly.
|
|
||||||
*)
|
|
||||||
if [[ $cur_widget == zle-* ]] && (( ! ${+widgets[$cur_widget]} )); then
|
|
||||||
_zsh_highlight_widget_${cur_widget}() { :; _zsh_highlight }
|
|
||||||
zle -N $cur_widget _zsh_highlight_widget_$cur_widget
|
|
||||||
else
|
|
||||||
# Default: unhandled case.
|
|
||||||
print -r -- >&2 "zsh-syntax-highlighting: unhandled ZLE widget ${(qq)cur_widget}"
|
|
||||||
print -r -- >&2 "zsh-syntax-highlighting: (This is sometimes caused by doing \`bindkey <keys> ${(q-)cur_widget}\` without creating the ${(qq)cur_widget} widget with \`zle -N\` or \`zle -C\`.)"
|
|
||||||
fi
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Load highlighters from directory.
|
|
||||||
#
|
|
||||||
# Arguments:
|
|
||||||
# 1) Path to the highlighters directory.
|
|
||||||
_zsh_highlight_load_highlighters()
|
|
||||||
{
|
|
||||||
setopt localoptions noksharrays bareglobqual
|
|
||||||
|
|
||||||
# Check the directory exists.
|
|
||||||
[[ -d "$1" ]] || {
|
|
||||||
print -r -- >&2 "zsh-syntax-highlighting: highlighters directory ${(qq)1} not found."
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# Load highlighters from highlighters directory and check they define required functions.
|
|
||||||
local highlighter highlighter_dir
|
|
||||||
for highlighter_dir ($1/*/(/)); do
|
|
||||||
highlighter="${highlighter_dir:t}"
|
|
||||||
[[ -f "$highlighter_dir${highlighter}-highlighter.zsh" ]] &&
|
|
||||||
. "$highlighter_dir${highlighter}-highlighter.zsh"
|
|
||||||
if type "_zsh_highlight_highlighter_${highlighter}_paint" &> /dev/null &&
|
|
||||||
type "_zsh_highlight_highlighter_${highlighter}_predicate" &> /dev/null;
|
|
||||||
then
|
|
||||||
# New (0.5.0) function names
|
|
||||||
elif type "_zsh_highlight_${highlighter}_highlighter" &> /dev/null &&
|
|
||||||
type "_zsh_highlight_${highlighter}_highlighter_predicate" &> /dev/null;
|
|
||||||
then
|
|
||||||
# Old (0.4.x) function names
|
|
||||||
if false; then
|
|
||||||
# TODO: only show this warning for plugin authors/maintainers, not for end users
|
|
||||||
print -r -- >&2 "zsh-syntax-highlighting: warning: ${(qq)highlighter} highlighter uses deprecated entry point names; please ask its maintainer to update it: https://github.com/zsh-users/zsh-syntax-highlighting/issues/329"
|
|
||||||
fi
|
|
||||||
# Make it work.
|
|
||||||
eval "_zsh_highlight_highlighter_${(q)highlighter}_paint() { _zsh_highlight_${(q)highlighter}_highlighter \"\$@\" }"
|
|
||||||
eval "_zsh_highlight_highlighter_${(q)highlighter}_predicate() { _zsh_highlight_${(q)highlighter}_highlighter_predicate \"\$@\" }"
|
|
||||||
else
|
|
||||||
print -r -- >&2 "zsh-syntax-highlighting: ${(qq)highlighter} highlighter should define both required functions '_zsh_highlight_highlighter_${highlighter}_paint' and '_zsh_highlight_highlighter_${highlighter}_predicate' in ${(qq):-"$highlighter_dir${highlighter}-highlighter.zsh"}."
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# -------------------------------------------------------------------------------------------------
|
|
||||||
# Setup
|
|
||||||
# -------------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Try binding widgets.
|
|
||||||
_zsh_highlight_bind_widgets || {
|
|
||||||
print -r -- >&2 'zsh-syntax-highlighting: failed binding ZLE widgets, exiting.'
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# Resolve highlighters directory location.
|
|
||||||
_zsh_highlight_load_highlighters "${ZSH_HIGHLIGHT_HIGHLIGHTERS_DIR:-${${0:A}:h}/highlighters}" || {
|
|
||||||
print -r -- >&2 'zsh-syntax-highlighting: failed loading highlighters, exiting.'
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# Reset scratch variables when commandline is done.
|
|
||||||
_zsh_highlight_preexec_hook()
|
|
||||||
{
|
|
||||||
typeset -g _ZSH_HIGHLIGHT_PRIOR_BUFFER=
|
|
||||||
typeset -gi _ZSH_HIGHLIGHT_PRIOR_CURSOR=
|
|
||||||
}
|
|
||||||
autoload -Uz add-zsh-hook
|
|
||||||
add-zsh-hook preexec _zsh_highlight_preexec_hook 2>/dev/null || {
|
|
||||||
print -r -- >&2 'zsh-syntax-highlighting: failed loading add-zsh-hook.'
|
|
||||||
}
|
|
||||||
|
|
||||||
# Load zsh/parameter module if available
|
|
||||||
zmodload zsh/parameter 2>/dev/null || true
|
|
||||||
|
|
||||||
# Initialize the array of active highlighters if needed.
|
|
||||||
[[ $#ZSH_HIGHLIGHT_HIGHLIGHTERS -eq 0 ]] && ZSH_HIGHLIGHT_HIGHLIGHTERS=(main)
|
|
||||||
|
|
||||||
if (( $+X_ZSH_HIGHLIGHT_DIRS_BLACKLIST )); then
|
|
||||||
print >&2 'zsh-syntax-highlighting: X_ZSH_HIGHLIGHT_DIRS_BLACKLIST is deprecated. Please use ZSH_HIGHLIGHT_DIRS_BLACKLIST.'
|
|
||||||
ZSH_HIGHLIGHT_DIRS_BLACKLIST=($X_ZSH_HIGHLIGHT_DIRS_BLACKLIST)
|
|
||||||
unset X_ZSH_HIGHLIGHT_DIRS_BLACKLIST
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Restore the aliases we unned
|
|
||||||
eval "$zsh_highlight__aliases"
|
|
||||||
builtin unset zsh_highlight__aliases
|
|
||||||
|
|
||||||
# Set $?.
|
|
||||||
true
|
|
||||||
Reference in New Issue
Block a user