fix: Prefer macro namespace when classifying paths in macro invocations #21287
+8
−0
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
rustbot
added
the
S-waiting-on-review
Problem: When `resolve_macro_call` fails to resolve a macro, the fallback `resolve_path_with_subst` prefers type/value namespaces over the macro namespace. This causes macro invocations to be incorrectly highlighted as `namespace` when a module with the same name exists in scope. Solution: Use `resolve_path_per_ns` to check the macro namespace first when in a MacroCall context, falling back to normal path resolution if no macro is found.
willothy
force-pushed
the
willothy/fix-colliding-macro-invocation-hl
branch
from
cdc31e9 to
5acf10c
Compare
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.
Problem: When
resolve_macro_callfails to resolve a macro, the fallbackresolve_path_with_substprefers type/value namespaces over the macro namespace. This causes macro invocations to be incorrectly highlighted asnamespacewhen a module with the same name exists in scope.Solution: Use
resolve_path_per_nsto check the macro namespace first when in a MacroCall context, falling back to normal path resolution if no macro is found.Not sure if this is actually the right way to do this since this is my first time working on RA, let me know if this is wrong :)
Before:
After:
