Skip to content

'main': Internal cleanup: drop $style_override. #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 1, 2016
Merged

'main': Internal cleanup: drop $style_override. #326

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions highlighters/main/main-highlighter.zsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,6 @@ _zsh_highlight_main_highlighter()
# which add the entry early so escape sequences within the string override
# the string's color.
integer already_added=0
local style_override=""
if [[ $this_word == *':start:'* ]]; then
in_array_assignment=false
if [[ $arg == 'noglob' ]]; then
Expand Down Expand Up @@ -456,7 +455,7 @@ _zsh_highlight_main_highlighter()
style=reserved-word
else
if _zsh_highlight_main_highlighter_check_path; then
style=path
style=$REPLY
else
style=unknown-token
fi
Expand Down Expand Up @@ -507,16 +506,14 @@ _zsh_highlight_main_highlighter()
(( in_redirection=2 ))
else
if _zsh_highlight_main_highlighter_check_path; then
style=path
style=$REPLY
else
style=default
fi
fi
;;
esac
fi
# if a style_override was set (eg in _zsh_highlight_main_highlighter_check_path), use it
[[ -n $style_override ]] && style=$style_override
(( already_added )) || _zsh_highlight_main_add_region_highlight $start_pos $end_pos $style
if [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR:#"$arg"} ]]; then
next_word=':start:'
Expand Down Expand Up @@ -547,11 +544,15 @@ _zsh_highlight_main_highlighter_check_assign()
}

# Check if $arg is a path.
# If yes, return 0 and in $REPLY the style to use.
# Else, return non-zero (and the contents of $REPLY is undefined).
_zsh_highlight_main_highlighter_check_path()
{
_zsh_highlight_main_highlighter_expand_path $arg;
local expanded_path="$REPLY"

REPLY=path

[[ -z $expanded_path ]] && return 1
[[ -e $expanded_path ]] && return 0

Expand All @@ -569,7 +570,7 @@ _zsh_highlight_main_highlighter_check_path()
[[ $WIDGET != accept-* ]]; then
local -a tmp
tmp=( ${expanded_path}*(N) )
(( $#tmp > 0 )) && style_override=path_prefix && return 0
(( $#tmp > 0 )) && REPLY=path_prefix && return 0
fi

# It's not a path.
Expand Down