RES: resolve derive proc macros in with new resolve engine

intellij-rust · Dec 15, 2020 · cd9cf30 · cd9cf30
1 parent 77c4fd6
commit cd9cf30
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/src/main/kotlin/org/rust/lang/core/psi/ext/RsMetaItem.kt b/src/main/kotlin/org/rust/lang/core/psi/ext/RsMetaItem.kt
@@ -34,7 +34,7 @@ val RsMetaItem.value: String? get() = litExpr?.stringValue
 val RsMetaItem.hasEq: Boolean get() = greenStub?.hasEq ?: (eq != null)
 
 fun RsMetaItem.resolveToDerivedTrait(): RsTraitItem? =
-    path?.reference?.resolve() as? RsTraitItem
+    path?.reference?.multiResolve()?.filterIsInstance<RsTraitItem>()?.singleOrNull()
 
 /**
  * In the case of `#[foo(bar)]`, the `foo(bar)` meta item is considered "root" but `bar` is not.

diff --git a/src/main/kotlin/org/rust/lang/core/resolve2/FacadeResolve.kt b/src/main/kotlin/org/rust/lang/core/resolve2/FacadeResolve.kt
@@ -336,18 +336,16 @@ private fun VisItem.toPsi(defMap: CrateDefMap, project: Project, ns: Namespace):
     return when (containingModOrEnum) {
         is RsMod -> {
             if (ns == Namespace.Macros) {
-                val macros = containingModOrEnum.expandedItemsCached.macros
+                val items = containingModOrEnum.expandedItemsCached
+                val macros = items.macros
                     .filter { it.name == name && matchesIsEnabledByCfg(it, this) }
                 // TODO: Multiresolve for macro 2.0
                 if (macros.isNotEmpty()) return listOf(macros.last())
 
-                containingModOrEnum
-                    // Note: name of bang and attribute proc macros is same as name of item
-                    .getExpandedItemsWithName<RsFunction>(name)
+                items.rest
+                    .filterIsInstance<RsFunction>()
                     .filter {
-                        // TODO: derive proc macros are currently ignored, because of multiresolve of serde::Serialize
-                        val isProcMacro = it.isBangProcMacroDef || it.isAttributeProcMacroDef
-                        isProcMacro && matchesIsEnabledByCfg(it, this)
+                        it.isProcMacroDef && it.procMacroName == name && matchesIsEnabledByCfg(it, this)
                     }
             } else {
                 containingModOrEnum

diff --git a/src/test/kotlin/org/rust/lang/core/resolve/RsProcMacroResolveTest.kt b/src/test/kotlin/org/rust/lang/core/resolve/RsProcMacroResolveTest.kt
@@ -5,7 +5,6 @@
 
 package org.rust.lang.core.resolve
 
-import org.rust.IgnoreInNewResolve
 import org.rust.MockEdition
 import org.rust.ProjectDescriptor
 import org.rust.WithDependencyRustProjectDescriptor
@@ -127,7 +126,6 @@ class RsProcMacroResolveTest : RsResolveTestBase() {
     """)
     }
 
-    @IgnoreInNewResolve
     fun `test resolve custom derive proc macro in use item`() = stubOnlyResolve("""
     //- dep-proc-macro/lib.rs
         #[proc_macro_derive(ProcMacroName)]
@@ -137,7 +135,6 @@ class RsProcMacroResolveTest : RsResolveTestBase() {
                           //^ dep-proc-macro/lib.rs
     """)
 
-    @IgnoreInNewResolve
     fun `test resolve custom derive proc macro from derive attribute`() = stubOnlyResolve("""
     //- dep-proc-macro/lib.rs
         #[proc_macro_derive(ProcMacroName)]
@@ -189,7 +186,6 @@ class RsProcMacroResolveTest : RsResolveTestBase() {
                     //^ dep-proc-macro/lib.rs
     """)
 
-    @IgnoreInNewResolve
     fun `test resolve custom derive proc macro reexported from lib to main from use item`() = stubOnlyResolve("""
     //- lib.rs
         extern crate dep_proc_macro;
@@ -204,7 +200,6 @@ class RsProcMacroResolveTest : RsResolveTestBase() {
                          //^ dep-proc-macro/lib.rs
     """)
 
-    @IgnoreInNewResolve
     fun `test resolve custom derive proc macro reexported from lib to main from macro call`() = stubOnlyResolve("""
     //- lib.rs
         extern crate dep_proc_macro;