From 38c794a978cdbe9e82156029fc3ae888e2b6b075 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <danielsh@apache.org>
Date: Mon, 22 Oct 2018 04:30:43 +0000
Subject: [PATCH] 'main': Highlight named fd redirections.

Fixes #238
---
 docs/highlighters/main.md                         |  1 +
 highlighters/main/main-highlighter.zsh            | 11 +++++++++--
 highlighters/main/test-data/exec-redirection1.zsh |  4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/docs/highlighters/main.md b/docs/highlighters/main.md
index 6ff2bd8..005fc4d 100644
--- a/docs/highlighters/main.md
+++ b/docs/highlighters/main.md
@@ -58,6 +58,7 @@ This highlighter defines the following styles:
 * `assign` - parameter assignments (`x=foo` and `x=( )`)
 * `redirection` - redirection operators (`<`, `>`, etc)
 * `comment` - comments, when `setopt INTERACTIVE_COMMENTS` is in effect (`echo # foo`)
+* `named-fd` - named file descriptor (`echo foo {fd}>&2`)
 * `arg0` - a command word other than one of those enumerated above (other than a command, precommand, alias, function, or shell builtin command).
 * `default` - everything else
 
diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
index c6bf1b3..89b2fdb 100644
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -58,6 +58,7 @@
 : ${ZSH_HIGHLIGHT_STYLES[assign]:=none}
 : ${ZSH_HIGHLIGHT_STYLES[redirection]:=none}
 : ${ZSH_HIGHLIGHT_STYLES[comment]:=fg=black,bold}
+: ${ZSH_HIGHLIGHT_STYLES[named-fd]:=none}
 : ${ZSH_HIGHLIGHT_STYLES[arg0]:=fg=green}
 
 # Whether the highlighter should be called or not.
@@ -552,13 +553,19 @@ _zsh_highlight_main_highlighter_highlight_list()
 
     # Analyse the current word.
     if _zsh_highlight_main__is_redirection $arg ; then
-      if (( in_redirection )); then
+      if (( in_redirection && in_redirection != 2 )); then
+        # The condition excludes the case that BUFFER='{foo}>&2' and we're on the '>&'.
         _zsh_highlight_main_add_region_highlight $start_pos $end_pos unknown-token
       else
         in_redirection=2
         _zsh_highlight_main_add_region_highlight $start_pos $end_pos redirection
       fi
       continue
+    elif [[ $arg == '{'*'}' ]] && _zsh_highlight_main__is_redirection $args[1]; then
+      # named file descriptor: {foo}>&2
+      in_redirection=3
+      _zsh_highlight_main_add_region_highlight $start_pos $end_pos named-fd
+      continue
     fi
 
     # Expand parameters.
@@ -864,7 +871,7 @@ _zsh_highlight_main_highlighter_highlight_list()
                  elif [[ $arg == $'\x5d' ]] && _zsh_highlight_main__stack_pop 'Q' builtin; then
                    :
                  else
-                   _zsh_highlight_main_highlighter_highlight_argument 1 $(( 1 - in_redirection ))
+                   _zsh_highlight_main_highlighter_highlight_argument 1 $(( 1 != in_redirection ))
                    continue
                  fi
                  ;;
diff --git a/highlighters/main/test-data/exec-redirection1.zsh b/highlighters/main/test-data/exec-redirection1.zsh
index caec2f1..78a0c62 100644
--- a/highlighters/main/test-data/exec-redirection1.zsh
+++ b/highlighters/main/test-data/exec-redirection1.zsh
@@ -31,8 +31,8 @@ BUFFER='exec {foo}>&/tmp ls'
 
 expected_region_highlight=(
   "1 4 precommand" # exec
-  "6 10 redirection 'issue #238'" # {foo}
+  "6 10 named-fd" # {foo}
   "11 12 redirection" # >&
   "13 16 path" # /tmp
-  "18 19 command 'issue #238'" # ls
+  "18 19 command" # ls
 )