tests: Expect the correct style

highlighters/main/test-data/anonymous-function.zsh

@@ -31,10 +31,10 @@ BUFFER='() echo hello; () { echo world }'
 
 expected_region_highlight=(
   "1 2 ${(q-)ZSH_HIGHLIGHT_STYLES[reserved-word]}" # ()
-  "4 7 ${(q-)ZSH_HIGHLIGHT_STYLES[command]}" # echo
+  "4 7 ${(q-)ZSH_HIGHLIGHT_STYLES[builtin]}" # echo
   "9 13 ${(q-)ZSH_HIGHLIGHT_STYLES[default]}" # hello
   "14 14 ${(q-)ZSH_HIGHLIGHT_STYLES[commandseparator]}" # ;
   "16 17 ${(q-)ZSH_HIGHLIGHT_STYLES[reserved-word]}" # ()
   "19 19 ${(q-)ZSH_HIGHLIGHT_STYLES[reserved-word]}" # {
-  "21 24 ${(q-)ZSH_HIGHLIGHT_STYLES[command]}" # echo
+  "21 24 ${(q-)ZSH_HIGHLIGHT_STYLES[builtin]}" # echo
 )

highlighters/main/test-data/assign-semicolon.zsh

@@ -32,5 +32,5 @@ BUFFER='A=1; echo hello world'
 
 expected_region_highlight=(
   "4 4 ${(q-)ZSH_HIGHLIGHT_STYLES[commandseparator]}" # ;
-  "6 9 ${(q-)ZSH_HIGHLIGHT_STYLES[command]}" # echo
+  "6 9 ${(q-)ZSH_HIGHLIGHT_STYLES[builtin]}" # echo
 )

highlighters/main/test-data/backslash-continuation.zsh

@@ -31,5 +31,5 @@ PREBUFFER=$'echo \\\n'
 BUFFER='noglob'
 
 expected_region_highlight=(
-  "1 6 none" # 'noglob' highlighted as a string, not as a precomand
+  "1 6 ${(q-)ZSH_HIGHLIGHT_STYLES[default]}" # 'noglob' highlighted as a string, not as a precomand
 )

highlighters/main/test-data/comments.zsh

@@ -32,7 +32,7 @@ setopt interactive_comments
 BUFFER='echo "foo #bar" #baz # quux'
 
 expected_region_highlight=(
-  "1 4 ${(q-)ZSH_HIGHLIGHT_STYLES[command]}" # echo
+  "1 4 ${(q-)ZSH_HIGHLIGHT_STYLES[builtin]}" # echo
   "6 15 ${(q-)ZSH_HIGHLIGHT_STYLES[double-quoted-argument]}" # "foo #bar"
   "17 27 ${(q-)ZSH_HIGHLIGHT_STYLES[comment]}" # #baz # quux
 )

highlighters/main/test-data/multiple-redirections.zsh

@@ -32,15 +32,15 @@ BUFFER='ps aux | grep java | sort | uniq | tail | head'
 expected_region_highlight=(
   "1  2  ${(q-)ZSH_HIGHLIGHT_STYLES[command]}" # ps
   "4  6  ${(q-)ZSH_HIGHLIGHT_STYLES[default]}" # aux
-  "8  8  ${(q-)ZSH_HIGHLIGHT_STYLES[default]}" # |
+  "8  8  ${(q-)ZSH_HIGHLIGHT_STYLES[commandseparator]}" # |
   "10 13 ${(q-)ZSH_HIGHLIGHT_STYLES[command]}" # grep
   "15 18 ${(q-)ZSH_HIGHLIGHT_STYLES[default]}" # java
-  "20 20 ${(q-)ZSH_HIGHLIGHT_STYLES[default]}" # |
+  "20 20 ${(q-)ZSH_HIGHLIGHT_STYLES[commandseparator]}" # |
   "22 25 ${(q-)ZSH_HIGHLIGHT_STYLES[command]}" # sort
-  "27 27 ${(q-)ZSH_HIGHLIGHT_STYLES[default]}" # |
+  "27 27 ${(q-)ZSH_HIGHLIGHT_STYLES[commandseparator]}" # |
   "29 32 ${(q-)ZSH_HIGHLIGHT_STYLES[command]}" # uniq
-  "34 34 ${(q-)ZSH_HIGHLIGHT_STYLES[default]}" # |
+  "34 34 ${(q-)ZSH_HIGHLIGHT_STYLES[commandseparator]}" # |
   "36 39 ${(q-)ZSH_HIGHLIGHT_STYLES[command]}" # tail
-  "41 41 ${(q-)ZSH_HIGHLIGHT_STYLES[default]}" # |
+  "41 41 ${(q-)ZSH_HIGHLIGHT_STYLES[commandseparator]}" # |
   "43 46 ${(q-)ZSH_HIGHLIGHT_STYLES[command]}" # head
 )

highlighters/main/test-data/precommand.zsh

@@ -31,7 +31,7 @@ ZSH_HIGHLIGHT_STYLES[assign]=$unused_highlight
 BUFFER=': command zzzzzz'
 
 expected_region_highlight=(
-  "1 1 ${(q-)ZSH_HIGHLIGHT_STYLES[command]}" # ls
+  "1 1 ${(q-)ZSH_HIGHLIGHT_STYLES[builtin]}" # :
   "3 9 ${(q-)ZSH_HIGHLIGHT_STYLES[default]}" # not precommand
   "11 16 ${(q-)ZSH_HIGHLIGHT_STYLES[default]}" # not unknown-token (since 'zzzzzz' is not a command)
 )

highlighters/main/test-data/simple-redirection.zsh

@@ -32,7 +32,7 @@ BUFFER='ps aux | grep java'
 expected_region_highlight=(
   "1  2  ${(q-)ZSH_HIGHLIGHT_STYLES[command]}" # ps
   "4  6  ${(q-)ZSH_HIGHLIGHT_STYLES[default]}" # aux
-  "8  8  ${(q-)ZSH_HIGHLIGHT_STYLES[default]}" # |
+  "8  8  ${(q-)ZSH_HIGHLIGHT_STYLES[commandseparator]}" # |
   "10 13 ${(q-)ZSH_HIGHLIGHT_STYLES[command]}" # grep
   "15 18 ${(q-)ZSH_HIGHLIGHT_STYLES[default]}" # java
 )

highlighters/main/test-data/subshell.zsh

@@ -32,7 +32,7 @@ BUFFER='tar cf - * | (cd /target; tar xfp -) | { cat }'
 expected_region_highlight=(
   "1 3 ${(q-)ZSH_HIGHLIGHT_STYLES[command]}" # tar
   "14 14 ${(q-)ZSH_HIGHLIGHT_STYLES[reserved-word]}" # (
-  "15 16 ${(q-)ZSH_HIGHLIGHT_STYLES[command]}" # cd
+  "15 16 ${(q-)ZSH_HIGHLIGHT_STYLES[builtin]}" # cd
   "27 29 ${(q-)ZSH_HIGHLIGHT_STYLES[command]}" # tar
   "36 36 ${(q-)ZSH_HIGHLIGHT_STYLES[reserved-word]}" # )
   "40 40 ${(q-)ZSH_HIGHLIGHT_STYLES[reserved-word]}" # {