浏览代码

Merge remote-tracking branch 'upstream/pr/179'

* upstream/pr/179:
  Don't parse first word of array assignment as command
pull/175/merge
Daniel Shahaf 9 年前
父节点
当前提交
51aed8a765
共有 2 个文件被更改,包括 7 次插入2 次删除
  1. +5
    -1
      highlighters/main/main-highlighter.zsh
  2. +2
    -1
      highlighters/main/test-data/assign.zsh

+ 5
- 1
highlighters/main/main-highlighter.zsh 查看文件

@ -160,7 +160,11 @@ _zsh_highlight_main_highlighter()
*': hashed') style=$ZSH_HIGHLIGHT_STYLES[hashed-command];;
*) if _zsh_highlight_main_highlighter_check_assign; then
style=$ZSH_HIGHLIGHT_STYLES[assign]
new_expression=true
if [[ $arg[-1] != '(' ]]; then
# assignment to a scalar parameter.
# (For array assignments, the command doesn't start until the ")" token.)
new_expression=true
fi
elif _zsh_highlight_main_highlighter_check_path; then
style=$ZSH_HIGHLIGHT_STYLES[path]
elif [[ $arg[0,1] == $histchars[0,1] || $arg[0,1] == $histchars[2,2] ]]; then

+ 2
- 1
highlighters/main/test-data/assign.zsh 查看文件

@ -28,8 +28,9 @@
# vim: ft=zsh sw=2 ts=2 et
# -------------------------------------------------------------------------------------------------
BUFFER='A=1'
BUFFER='A=1 b=("foo" bar)'
expected_region_highlight=(
"1 3 $ZSH_HIGHLIGHT_STYLES[assign]" # A=1
"8 12 $ZSH_HIGHLIGHT_STYLES[double-quoted-argument]" # "foo"
)

正在加载...
取消
保存