From 8c9cc058c7d9252ca82ce3e335f62f028dbc04e8 Mon Sep 17 00:00:00 2001 From: "Natalia.Ukhorskaya" Date: Tue, 21 Aug 2012 16:23:40 +0400 Subject: [PATCH] Remove hack in JavaPackageScope#getClassifier. --- .../jet/lang/resolve/java/JavaPackageScope.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java index cae2aef377f..c34cee0c0c0 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java @@ -20,7 +20,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; @@ -46,14 +45,7 @@ public class JavaPackageScope extends JavaClassOrPackageScope { @Override public ClassifierDescriptor getClassifier(@NotNull Name name) { - ClassDescriptor classDescriptor = semanticServices.getDescriptorResolver().resolveClass(packageFQN.child(name), DescriptorSearchRule.IGNORE_IF_FOUND_IN_KOTLIN); - if (classDescriptor == null || DescriptorUtils.isObject(classDescriptor)) { - // TODO: this is a big hack against several things that I barely understand myself and cannot explain - // 1. We should not return objects from this method, and maybe JDR.resolveClass should not return too - // 2. JDR should not return classes being analyzed - return null; - } - return classDescriptor; + return semanticServices.getDescriptorResolver().resolveClass(packageFQN.child(name), DescriptorSearchRule.IGNORE_IF_FOUND_IN_KOTLIN); } @Override