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

main: Remove quotes before tilde expansion

Browse Source
This commit is contained in:
Matthew Martin 2018-02-11 13:03:56 -06:00
parent 565463ca8f
commit d08d5ef7c5
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1235,8 +1235,11 @@ _zsh_highlight_main_highlighter_expand_path()
# The $~1 syntax normally performs filename generation, but not when it's on the right-hand side of ${x:=y}.
setopt localoptions nonomatch
unset REPLY
: ${REPLY:=${(Q)${~1}}}
if [[ ${1[1]} == '~' ]]; then
REPLY=${~${(Q)1}}
else
REPLY=${(Q)1}
fi
}
# -------------------------------------------------------------------------------------------------

6
highlighters/main/test-data/path-tilde-named.zsh
View File

@ -31,9 +31,11 @@ mkdir mydir
touch mydir/path-tilde-named.test
hash -d D=mydir
BUFFER='ls ~D/path-tilde-named.test'
BUFFER='ls ~D/path-tilde-named.test ~"D"'
expected_region_highlight=(
"1 2 command" # ls
"4 27 path" # ~D/path-tilde-named.test
"4 27 path" # ~D/path-tilde-named.test
"29 32 path" # ~"D"
"30 32 double-quoted-argument" # "D"
)