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

Resolved issue caused from bad merge #68

Merged
merged 2 commits into from
Apr 8, 2024

Conversation

matthewnitschke
Copy link
Contributor

2 Previous PRs were merged in parallel, causing a bad merge and failed CI

Enum highlighting is now handled in its own section, and constants are typed as identifier.constant

This PR fixes what was added here

Comment on lines -7 to -8
; TODO: add method/call_expression to grammar and
; distinguish method call from variable access
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was resolved in #65, just cleaning up the comment accordingly

Comment on lines -102 to -105
(enum_declaration
name: (identifier) @type)
(enum_constant
name: (identifier) @method)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Collaborator

Choose a reason for hiding this comment

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

Thanks didn't notice the move

Copy link
Collaborator

@TimWhiting TimWhiting left a comment

Choose a reason for hiding this comment

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

Thanks, didn't notice the move.

@TimWhiting TimWhiting merged commit 6da4647 into UserNobody14:master Apr 8, 2024
3 checks passed
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.

2 participants