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

Use @boolean for true and false in highlights #25338

Merged
merged 2 commits into from
Feb 21, 2025

Conversation

everdrone
Copy link
Contributor

@everdrone everdrone commented Feb 21, 2025

Release Notes:

  • Fixed issue where true and false were highlighted as constants, ignoring the boolean highlight defined in themes.
    • This fix applies to: C, C++, Go, JSON, JSONC, Python, and Rust.

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Feb 21, 2025
@maxdeviant maxdeviant changed the title Use @boolean for true|false in highlights Use @boolean for true and false in highlights Feb 21, 2025
@maxdeviant
Copy link
Member

@everdrone I pulled the addition of the raw keyword out into #25342, since it was unrelated to the other changes.

Copy link
Member

@maxdeviant maxdeviant left a comment

Choose a reason for hiding this comment

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

Thank you!

@everdrone
Copy link
Contributor Author

everdrone commented Feb 21, 2025

@maxdeviant I have noticed this PR might be conflicting with the other pull requests by @chbk, like #25333
What should we do? I noticed in his PRs for other languages like JSON, true and false will be treated as @constant.builtin.

If you point me in one direction I can repropose another PR with the addition of the raw keyword too

@maxdeviant maxdeviant enabled auto-merge (squash) February 21, 2025 15:13
@maxdeviant
Copy link
Member

@maxdeviant I have noticed this PR might be conflicting with the other pull requests by @chbk, like #25333 What should we do? I noticed in his PRs for other languages like JSON, true and false will be treated as @constant.builtin.

If you point me in one direction I can repropose a PR with the addition of the raw keyword too

I'm still in the process of reviewing the changes in those PRs.

Your PR here seems like a small, additive change that brings the boolean highlights in line with the way we highlight booleans in our other languages, so I'd like to proceed with it.

@maxdeviant maxdeviant self-assigned this Feb 21, 2025
@maxdeviant maxdeviant merged commit 1fb4620 into zed-industries:main Feb 21, 2025
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed The user has signed the Contributor License Agreement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants