main: Run the entirety of aliases through the state machine

Fixes zsh-users#544 zsh-users#552 zsh-users#554 zsh-users#555

Author: phy1729

highlighters/main/main-highlighter.zsh

@@ -72,6 +72,9 @@ _zsh_highlight_main_add_region_highlight() {
   integer start=$1 end=$2
   shift 2
 
+  (( in_alias > 0 )) && return
+  (( in_alias < 0 )) && in_alias=$(( 0 - in_alias ))
+
   # The calculation was relative to $buf but region_highlight is relative to $BUFFER.
   (( start += buf_offset ))
   (( end += buf_offset ))
@@ -363,10 +366,13 @@ _zsh_highlight_highlighter_main_paint()
 _zsh_highlight_main_highlighter_highlight_list()
 {
   integer start_pos end_pos=0 buf_offset=$1 has_end=$3
-  local buf=$4 highlight_glob=true arg arg_raw style
+  local arg buf=$4 highlight_glob=true last_alias style
   local in_array_assignment=false # true between 'a=(' and the matching ')'
-  integer len=$#buf
+  # in_alias is set to -<number of (z)-args from expanding the alias>
+  # After processing the first arg, invert and decrement, so no additional styles are applied.
+  integer in_alias=0 len=$#buf
   local -a match mbegin mend list_highlights
+  local -A seen_alias
   list_highlights=()
 
   # "R" for round
@@ -429,8 +435,10 @@ _zsh_highlight_main_highlighter_highlight_list()
   while (( $#args )); do
     # Save an unmunged copy of the current word.
     arg=$args[1]
-    arg_raw="$arg"
     shift args
+    (( in_alias > 0 )) && (( in_alias-- ))
+    (( in_alias < 0 )) && (( in_alias++ ))
+    (( in_alias == 0 )) && seen_alias=() && last_alias=
 
     # Initialize this_word and next_word.
     if (( in_redirection == 0 )); then
@@ -455,7 +463,7 @@ _zsh_highlight_main_highlighter_highlight_list()
       fi
     fi
 
-    if true; then
+    if (( in_alias == 0 )); then
       # Compute the new $start_pos and $end_pos, skipping over whitespace in $buf.
       start_pos=$end_pos
       if [[ $arg == ';' ]] ; then
@@ -531,62 +539,51 @@ _zsh_highlight_main_highlighter_highlight_list()
       # Expand aliases.
       _zsh_highlight_main__type "$arg"
       local res="$REPLY"
-      if [[ $res == "alias" ]]; then
-        () {
-          local -A seen_arg
-          while [[ $REPLY == alias ]]; do
-            seen_arg[$arg]=1
-            _zsh_highlight_main__resolve_alias $arg
-            # Use a temporary array to ensure the subscript is interpreted as
-            # an array subscript, not as a scalar subscript
-            local -a reply
-            # TODO: the ${interactive_comments+set} path needs to skip comments; see test-data/alias-comment1.zsh
-            reply=( ${interactive_comments-${(z)REPLY}}
-                    ${interactive_comments+${(zZ+c+)REPLY}} )
-            # Avoid looping forever on alias a=b b=c c=b, but allow alias foo='foo bar'
-            [[ $arg == $reply[1] ]] && break
-            arg=$reply[1]
-            if (( $+seen_arg[$arg] )); then
-              res=none
-              break
-            fi
-            _zsh_highlight_main__type "$arg"
-          done
-        }
-        _zsh_highlight_main_highlighter_expand_path $arg
-        arg=$REPLY
-        () {
-          # Make sure to use $arg_raw here, rather than $arg.
-          integer insane_alias
-          case $arg_raw in
-            # Issue #263: aliases with '=' on their LHS.
-            #
-            # There are three cases:
-            #
-            # - Unsupported, breaks 'alias -L' output, but invokable:
-            ('='*) :;;
-            # - Unsupported, not invokable:
-            (*'='*) insane_alias=1;;
-            # - The common case:
-            (*) :;;
-          esac
-          if (( insane_alias )); then
-            style=unknown-token
-          # Calling 'type' again; since __type memoizes the answer, this call is just a hash lookup.
-          elif ! _zsh_highlight_main__type "$arg" || [[ $REPLY == 'none' ]]; then
-            style=unknown-token
-          else
-            # The common case.
-            style=alias
-            if (( ${+precommand_options[(re)"$arg"]} )) && (( ! ${+precommand_options[(re)"$arg_raw"]} )); then
-              precommand_options[$arg_raw]=$precommand_options[$arg]
-            fi
-          fi
-        }
+      if [[ $res == "alias" ]] && [[ $last_alias != $arg ]]; then
+        if (( $+seen_alias[$arg] )); then
+          _zsh_highlight_main_add_region_highlight $start_pos $end_pos unknown-token
+          continue
+        fi
+        _zsh_highlight_main__resolve_alias $arg
+        # Use a temporary array to ensure the subscript is interpreted as
+        # an array subscript, not as a scalar subscript
+        local -a alias_args
+        # TODO: the ${interactive_comments+set} path needs to skip comments; see test-data/alias-comment1.zsh
+        alias_args=( ${interactive_comments-${(z)REPLY}}
+                     ${interactive_comments+${(zZ+c+)REPLY}} )
+        case $arg in
+          # Issue #263: aliases with '=' on their LHS.
+          #
+          # There are three cases:
+          #
+          # - Unsupported, breaks 'alias -L' output, but invokable:
+          ('='*) :;;
+          # - Unsupported, not invokable:
+          (*'='*)
+            _zsh_highlight_main_add_region_highlight $start_pos $end_pos unknown-token
+            continue
+            ;;
+          # - The common case:
+          (*) :;;
+        esac
+        # Avoid looping forever on alias a=b b=c c=b, but allow alias foo='foo bar'
+        seen_alias[$arg]=1
+        last_alias=$arg
+        args=( $alias_args $args )
+        (( in_alias == 0 )) && _zsh_highlight_main_add_region_highlight $start_pos $end_pos alias
+        if (( in_alias == 0 )); then
+          (( in_alias -= $#alias_args + 1 )) # Add one because XXX
+        elif (( in_alias < 0 )); then
+          (( in_alias -= $#alias_args ))
+        else
+          (( in_alias += $#alias_args ))
+        fi
+        (( in_redirection++ )) # Stall this arg
+        continue
       else
         _zsh_highlight_main_highlighter_expand_path $arg
         arg=$REPLY
-        _zsh_highlight_main__type "$arg"
+        _zsh_highlight_main__type "$arg" 0
         res="$REPLY"
       fi
     fi
@@ -635,7 +632,7 @@ _zsh_highlight_main_highlighter_highlight_list()
             arg=${(P)MATCH}
             ;;
         esac
-        _zsh_highlight_main__type "$arg"
+        _zsh_highlight_main__type "$arg" 0
         res=$REPLY
       fi
     }
@@ -703,7 +700,7 @@ _zsh_highlight_main_highlighter_highlight_list()
      next_word=':start:'
    elif ! (( in_redirection)) && [[ $this_word == *':start:'* ]]; then # $arg is the command word
      if (( ${+precommand_options[$arg]} )) && _zsh_highlight_main__is_runnable $arg; then
-      [[ $res != alias ]] && style=precommand
+      style=precommand
       flags_with_argument=${precommand_options[$arg]%:*}
       flags_sans_argument=${precommand_options[$arg]#*:}
       next_word=${next_word//:regular:/}

highlighters/main/test-data/alias-comment1.zsh

@@ -33,5 +33,6 @@ alias x=$'# foo\npwd'
 BUFFER='x'
 
 expected_region_highlight=(
-  "1 1 alias 'interactivecomments applies to aliases'" # x becomes pwd
+  '1 1 alias' # x
+  '1 1 comment' # x (#)
 )

highlighters/main/test-data/alias-comment2.zsh

@@ -33,5 +33,6 @@ alias x=$'# foo\npwd'
 BUFFER='x'
 
 expected_region_highlight=(
-  "1 1 unknown-token" # x becomes #
+  '1 1 alias' # x
+  '1 1 unknown-token' # x (#)
 )

highlighters/main/test-data/alias-loop.zsh

@@ -33,7 +33,8 @@ alias a=b b=c c=b
 BUFFER='a foo; :'
 
 expected_region_highlight=(
-  '1 1 unknown-token' # a
+  '1 1 alias' # a
+  '1 1 unknown-token' # a (invalid alias loop)
   '3 5 default' # foo
   '6 6 commandseparator' # ;
   '8 8 builtin' # :

highlighters/main/test-data/alias-nested-precommand.zsh

@@ -35,6 +35,7 @@ BUFFER='a -u phy1729 echo; :'
 
 expected_region_highlight=(
   '1 1 alias' # a
+  '1 1 precommand' # a (sudo)
   '3 4 single-hyphen-option' # -u
   '6 12 default' # phy1729
   '14 17 builtin' # echo

highlighters/main/test-data/alias-nested.zsh

@@ -34,6 +34,7 @@ BUFFER='a foo; :'
 
 expected_region_highlight=(
   '1 1 alias' # a
+  '1 1 builtin' # a (:)
   '3 5 default' # foo
   '6 6 commandseparator' # ;
   '8 8 builtin' # :

highlighters/main/test-data/alias-precommand-option-argument.zsh

@@ -28,14 +28,16 @@
 # vim: ft=zsh sw=2 ts=2 et
 # -------------------------------------------------------------------------------------------------
 
-alias sdu='sudo -u'
+alias sde='sudo -e'
+alias seu='sde -u'
 sudo(){}
 
-BUFFER='sdu phy1729 echo foo'
+BUFFER='seu phy1729 echo foo'
 
 expected_region_highlight=(
-  '1 3 alias' # sdu
-  '5 11 default "issue #540"' # phy1729
+  '1 3 alias' # seu
+  '1 3 precommand' # seu (sudo)
+  '5 11 default' # phy1729
   '13 16 commmand "issue #540"' # echo (not builtin)
   '18 20 default' # foo
 )

highlighters/main/test-data/alias-quoted.zsh

@@ -35,5 +35,5 @@ expected_region_highlight=(
   '1 3 unknown-token' # "a"
   '5 7 default' # foo
   '8 8 commandseparator' # ;
-  '10 12 command "issue #544' # \ls
+  '10 12 command' # \ls
 )

highlighters/main/test-data/alias-redirect.zsh

@@ -31,7 +31,8 @@ alias x=\>
 BUFFER='x foo echo bar'
 
 expected_region_highlight=(
-  '1 1 redirection' # x becomes >
+  '1 1 alias' # x
+  '1 1 redirection' # x (>)
   '3 5 default' # foo
   '7 10 builtin' # echo
   '12 14 default' # bar

highlighters/main/test-data/alias-self.zsh

@@ -34,5 +34,6 @@ BUFFER='echo bar'
 
 expected_region_highlight=(
   '1 4 alias' # echo
+  '1 4 builtin' # echo
   '6 8 default' # bar
 )

highlighters/main/test-data/alias.zsh

@@ -51,4 +51,5 @@ fi
 expected_region_highlight+=(
   "9 9 commandseparator" # ;
   "11 16 alias" # alias1
+  "11 16 function" # alias1 (unused which is a function by alias1() {})
 )

highlighters/main/test-data/noglob-alias.zsh

@@ -32,5 +32,6 @@ BUFFER='x ls'
 
 expected_region_highlight=(
   "1 1 alias" # x
+  "1 1 precommand" # x (command)
   "3 4 command" # ls
 )

highlighters/main/test-data/off-by-one.zsh

@@ -33,8 +33,9 @@ f() {}
 BUFFER='a;f;'
 
 expected_region_highlight=(
-  "1 1 alias" # f
+  "1 1 alias" # a
+  "1 1 builtin" # a (:)
   "2 2 commandseparator" # ;
-  "3 3 function" # g
+  "3 3 function" # f
   "4 4 commandseparator" # ;
 )