stonewareslord/zsh-syntax-highlighting
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

main: Make _check_path's argument explicit

Browse Source 
No functional change.
This commit is contained in:
Matthew Martin 2018-03-21 19:24:53 -05:00
parent 57e451b531
commit 13d332af95
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
highlighters/main/main-highlighter.zsh
View File

@ -664,7 +664,7 @@ _zsh_highlight_main_highlighter_highlight_list()
fi fi
_zsh_highlight_main__stack_pop 'R' reserved-word _zsh_highlight_main__stack_pop 'R' reserved-word
else else
if _zsh_highlight_main_highlighter_check_path; then if _zsh_highlight_main_highlighter_check_path $arg; then
style=$REPLY style=$REPLY
else else
style=unknown-token style=unknown-token
@ -789,12 +789,12 @@ _zsh_highlight_main_highlighter_highlight_path_separators()
done done
} }
# Check if $arg is a path. # Check if $1 is a path.
# If yes, return 0 and in $REPLY the style to use. # If yes, return 0 and in $REPLY the style to use.
# Else, return non-zero (and the contents of $REPLY is undefined). # Else, return non-zero (and the contents of $REPLY is undefined).
_zsh_highlight_main_highlighter_check_path() _zsh_highlight_main_highlighter_check_path()
{ {
_zsh_highlight_main_highlighter_expand_path $arg; _zsh_highlight_main_highlighter_expand_path $1
local expanded_path="$REPLY" tmp_path local expanded_path="$REPLY" tmp_path
REPLY=path REPLY=path
@ -823,7 +823,7 @@ _zsh_highlight_main_highlighter_check_path()
[[ -e "$cdpath_dir/$expanded_path" ]] && return 0 [[ -e "$cdpath_dir/$expanded_path" ]] && return 0
done done
# If dirname($arg) doesn't exist, neither does $arg. # If dirname($1) doesn't exist, neither does $1.
[[ ! -d ${expanded_path:h} ]] && return 1 [[ ! -d ${expanded_path:h} ]] && return 1
# If this word ends the buffer, check if it's the prefix of a valid path. # If this word ends the buffer, check if it's the prefix of a valid path.
@ -928,7 +928,7 @@ _zsh_highlight_main_highlighter_highlight_argument()
esac esac
done done
if (( path_eligible )) && _zsh_highlight_main_highlighter_check_path; then if (( path_eligible )) && _zsh_highlight_main_highlighter_check_path $arg; then
base_style=$REPLY base_style=$REPLY
_zsh_highlight_main_highlighter_highlight_path_separators $base_style _zsh_highlight_main_highlighter_highlight_path_separators $base_style
highlights+=($reply) highlights+=($reply)