'main': Let the type determination ignore global aliases when it ignores regular ones.

danielshahaf · danielshahaf · commit 08839bbd878b · 2020-03-19T05:28:17.000Z
diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
@@ -180,7 +180,7 @@ _zsh_highlight_main__type() {
     if (( $+aliases[(e)$1] )); then
       may_cache=0
     fi
-    if (( ${+galiases[(e)$1]} )); then
+    if (( ${+galiases[(e)$1]} )) && (( aliases_allowed )); then
       REPLY='global alias'
     elif (( $+aliases[(e)$1] )) && (( aliases_allowed )); then
       REPLY=alias
diff --git a/highlighters/main/test-data/parameter-to-global-alias.zsh b/highlighters/main/test-data/parameter-to-global-alias.zsh
@@ -34,5 +34,5 @@ local s=x
 BUFFER=$'$s'
 
 expected_region_highlight=(
-  '1 2 unknown-token "fixed in the next commit"' # $s
+  '1 2 unknown-token' # $s
 )

Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,5 @@ local s=x`
`34`	`34`	`BUFFER=$'$s'`
`35`	`35`
`36`	`36`	`expected_region_highlight=(`
`37`		`- '1 2 unknown-token "fixed in the next commit"' # $s`
	`37`	`+ '1 2 unknown-token' # $s`
`38`	`38`	`)`