Prefer sources to binaries in JDR

2014-01-10 18:06:29 +04:00
parent 5a49b6fda5
commit 935fae70ea
1 changed files with 7 additions and 1 deletions
@@ -100,10 +100,16 @@ public open class LazyJavaPackageFragmentProvider(
            val builtinClass = JavaClassResolver.getKotlinBuiltinClassDescriptor(fqName)
            if (builtinClass != null) return builtinClass

+            // TODO Here we prefer sources (something outside JDR subsystem) to binaries, which should actually be driven by module dependencies separation
+            // See DeserializedDescriptorResolver.javaDescriptorFinder
+            val classFromSources = outerContext.javaClassResolver.resolveClassByFqName(fqName)
+            if (classFromSources != null) return classFromSources
+
            val (jClass, kClass) = c.findClassInJava(fqName)
            if (jClass != null) return resolveClass(jClass)
            if (kClass != null) return kClass
-            return outerContext.javaClassResolver.resolveClassByFqName(fqName)
+
+            return null
        }
    }
 }