syntax: highlight the and/or keywords - #482
Merged
Merged
Conversation
The `and` and `or` future keywords were added to OPA in main (tokens.LogicalAnd / tokens.LogicalOr). Add them to the keyword pattern so they're highlighted like the other keywords. They are still gated behind an explicit import plus capabilities, but a TextMate grammar can't condition on imports, so they're matched unconditionally as `if`, `every` and `contains` already are. Signed-off-by: Sebastian Spaink <sebastianspaink@gmail.com>
sspaink
force-pushed
the
syntax-highlight-and-or-keywords
branch
from
August 11, 2026 14:54
5381797 to
5567620
Compare
johanfylling
approved these changes
Aug 11, 2026
| <dict> | ||
| <key>match</key> | ||
| <string>(^|\s+)(?:(default|not|package|import|as|with|else|some|in|every|if|contains))(?=\s|$)</string> | ||
| <string>(^|\s+)(?:(default|not|package|import|as|with|else|some|in|every|if|contains|and|or))(?=\s|$)</string> |
Collaborator
There was a problem hiding this comment.
This'll unconditionally highlight and/or regardless if they're imported or not. However, if that is even remotely complex to accomplish, we can live with it; since this will be part of the v2 syntax in the near future.
Member
Author
There was a problem hiding this comment.
it would be hacky, lets just keep it as-is
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Adds highlighting for the new
andandorkeywords.Part of open-policy-agent/opa#8999.