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

Merge b7a9e29cf0 into 90fec4d658

Browse source
This commit is contained in:
Daniel Shahaf 2020-04-01 05:48:19 -04:00 • committed by GitHub
commit 260a80e330
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 92 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
highlighters/main/main-highlighter.zsh
View file

@ -423,7 +423,7 @@ _zsh_highlight_highlighter_main_paint()
# Try to expand $1, if it's possible to do so safely.
#
# Uses two parameters from the caller: $parameter_name_pattern and $res.
# Uses one parameter from the caller: $parameter_name_pattern.
#
# If expansion was done, set $reply to the expansion and return true.
# Otherwise, return false.
@ -448,7 +448,7 @@ _zsh_highlight_main_highlighter__try_expand_parameter()
else
parameter_name=${arg:1}
fi
if [[ $res == none ]] && zmodload -e zsh/parameter &&
if zmodload -e zsh/parameter &&
[[ ${parameter_name} =~ ^${~parameter_name_pattern}$ ]] &&
[[ ${parameters[(e)$MATCH]} != *special* ]]
then
@ -746,8 +746,10 @@ _zsh_highlight_main_highlighter_highlight_list()
(( in_param = 1 + $#words ))
args=( $words $args )
arg=$args[1]
_zsh_highlight_main__type "$arg" 0
res=$REPLY
if [[ $this_word == *':start:'* ]] && ! (( in_redirection )); then
_zsh_highlight_main__type "$arg" 0
res=$REPLY
fi
fi
}
fi
@ -1143,7 +1145,11 @@ _zsh_highlight_main_highlighter_highlight_path_separators()
local pos style_pathsep
style_pathsep=$1_pathseparator
reply=()
[[ -z "$ZSH_HIGHLIGHT_STYLES[$style_pathsep]" || "$ZSH_HIGHLIGHT_STYLES[$1]" == "$ZSH_HIGHLIGHT_STYLES[$style_pathsep]" ]] && return 0
if (( in_param || in_alias )) ||
[[ -z "$ZSH_HIGHLIGHT_STYLES[$style_pathsep]" || "$ZSH_HIGHLIGHT_STYLES[$1]" == "$ZSH_HIGHLIGHT_STYLES[$style_pathsep]" ]]
then
return 0
fi
for (( pos = start_pos; $pos <= end_pos; pos++ )) ; do
if [[ $BUFFER[pos] == / ]]; then
reply+=($((pos - 1)) $pos $style_pathsep)
@ -1298,7 +1304,7 @@ _zsh_highlight_main_highlighter_highlight_argument()
fi
esac
for (( ; i <= $#arg ; i += 1 )); do
for (( ; i <= $#arg && ! in_param ; i += 1 )); do
case "$arg[$i]" in
"\\") (( i += 1 )); continue;;
"'")
@ -1385,7 +1391,7 @@ _zsh_highlight_main_highlighter_highlight_argument()
done
if (( path_eligible )); then
if (( in_redirection )) && [[ $last_arg == *['<>']['&'] && $arg[$1,-1] == (<0->|p|-) ]]; then
if (( in_redirection && ! in_param )) && [[ $last_arg == *['<>']['&'] && $arg[$1,-1] == (<0->|p|-) ]]; then
if [[ $arg[$1,-1] == (p|-) ]]; then
base_style=redirection
else