From 86f2132a98748ee525de3b6e6e58d41a8f0458c3 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Sat, 20 Jan 2018 15:40:11 +0000 Subject: [PATCH] 'main': Don't highlight bare '$foo' as a filename, as it's a parameter expansion. Fixes #474. --- highlighters/main/main-highlighter.zsh | 2 ++ highlighters/main/test-data/order-path-after-dollar.zsh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh index 5e03d1a..a08da66 100644 --- a/highlighters/main/main-highlighter.zsh +++ b/highlighters/main/main-highlighter.zsh @@ -823,7 +823,9 @@ _zsh_highlight_main_highlighter_highlight_argument() highlights+=($reply) ;; '$') + path_eligible=0 if [[ $arg[i+1] == "'" ]]; then + path_eligible=1 _zsh_highlight_main_highlighter_highlight_dollar_quote $i (( i = REPLY )) highlights+=($reply) diff --git a/highlighters/main/test-data/order-path-after-dollar.zsh b/highlighters/main/test-data/order-path-after-dollar.zsh index c260c53..773c183 100644 --- a/highlighters/main/test-data/order-path-after-dollar.zsh +++ b/highlighters/main/test-data/order-path-after-dollar.zsh @@ -33,6 +33,6 @@ BUFFER=': $foo \$foo' expected_region_highlight=( '1 1 builtin' # : - '3 6 default "issue #474"' # $foo - if we add a "unquoted parameter expansion" style then this expectation should change + '3 6 default' # $foo - if we add a "unquoted parameter expansion" style then this expectation should change '8 12 path' # \$foo )