Auto merge of #17469 - roife:fix-issue-17425, r=Veykril

bors · bors · commit 9b33872c8983 · 2024-06-21T17:52:42.000Z
fix: use ItemInNs::Macros to convert ModuleItem to ItemInNs fix #17425. When converting `PathResolution` to `ItemInNs`, we should convert `ModuleDef::Macro` to `ItemInNs::Macros` to ensure that it can be found in `DefMap`.
diff --git a/src/tools/rust-analyzer/crates/hir/src/lib.rs b/src/tools/rust-analyzer/crates/hir/src/lib.rs
@@ -2784,6 +2784,7 @@ impl From<ModuleDef> for ItemInNs {
             ModuleDef::Static(_) | ModuleDef::Const(_) | ModuleDef::Function(_) => {
                 ItemInNs::Values(module_def)
             }
+            ModuleDef::Macro(it) => ItemInNs::Macros(it),
             _ => ItemInNs::Types(module_def),
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -2784,6 +2784,7 @@ impl From<ModuleDef> for ItemInNs {`
`2784`	`2784`	`ModuleDef::Static(_) \| ModuleDef::Const(_) \| ModuleDef::Function(_) => {`
`2785`	`2785`	`ItemInNs::Values(module_def)`
`2786`	`2786`	`}`
	`2787`	`+ ModuleDef::Macro(it) => ItemInNs::Macros(it),`
`2787`	`2788`	`_ => ItemInNs::Types(module_def),`
`2788`	`2789`	`}`
`2789`	`2790`	`}`