Do not allow built-in classes in Java resolve

2013-11-14 15:14:36 +04:00
parent 01b456f5c2
commit 3e4c533167
1 changed files with 3 additions and 2 deletions
@@ -153,9 +153,10 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
                                @Nullable
                                @Override
                                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
-                                        || kotlinNamespacesFromBinaries.invoke(fqName) != null) {
+                                        || kotlinNamespacesFromBinaries.invoke(fqName) != null
+                                        || JavaClassResolver.getKotlinBuiltinClassDescriptor(fqName) != null) {
                                        return null;
                                    }