Skip to content

Fix macro invocations being highlighted as modules when names collide #21287

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.

Sign up for GitHub

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

Open
willothy wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −0
Open

Fix macro invocations being highlighted as modules when names collide #21287

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions crates/ide-db/src/defs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,14 @@ impl<'db> NameRefClass<'db> {
if let Some(macro_def) = sema.resolve_macro_call(&macro_call) {
return Some(NameRefClass::Definition(Definition::Macro(macro_def), None));
}

// When in a macro call context, prefer macro namespace resolution over type/value
// namespaces. This ensures that if a macro and a module have the same name,
// we correctly classify the path as a macro when used in a macro invocation.
if let Some(res) = sema.resolve_path_per_ns(&path).and_then(|res| res.macro_ns) {
return Some(NameRefClass::Definition(res.into(), None));
}
// Fallback to normal path resolution.
}
return sema
.resolve_path_with_subst(&path)
Expand Down