azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not allow built-in classes in Java resolve

Browse Source
This commit is contained in:
Andrey Breslav
2013-11-14 15:14:36 +04:00
parent 01b456f5c2
commit 3e4c533167
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+3 -2
View File
@@ -153,9 +153,10 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
@Nullable @Nullable
@Override @Override
public JavaClass findClass(@NotNull FqName fqName) { public JavaClass findClass(@NotNull FqName fqName) {
// Do not look for JavaClasses for Kotlin binaries // Do not look for JavaClasses for Kotlin binaries & built-ins
if (kotlinClassesFromBinaries.invoke(fqName) != null if (kotlinClassesFromBinaries.invoke(fqName) != null
|| kotlinNamespacesFromBinaries.invoke(fqName) != null) { || kotlinNamespacesFromBinaries.invoke(fqName) != null
|| JavaClassResolver.getKotlinBuiltinClassDescriptor(fqName) != null) {
return null; return null;
} }