From 79e8c2dd48eca06161051f5fb4b4993365966a7d Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Fri, 25 Sep 2015 12:50:39 +0000
Subject: [PATCH] Don't highlight syntax elements as paths.
Without this, redirections, history expansions, and command separators would
be matched by path_approx.
A test case is simply LBUFFER="<" RBUFFER="" (highlighted as redirection with this
fix and as path_approx without it).
Fixes zsh-users/zsh-syntax-highlighting#204.
---
highlighters/main/main-highlighter.zsh | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
index a71c94f..27f35a3 100755
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -178,15 +178,17 @@ _zsh_highlight_main_highlighter()
# (For array assignments, the command doesn't start until the ")" token.)
new_expression=true; highlight_glob=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
style=$ZSH_HIGHLIGHT_STYLES[history-expansion]
elif [[ $arg[1] == '<' || $arg[1] == '>' ]]; then
style=$ZSH_HIGHLIGHT_STYLES[redirection]
redirection=true
else
- style=$ZSH_HIGHLIGHT_STYLES[unknown-token]
+ if _zsh_highlight_main_highlighter_check_path; then
+ style=$ZSH_HIGHLIGHT_STYLES[path]
+ else
+ style=$ZSH_HIGHLIGHT_STYLES[unknown-token]
+ fi
fi
;;
esac
@@ -212,8 +214,7 @@ _zsh_highlight_main_highlighter()
;;
'`'*) style=$ZSH_HIGHLIGHT_STYLES[back-quoted-argument];;
*[*?]*) $highlight_glob && style=$ZSH_HIGHLIGHT_STYLES[globbing] || style=$ZSH_HIGHLIGHT_STYLES[default];;
- *) if _zsh_highlight_main_highlighter_check_path; then
- style=$ZSH_HIGHLIGHT_STYLES[path]
+ *) if false; then
elif [[ $arg[0,1] = $histchars[0,1] ]]; then
style=$ZSH_HIGHLIGHT_STYLES[history-expansion]
elif [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR:#"$arg"} ]]; then
@@ -221,7 +222,11 @@ _zsh_highlight_main_highlighter()
elif [[ $arg[1] == '<' || $arg[1] == '>' ]]; then
style=$ZSH_HIGHLIGHT_STYLES[redirection]
else
- style=$ZSH_HIGHLIGHT_STYLES[default]
+ if _zsh_highlight_main_highlighter_check_path; then
+ style=$ZSH_HIGHLIGHT_STYLES[path]
+ else
+ style=$ZSH_HIGHLIGHT_STYLES[default]
+ fi
fi
;;
esac