mirror of
https://github.com/zsh-users/zsh-syntax-highlighting.git
synced 2025-04-17 11:35:32 +08:00
Merge 116fdcd436
into 62c5575848
This commit is contained in:
commit
6d537d9d2b
135
_zsh_highlight_internal
Normal file
135
_zsh_highlight_internal
Normal file
@ -0,0 +1,135 @@
|
|||||||
|
# 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_internal()
|
||||||
|
{
|
||||||
|
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
|
||||||
|
|
||||||
|
# Do not highlight if there are pending inputs (copy/paste).
|
||||||
|
[[ $PENDING -gt 0 ]] && return
|
||||||
|
|
||||||
|
{
|
||||||
|
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"
|
||||||
|
|
||||||
|
} 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")
|
||||||
|
}
|
||||||
|
|
||||||
|
_zsh_highlight_internal "$@"
|
276
driver.zsh
Normal file
276
driver.zsh
Normal file
@ -0,0 +1,276 @@
|
|||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
# 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
|
||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
# Set $0 to the expected value, regardless of functionargzero.
|
||||||
|
0=${(%):-%N}
|
||||||
|
fpath+=(${0:P:h})
|
||||||
|
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 a function has been marked for autoloading
|
||||||
|
# but is not available in $fpath, then this function will return False therefor.
|
||||||
|
#
|
||||||
|
# See users/21671 http://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 http://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
|
||||||
|
|
||||||
|
|
||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
# 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
|
||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
# Load highlighters from directory.
|
||||||
|
#
|
||||||
|
# Arguments:
|
||||||
|
# 1) Path to the highlighters directory.
|
||||||
|
_zsh_highlight_load_highlighters()
|
||||||
|
{
|
||||||
|
# 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 [[ -f "${highlighter_dir}_zsh_highlight_highlighter_${highlighter}_paint" ]] &&
|
||||||
|
[[ -f "${highlighter_dir}_zsh_highlight_highlighter_${highlighter}_predicate" ]]; then
|
||||||
|
# New (0.8.0) autoload style highlighter
|
||||||
|
fpath+=(${highlighter_dir%/})
|
||||||
|
autoload -Uz "_zsh_highlight_highlighter_${highlighter}_paint" "_zsh_highlight_highlighter_${highlighter}_predicate"
|
||||||
|
else
|
||||||
|
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
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
# Setup
|
||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
autoload -Uz _zsh_highlight_internal
|
||||||
|
|
||||||
|
# Probe the 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.
|
||||||
|
#
|
||||||
|
# The memo= feature was added to zsh in commit zsh-5.8-172-gdd6e702ee.
|
||||||
|
# The version number at the time was 5.8.0.2-dev (see Config/version.mk).
|
||||||
|
# Therefore, on 5.8.0.3 and newer the memo= feature is available.
|
||||||
|
#
|
||||||
|
# On zsh version 5.8.0.2 between the aforementioned commit and the
|
||||||
|
# first Config/version.mk bump after it (which, at the time of writing,
|
||||||
|
# is yet to come), this condition will false negative.
|
||||||
|
if is-at-least 5.8.0.3 $ZSH_VERSION.0.0; then
|
||||||
|
integer -gr zsh_highlight__memo_feature=1
|
||||||
|
else
|
||||||
|
integer -gr zsh_highlight__memo_feature=0
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
region_highlight[-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
|
@ -0,0 +1,93 @@
|
|||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
# Copyright (c) 2010-2017 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
|
||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
_zsh_highlight_highlighter_brackets_paint()
|
||||||
|
{
|
||||||
|
local char style
|
||||||
|
local -i bracket_color_size=${#ZSH_HIGHLIGHT_STYLES[(I)bracket-level-*]} buflen=${#BUFFER} level=0 matchingpos pos
|
||||||
|
local -A levelpos lastoflevel matching
|
||||||
|
|
||||||
|
# Find all brackets and remember which one is matching
|
||||||
|
pos=0
|
||||||
|
for char in ${(s..)BUFFER} ; do
|
||||||
|
(( ++pos ))
|
||||||
|
case $char in
|
||||||
|
["([{"])
|
||||||
|
levelpos[$pos]=$((++level))
|
||||||
|
lastoflevel[$level]=$pos
|
||||||
|
;;
|
||||||
|
[")]}"])
|
||||||
|
if (( level > 0 )); then
|
||||||
|
matchingpos=$lastoflevel[$level]
|
||||||
|
levelpos[$pos]=$((level--))
|
||||||
|
if _zsh_highlight_brackets_match $matchingpos $pos; then
|
||||||
|
matching[$matchingpos]=$pos
|
||||||
|
matching[$pos]=$matchingpos
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
levelpos[$pos]=-1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
# Now highlight all found brackets
|
||||||
|
for pos in ${(k)levelpos}; do
|
||||||
|
if (( $+matching[$pos] )); then
|
||||||
|
if (( bracket_color_size )); then
|
||||||
|
_zsh_highlight_add_highlight $((pos - 1)) $pos bracket-level-$(( (levelpos[$pos] - 1) % bracket_color_size + 1 ))
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
_zsh_highlight_add_highlight $((pos - 1)) $pos bracket-error
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# If cursor is on a bracket, then highlight corresponding bracket, if any.
|
||||||
|
if [[ $WIDGET != zle-line-finish ]]; then
|
||||||
|
pos=$((CURSOR + 1))
|
||||||
|
if (( $+levelpos[$pos] )) && (( $+matching[$pos] )); then
|
||||||
|
local -i otherpos=$matching[$pos]
|
||||||
|
_zsh_highlight_add_highlight $((otherpos - 1)) $otherpos cursor-matchingbracket
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Helper function to differentiate type
|
||||||
|
_zsh_highlight_brackets_match()
|
||||||
|
{
|
||||||
|
case $BUFFER[$1] in
|
||||||
|
\() [[ $BUFFER[$2] == \) ]];;
|
||||||
|
\[) [[ $BUFFER[$2] == \] ]];;
|
||||||
|
\{) [[ $BUFFER[$2] == \} ]];;
|
||||||
|
*) false;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
_zsh_highlight_highlighter_brackets_paint "$@"
|
@ -0,0 +1,31 @@
|
|||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
# Copyright (c) 2010-2017 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
|
||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
[[ $WIDGET == zle-line-finish ]] || _zsh_highlight_cursor_moved || _zsh_highlight_buffer_modified
|
@ -36,72 +36,3 @@
|
|||||||
: ${ZSH_HIGHLIGHT_STYLES[bracket-level-4]:=fg=yellow,bold}
|
: ${ZSH_HIGHLIGHT_STYLES[bracket-level-4]:=fg=yellow,bold}
|
||||||
: ${ZSH_HIGHLIGHT_STYLES[bracket-level-5]:=fg=cyan,bold}
|
: ${ZSH_HIGHLIGHT_STYLES[bracket-level-5]:=fg=cyan,bold}
|
||||||
: ${ZSH_HIGHLIGHT_STYLES[cursor-matchingbracket]:=standout}
|
: ${ZSH_HIGHLIGHT_STYLES[cursor-matchingbracket]:=standout}
|
||||||
|
|
||||||
# Whether the brackets highlighter should be called or not.
|
|
||||||
_zsh_highlight_highlighter_brackets_predicate()
|
|
||||||
{
|
|
||||||
[[ $WIDGET == zle-line-finish ]] || _zsh_highlight_cursor_moved || _zsh_highlight_buffer_modified
|
|
||||||
}
|
|
||||||
|
|
||||||
# Brackets highlighting function.
|
|
||||||
_zsh_highlight_highlighter_brackets_paint()
|
|
||||||
{
|
|
||||||
local char style
|
|
||||||
local -i bracket_color_size=${#ZSH_HIGHLIGHT_STYLES[(I)bracket-level-*]} buflen=${#BUFFER} level=0 matchingpos pos
|
|
||||||
local -A levelpos lastoflevel matching
|
|
||||||
|
|
||||||
# Find all brackets and remember which one is matching
|
|
||||||
pos=0
|
|
||||||
for char in ${(s..)BUFFER} ; do
|
|
||||||
(( ++pos ))
|
|
||||||
case $char in
|
|
||||||
["([{"])
|
|
||||||
levelpos[$pos]=$((++level))
|
|
||||||
lastoflevel[$level]=$pos
|
|
||||||
;;
|
|
||||||
[")]}"])
|
|
||||||
if (( level > 0 )); then
|
|
||||||
matchingpos=$lastoflevel[$level]
|
|
||||||
levelpos[$pos]=$((level--))
|
|
||||||
if _zsh_highlight_brackets_match $matchingpos $pos; then
|
|
||||||
matching[$matchingpos]=$pos
|
|
||||||
matching[$pos]=$matchingpos
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
levelpos[$pos]=-1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
# Now highlight all found brackets
|
|
||||||
for pos in ${(k)levelpos}; do
|
|
||||||
if (( $+matching[$pos] )); then
|
|
||||||
if (( bracket_color_size )); then
|
|
||||||
_zsh_highlight_add_highlight $((pos - 1)) $pos bracket-level-$(( (levelpos[$pos] - 1) % bracket_color_size + 1 ))
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
_zsh_highlight_add_highlight $((pos - 1)) $pos bracket-error
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# If cursor is on a bracket, then highlight corresponding bracket, if any.
|
|
||||||
if [[ $WIDGET != zle-line-finish ]]; then
|
|
||||||
pos=$((CURSOR + 1))
|
|
||||||
if (( $+levelpos[$pos] )) && (( $+matching[$pos] )); then
|
|
||||||
local -i otherpos=$matching[$pos]
|
|
||||||
_zsh_highlight_add_highlight $((otherpos - 1)) $otherpos cursor-matchingbracket
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Helper function to differentiate type
|
|
||||||
_zsh_highlight_brackets_match()
|
|
||||||
{
|
|
||||||
case $BUFFER[$1] in
|
|
||||||
\() [[ $BUFFER[$2] == \) ]];;
|
|
||||||
\[) [[ $BUFFER[$2] == \] ]];;
|
|
||||||
\{) [[ $BUFFER[$2] == \} ]];;
|
|
||||||
*) false;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
33
highlighters/cursor/_zsh_highlight_highlighter_cursor_paint
Normal file
33
highlighters/cursor/_zsh_highlight_highlighter_cursor_paint
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
# Copyright (c) 2010-2011 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
|
||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
[[ $WIDGET == zle-line-finish ]] && return
|
||||||
|
|
||||||
|
_zsh_highlight_add_highlight $CURSOR $(( $CURSOR + 1 )) cursor
|
@ -0,0 +1,32 @@
|
|||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
# Copyright (c) 2010-2011 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
|
||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
# remove cursor highlighting when the line is finished
|
||||||
|
[[ $WIDGET == zle-line-finish ]] || _zsh_highlight_cursor_moved
|
@ -30,18 +30,3 @@
|
|||||||
|
|
||||||
# Define default styles.
|
# Define default styles.
|
||||||
: ${ZSH_HIGHLIGHT_STYLES[cursor]:=standout}
|
: ${ZSH_HIGHLIGHT_STYLES[cursor]:=standout}
|
||||||
|
|
||||||
# Whether the cursor highlighter should be called or not.
|
|
||||||
_zsh_highlight_highlighter_cursor_predicate()
|
|
||||||
{
|
|
||||||
# remove cursor highlighting when the line is finished
|
|
||||||
[[ $WIDGET == zle-line-finish ]] || _zsh_highlight_cursor_moved
|
|
||||||
}
|
|
||||||
|
|
||||||
# Cursor highlighting function.
|
|
||||||
_zsh_highlight_highlighter_cursor_paint()
|
|
||||||
{
|
|
||||||
[[ $WIDGET == zle-line-finish ]] && return
|
|
||||||
|
|
||||||
_zsh_highlight_add_highlight $CURSOR $(( $CURSOR + 1 )) cursor
|
|
||||||
}
|
|
||||||
|
31
highlighters/line/_zsh_highlight_highlighter_line_paint
Normal file
31
highlighters/line/_zsh_highlight_highlighter_line_paint
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
# Copyright (c) 2010-2011 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
|
||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
_zsh_highlight_add_highlight 0 $#BUFFER line
|
31
highlighters/line/_zsh_highlight_highlighter_line_predicate
Normal file
31
highlighters/line/_zsh_highlight_highlighter_line_predicate
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
# Copyright (c) 2010-2011 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
|
||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
_zsh_highlight_buffer_modified
|
@ -30,15 +30,3 @@
|
|||||||
|
|
||||||
# Define default styles.
|
# Define default styles.
|
||||||
: ${ZSH_HIGHLIGHT_STYLES[line]:=}
|
: ${ZSH_HIGHLIGHT_STYLES[line]:=}
|
||||||
|
|
||||||
# Whether the root highlighter should be called or not.
|
|
||||||
_zsh_highlight_highlighter_line_predicate()
|
|
||||||
{
|
|
||||||
_zsh_highlight_buffer_modified
|
|
||||||
}
|
|
||||||
|
|
||||||
# root highlighting function.
|
|
||||||
_zsh_highlight_highlighter_line_paint()
|
|
||||||
{
|
|
||||||
_zsh_highlight_add_highlight 0 $#BUFFER line
|
|
||||||
}
|
|
||||||
|
1756
highlighters/main/_zsh_highlight_highlighter_main_paint
Normal file
1756
highlighters/main/_zsh_highlight_highlighter_main_paint
Normal file
File diff suppressed because it is too large
Load Diff
32
highlighters/main/_zsh_highlight_highlighter_main_predicate
Normal file
32
highlighters/main/_zsh_highlight_highlighter_main_predicate
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
# 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
|
||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
# may need to remove path_prefix highlighting when the line ends
|
||||||
|
[[ $WIDGET == zle-line-finish ]] || _zsh_highlight_buffer_modified
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,53 @@
|
|||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
# Copyright (c) 2010-2011 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
|
||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
# Pattern syntax highlighting function.
|
||||||
|
_zsh_highlight_highlighter_pattern_paint()
|
||||||
|
{
|
||||||
|
setopt localoptions extendedglob
|
||||||
|
local pattern
|
||||||
|
for pattern in ${(k)ZSH_HIGHLIGHT_PATTERNS}; do
|
||||||
|
_zsh_highlight_pattern_highlighter_loop "$BUFFER" "$pattern"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
_zsh_highlight_pattern_highlighter_loop()
|
||||||
|
{
|
||||||
|
# This does *not* do its job syntactically, sorry.
|
||||||
|
local buf="$1" pat="$2"
|
||||||
|
local -a match mbegin mend
|
||||||
|
local MATCH; integer MBEGIN MEND
|
||||||
|
if [[ "$buf" == (#b)(*)(${~pat})* ]]; then
|
||||||
|
region_highlight+=("$((mbegin[2] - 1)) $mend[2] $ZSH_HIGHLIGHT_PATTERNS[$pat], memo=zsh-syntax-highlighting")
|
||||||
|
"$0" "$match[1]" "$pat"; return $?
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
_zsh_highlight_highlighter_pattern_paint "$@"
|
@ -0,0 +1,31 @@
|
|||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
# Copyright (c) 2010-2011 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
|
||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
_zsh_highlight_buffer_modified
|
@ -30,31 +30,3 @@
|
|||||||
|
|
||||||
# List of keyword and color pairs.
|
# List of keyword and color pairs.
|
||||||
typeset -gA ZSH_HIGHLIGHT_PATTERNS
|
typeset -gA ZSH_HIGHLIGHT_PATTERNS
|
||||||
|
|
||||||
# Whether the pattern highlighter should be called or not.
|
|
||||||
_zsh_highlight_highlighter_pattern_predicate()
|
|
||||||
{
|
|
||||||
_zsh_highlight_buffer_modified
|
|
||||||
}
|
|
||||||
|
|
||||||
# Pattern syntax highlighting function.
|
|
||||||
_zsh_highlight_highlighter_pattern_paint()
|
|
||||||
{
|
|
||||||
setopt localoptions extendedglob
|
|
||||||
local pattern
|
|
||||||
for pattern in ${(k)ZSH_HIGHLIGHT_PATTERNS}; do
|
|
||||||
_zsh_highlight_pattern_highlighter_loop "$BUFFER" "$pattern"
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
_zsh_highlight_pattern_highlighter_loop()
|
|
||||||
{
|
|
||||||
# This does *not* do its job syntactically, sorry.
|
|
||||||
local buf="$1" pat="$2"
|
|
||||||
local -a match mbegin mend
|
|
||||||
local MATCH; integer MBEGIN MEND
|
|
||||||
if [[ "$buf" == (#b)(*)(${~pat})* ]]; then
|
|
||||||
region_highlight+=("$((mbegin[2] - 1)) $mend[2] $ZSH_HIGHLIGHT_PATTERNS[$pat], memo=zsh-syntax-highlighting")
|
|
||||||
"$0" "$match[1]" "$pat"; return $?
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
55
highlighters/regexp/_zsh_highlight_highlighter_regexp_paint
Normal file
55
highlighters/regexp/_zsh_highlight_highlighter_regexp_paint
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
# Copyright (c) 2010-2016 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
|
||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
# Pattern syntax highlighting function.
|
||||||
|
_zsh_highlight_highlighter_regexp_paint()
|
||||||
|
{
|
||||||
|
setopt localoptions extendedglob
|
||||||
|
local pattern
|
||||||
|
for pattern in ${(k)ZSH_HIGHLIGHT_REGEXP}; do
|
||||||
|
_zsh_highlight_regexp_highlighter_loop "$BUFFER" "$pattern"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
_zsh_highlight_regexp_highlighter_loop()
|
||||||
|
{
|
||||||
|
local buf="$1" pat="$2"
|
||||||
|
integer OFFSET=0
|
||||||
|
local MATCH; integer MBEGIN MEND
|
||||||
|
local -a match mbegin mend
|
||||||
|
while true; do
|
||||||
|
[[ "$buf" =~ "$pat" ]] || return;
|
||||||
|
region_highlight+=("$((MBEGIN - 1 + OFFSET)) $((MEND + OFFSET)) $ZSH_HIGHLIGHT_REGEXP[$pat], memo=zsh-syntax-highlighting")
|
||||||
|
buf="$buf[$(($MEND+1)),-1]"
|
||||||
|
OFFSET=$((MEND+OFFSET));
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
_zsh_highlight_highlighter_regexp_paint "$@"
|
@ -0,0 +1,31 @@
|
|||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
# Copyright (c) 2010-2016 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
|
||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
_zsh_highlight_buffer_modified
|
@ -30,33 +30,3 @@
|
|||||||
|
|
||||||
# List of keyword and color pairs.
|
# List of keyword and color pairs.
|
||||||
typeset -gA ZSH_HIGHLIGHT_REGEXP
|
typeset -gA ZSH_HIGHLIGHT_REGEXP
|
||||||
|
|
||||||
# Whether the pattern highlighter should be called or not.
|
|
||||||
_zsh_highlight_highlighter_regexp_predicate()
|
|
||||||
{
|
|
||||||
_zsh_highlight_buffer_modified
|
|
||||||
}
|
|
||||||
|
|
||||||
# Pattern syntax highlighting function.
|
|
||||||
_zsh_highlight_highlighter_regexp_paint()
|
|
||||||
{
|
|
||||||
setopt localoptions extendedglob
|
|
||||||
local pattern
|
|
||||||
for pattern in ${(k)ZSH_HIGHLIGHT_REGEXP}; do
|
|
||||||
_zsh_highlight_regexp_highlighter_loop "$BUFFER" "$pattern"
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
_zsh_highlight_regexp_highlighter_loop()
|
|
||||||
{
|
|
||||||
local buf="$1" pat="$2"
|
|
||||||
integer OFFSET=0
|
|
||||||
local MATCH; integer MBEGIN MEND
|
|
||||||
local -a match mbegin mend
|
|
||||||
while true; do
|
|
||||||
[[ "$buf" =~ "$pat" ]] || return;
|
|
||||||
region_highlight+=("$((MBEGIN - 1 + OFFSET)) $((MEND + OFFSET)) $ZSH_HIGHLIGHT_REGEXP[$pat], memo=zsh-syntax-highlighting")
|
|
||||||
buf="$buf[$(($MEND+1)),-1]"
|
|
||||||
OFFSET=$((MEND+OFFSET));
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
31
highlighters/root/_zsh_highlight_highlighter_root_paint
Normal file
31
highlighters/root/_zsh_highlight_highlighter_root_paint
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
# Copyright (c) 2010-2011 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
|
||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
if (( EUID == 0 )) { _zsh_highlight_add_highlight 0 $#BUFFER root }
|
31
highlighters/root/_zsh_highlight_highlighter_root_predicate
Normal file
31
highlighters/root/_zsh_highlight_highlighter_root_predicate
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
# Copyright (c) 2010-2011 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
|
||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
_zsh_highlight_buffer_modified
|
@ -30,15 +30,3 @@
|
|||||||
|
|
||||||
# Define default styles.
|
# Define default styles.
|
||||||
: ${ZSH_HIGHLIGHT_STYLES[root]:=standout}
|
: ${ZSH_HIGHLIGHT_STYLES[root]:=standout}
|
||||||
|
|
||||||
# Whether the root highlighter should be called or not.
|
|
||||||
_zsh_highlight_highlighter_root_predicate()
|
|
||||||
{
|
|
||||||
_zsh_highlight_buffer_modified
|
|
||||||
}
|
|
||||||
|
|
||||||
# root highlighting function.
|
|
||||||
_zsh_highlight_highlighter_root_paint()
|
|
||||||
{
|
|
||||||
if (( EUID == 0 )) { _zsh_highlight_add_highlight 0 $#BUFFER root }
|
|
||||||
}
|
|
||||||
|
@ -27,94 +27,15 @@
|
|||||||
# vim: ft=zsh sw=2 ts=2 et
|
# 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.
|
# Set $0 to the expected value, regardless of functionargzero.
|
||||||
0=${(%):-%N}
|
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 a function has been marked for autoloading
|
|
||||||
# but is not available in $fpath, then this function will return False therefor.
|
|
||||||
#
|
|
||||||
# See users/21671 http://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 http://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.
|
# Update ZLE buffer syntax highlighting.
|
||||||
#
|
#
|
||||||
# Invokes each highlighter that needs updating.
|
# Invokes each highlighter that needs updating.
|
||||||
# This function is supposed to be called whenever the ZLE state changes.
|
# This function is supposed to be called whenever the ZLE state changes.
|
||||||
|
#
|
||||||
|
# This function must not be defined or run under emulate zsh so zsyh_user_options is correct.
|
||||||
_zsh_highlight()
|
_zsh_highlight()
|
||||||
{
|
{
|
||||||
# Store the previous command return code to restore it whatever happens.
|
# Store the previous command return code to restore it whatever happens.
|
||||||
@ -129,50 +50,6 @@ _zsh_highlight()
|
|||||||
return $ret
|
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.
|
|
||||||
#
|
|
||||||
# The memo= feature was added to zsh in commit zsh-5.8-172-gdd6e702ee.
|
|
||||||
# The version number at the time was 5.8.0.2-dev (see Config/version.mk).
|
|
||||||
# Therefore, on 5.8.0.3 and newer the memo= feature is available.
|
|
||||||
#
|
|
||||||
# On zsh version 5.8.0.2 between the aforementioned commit and the
|
|
||||||
# first Config/version.mk bump after it (which, at the time of writing,
|
|
||||||
# is yet to come), this condition will false negative.
|
|
||||||
if is-at-least 5.8.0.3 $ZSH_VERSION.0.0; 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
|
# Reset region_highlight to build it from scratch
|
||||||
if (( zsh_highlight__memo_feature )); then
|
if (( zsh_highlight__memo_feature )); then
|
||||||
region_highlight=( "${(@)region_highlight:#*memo=zsh-syntax-highlighting*}" )
|
region_highlight=( "${(@)region_highlight:#*memo=zsh-syntax-highlighting*}" )
|
||||||
@ -210,184 +87,12 @@ _zsh_highlight()
|
|||||||
fi
|
fi
|
||||||
typeset -r zsyh_user_options
|
typeset -r zsyh_user_options
|
||||||
|
|
||||||
emulate -L zsh
|
_zsh_highlight_internal
|
||||||
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
|
return ret
|
||||||
# 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).
|
|
||||||
[[ $PENDING -gt 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
|
emulate zsh -c 'source ${0:h}/driver.zsh'
|
||||||
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
|
# Helper for _zsh_highlight_bind_widgets
|
||||||
# $1 is name of widget to call
|
# $1 is name of widget to call
|
||||||
@ -508,90 +213,11 @@ else
|
|||||||
}
|
}
|
||||||
fi
|
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.
|
# Try binding widgets.
|
||||||
_zsh_highlight_bind_widgets || {
|
_zsh_highlight_bind_widgets || {
|
||||||
print -r -- >&2 'zsh-syntax-highlighting: failed binding ZLE widgets, exiting.'
|
print -r -- >&2 'zsh-syntax-highlighting: failed binding ZLE widgets, exiting.'
|
||||||
return 1
|
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 $?.
|
# Set $?.
|
||||||
true
|
true
|
||||||
|
Loading…
Reference in New Issue
Block a user