Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Highlight escaped reserved words properly #702

Open
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

danielshahaf
Copy link
Member

Fixes #701.

There's a TODO in the last commit.

@danielshahaf danielshahaf added this to the 0.8.0 milestone Mar 17, 2020
… (with slightly different settings) if path expansion returned the input unchanged.

In particular, note that applying all but the last hunk of this diff
would cause «time» in command position to be highlighted as «command»
rather than «reserved».  (This is covered by tests.)
Copy link
Member Author

@danielshahaf danielshahaf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.

@@ -153,19 +153,17 @@ _zsh_highlight_main_calculate_fallback() {
#
# If $2 is 0, do not consider aliases.
#
# If $3 is 0, do not consider reserved words.
#
Copy link
Member Author

@danielshahaf danielshahaf Mar 19, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A call to this function was added to master after this branch was crested created. See whether it should be updated.

@danielshahaf danielshahaf removed this from the 0.8.0 milestone May 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Escaped variable-declaring reserved words are builtins
1 participant