WIP: 'main': Apply the parameter expansion logic regardless of the type #718
+92
−10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The existing check was bogus: parameter expansion doesn't depend on whether there happens to be a command literally called «$foo». This enables the parameter elision logic to kick in for words not in command position. Fixes zsh-users#239.
f8a0395 to
d0a11ba
Compare
danielshahaf
commented
Mar 28, 2020
| @@ -1139,6 +1141,9 @@ _zsh_highlight_main_highlighter_check_assign() | |||
|
|
|||
| _zsh_highlight_main_highlighter_highlight_path_separators() | |||
| { | |||
| if (( in_param || in_alias )); then | |||
| return | |||
| fi | |||
| @@ -1384,7 +1389,7 @@ _zsh_highlight_main_highlighter_highlight_argument() | |||
| done | |||
|
|
|||
| if (( path_eligible )); then | |||
| if (( in_redirection )) && [[ $last_arg == *['<>']['&'] && $arg[$1,-1] == (<0->|p|-) ]]; then | |||
| if (( in_redirection && ! in_param )) && [[ $last_arg == *['<>']['&'] && $arg[$1,-1] == (<0->|p|-) ]]; then | |||
|
Triage: Incomplete, so deferring. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See log messages for details.
Any concerns with the changed behaviour (see the updated test expectations)?