From 2f03b6d704afd172d5fdf73ca5ebde8be5824056 Mon Sep 17 00:00:00 2001
From: Matthew Martin <phy1729@gmail.com>
Date: Mon, 1 Oct 2018 18:14:56 -0400
Subject: [PATCH] main: Do not highlight a redirection target as an option
---
highlighters/main/main-highlighter.zsh | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
index 6930ec2..167aa73 100644
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -829,7 +829,7 @@ _zsh_highlight_main_highlighter_highlight_list()
style=unknown-token
fi
else
- _zsh_highlight_main_highlighter_highlight_argument 1
+ _zsh_highlight_main_highlighter_highlight_argument 1 $(( 1 - in_redirection ))
continue
fi
;;
@@ -926,9 +926,10 @@ _zsh_highlight_main_highlighter_check_path()
# Highlight an argument and possibly special chars in quotes starting at $1 in $arg
# This command will at least highlight $1 to end_pos with the default style
+# If $2 is set to 0, the argument cannot be highlighted as an option.
_zsh_highlight_main_highlighter_highlight_argument()
{
- local base_style=default i=$1 path_eligible=1 ret start style
+ local base_style=default i=$1 option_eligible=${2:-1} path_eligible=1 ret start style
local -a highlights
local -a match mbegin mend
@@ -936,12 +937,14 @@ _zsh_highlight_main_highlighter_highlight_argument()
case "$arg[i]" in
'-')
- if [[ $arg[i+1] == - ]]; then
- base_style=double-hyphen-option
- else
- base_style=single-hyphen-option
+ if (( option_eligible )); then
+ if [[ $arg[i+1] == - ]]; then
+ base_style=double-hyphen-option
+ else
+ base_style=single-hyphen-option
+ fi
+ path_eligible=0
fi
- path_eligible=0
;;
'=')
if [[ $arg[i+1] == $'\x28' ]]; then