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

'main': Fix the $CDPATH from the previous commit.

Browse Source
This commit is contained in:
Daniel Shahaf 2020-01-12 19:37:53 +00:00
parent 6629a1f432
commit 08edf8db7f
2 changed files with 7 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

@ -986,10 +986,12 @@ _zsh_highlight_main_highlighter_check_path()
[[ -e $expanded_path ]] && return 0 [[ -e $expanded_path ]] && return 0
# Search the path in CDPATH # Search the path in CDPATH
local cdpath_dir if [[ $expanded_path != /* ]]; then
for cdpath_dir in $cdpath ; do local cdpath_dir
[[ -e "$cdpath_dir/$expanded_path" ]] && return 0 for cdpath_dir in $cdpath ; do
done [[ -e "$cdpath_dir/$expanded_path" ]] && return 0
done
fi
# If dirname($1) doesn't exist, neither does $1. # If dirname($1) doesn't exist, neither does $1.
[[ ! -d ${expanded_path:h} ]] && return 1 [[ ! -d ${expanded_path:h} ]] && return 1

2
highlighters/main/test-data/cdpath-abspath.zsh
View File

@ -34,5 +34,5 @@ mkdir foo foo/bar
BUFFER="/foo" BUFFER="/foo"
expected_region_highlight=( expected_region_highlight=(
'1 4 unknown-token "fixed in the next commit"' # x (/) '1 4 unknown-token' # x (/)
) )