Improve Objective-C vs Mathematica lexer disambiguation #2103
Conversation
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
fix: improve Objective-C vs Mathematica disambiguation for .m files The previous logic would incorrectly identify Objective-C code as Mathematica when encountering pointer dereference syntax like `if (*foo == 0)`, since it looked similar to Mathematica's comment syntax `(* comment *)`. This change improves the disambiguation by: 1. Only matching Mathematica comments that start at beginning of line 2. Adding an additional Objective-C identifier for braces at end of line
Member
|
LGTM! Thanks for the fix! Disambiguation is always a bit of an approximate science - it's nice to see it tuned up a bit. |
jneen
reviewed
Jan 20, 2025
EthanArbuckle
commented
Jan 21, 2025
Contributor
Author
|
@jneen Hello! Following up on this PR - are there any other changes needed? thanks! |
Contributor
Author
|
@tancnle Hello! Apologies for the ping; I noticed you were most active on this repo as of recent. May I ask for some eyes on this PR? It resolves a long-standing issue with Objective-C code that affects highlighting on GitLab.com. Relevant GitLab ticket: https://gitlab.com/gitlab-org/gitlab/-/issues/292672 I believe it's ready to go in current state, but i'm happy to address any feedback you have. Thank you! |
Collaborator
|
Thanks @EthanArbuckle. The change LGTM. |
xaviermignot
pushed a commit
to xaviermignot/rouge
that referenced
this pull request
Jun 17, 2025
) * fix: improve Objective-C vs Mathematica disambiguation for .m files fix: improve Objective-C vs Mathematica disambiguation for .m files The previous logic would incorrectly identify Objective-C code as Mathematica when encountering pointer dereference syntax like `if (*foo == 0)`, since it looked similar to Mathematica's comment syntax `(* comment *)`. This change improves the disambiguation by: 1. Only matching Mathematica comments that start at beginning of line 2. Adding an additional Objective-C identifier for braces at end of line * resolve disambiguation conflict, add more test cases
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
This PR fixes an issue where Rouge would incorrectly identify Objective-C code as Mathematica when encountering pointer dereference syntax in .m files.
Problem
The current lexer disambiguation logic for .m files checks for
(*to identify Mathematica files. However, this pattern also appears in valid Objective-C code when using pointer dereference syntax, like:This causes Rouge to incorrectly identify such files as Mathematica, leading to incorrect syntax highlighting.
Solution
The fix improves the disambiguation logic by:
Related Issues