class-resolve: fix merge

aya-prover · Dec 3, 2024 · a4af18c · a4af18c
1 parent 63ec562
commit a4af18c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/base/src/main/java/org/aya/tyck/ClassResolver.java b/base/src/main/java/org/aya/tyck/ClassResolver.java
@@ -7,6 +7,7 @@
 import kala.collection.immutable.ImmutableSeq;
 import kala.collection.mutable.MutableList;
 import kala.collection.mutable.MutableMap;
+import org.aya.resolve.context.Candidate;
 import org.aya.resolve.context.ModuleContext;
 import org.aya.syntax.core.def.AnyDef;
 import org.aya.syntax.core.def.ClassDefLike;
@@ -35,7 +36,7 @@ public ClassResolver(@NotNull ModuleContext env) {
     if (envCache != null) return envCache;
     var result = env.symbols().table()
       .valuesView()
-      .flatMap(MapLike::valuesView)
+      .flatMap(Candidate::getAll)
       .filterIsInstance(AnyDefVar.class);
 
     var builder = MutableMap.<ClassDefLike, ImmutableSeq<AnyDefVar>>create();