Pre-command-word redirection as unknown-token

[danielshahaf]

% git checkout 0.7.1
% tests/generate.zsh '<$fn cat' main redirection-from-param $'touch file\nlocal fn=$PWD/file' 
Set copyright year to 2020? y
touch file
local fn=$PWD/file

BUFFER=$'<$fn cat'

expected_region_highlight=(
  '1 1 redirection' # <
  '2 4 path' # $fn
  '6 8 default' # cat
)

% git checkout upstream
% tests/generate.zsh '<$fn cat' main redirection-from-param $'touch file\nlocal fn=$PWD/file' 
Set copyright year to 2020? y
touch file
local fn=$PWD/file

BUFFER=$'<$fn cat'

expected_region_highlight=(
  '1 1 redirection' # <
  '2 4 unknown-token' # $fn
  '6 8 default' # cat
)

It works fine if the command is changed to cat <$fn or if a chmod +x file is run. Something should probably be checking $in_redirection in addition to :start:.

[danielshahaf]

Bisected to 5545fb9.

[danielshahaf]

Patch that fixes the problem

diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
index 456e3e7..4c22bb0 100644
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -529,6 +529,16 @@ _zsh_highlight_main_highlighter_highlight_list()
     last_arg=$arg
     arg=$args[1]
     shift args
+
+    # Initialize this_word and next_word.
+    if (( in_redirection == 0 )); then
+      this_word=$next_word
+      next_word=':regular:'
+    elif (( !in_param )); then
+      # Stall $next_word.
+      (( --in_redirection ))
+    fi
+
     if (( in_alias )); then
       (( in_alias-- ))
       if (( in_alias == 0 )); then
@@ -546,15 +556,6 @@ _zsh_highlight_main_highlighter_highlight_list()
       fi
     fi
 
-    # Initialize this_word and next_word.
-    if (( in_redirection == 0 )); then
-      this_word=$next_word
-      next_word=':regular:'
-    else
-      # Stall $next_word.
-      (( --in_redirection ))
-    fi
-
     # Initialize per-"simple command" [zshmisc(1)] variables:
     #
     #   $style               how to highlight $arg
diff --git a/highlighters/main/test-data/redirection-from-param.zsh b/highlighters/main/test-data/redirection-from-param.zsh
index 41bf652..13a4e42 100644
--- a/highlighters/main/test-data/redirection-from-param.zsh
+++ b/highlighters/main/test-data/redirection-from-param.zsh
@@ -35,6 +35,6 @@ BUFFER=$'<$fn cat'
 
 expected_region_highlight=(
   '1 1 redirection' # <
-  '2 4 path "issue #712"' # $fn
+  '2 4 path' # $fn
   '6 8 default' # cat
 )

Drive-by patch for possible other `$in_redirection` issues

diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
index 4c22bb0..a6e9352 100644
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -564,7 +564,7 @@ _zsh_highlight_main_highlighter_highlight_list()
     #   $saw_assignment      boolean flag for "was preceded by an assignment"
     #
     style=unknown-token
-    if [[ $this_word == *':start:'* ]]; then
+    if (( ! in_redirection )) && [[ $this_word == *':start:'* ]]; then
       in_array_assignment=false
       if [[ $arg == 'noglob' ]]; then
         highlight_glob=false
@@ -1021,7 +1021,7 @@ _zsh_highlight_main_highlighter_highlight_list()
                           fi
                           _zsh_highlight_main__stack_pop 'R' reserved-word
                         else
-                          if _zsh_highlight_main_highlighter_check_path $arg 1; then
+                          if _zsh_highlight_main_highlighter_check_path $arg $(( in_redirection == 0 )); then
                             style=$REPLY
                           else
                             style=unknown-token