import from objects before properties resolve

This commit is contained in:
svtk
2012-01-11 14:19:01 +04:00
parent a22b78d60d
commit 3e8e8bd3c8
27 changed files with 289 additions and 27 deletions
@@ -9,9 +9,7 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ClassReceiver;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
import org.jetbrains.jet.lang.types.*;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
/**
* @author abreslav
@@ -175,4 +173,15 @@ public class JavaClassDescriptor extends MutableDeclarationDescriptor implements
}
return implicitReceiver;
}
@Override
public ClassDescriptor getInnerClass(String name) {
return null;
}
@NotNull
@Override
public Collection<ClassDescriptor> getInnerClasses() {
return Collections.emptyList();
}
}
@@ -59,6 +59,11 @@ public class JavaClassMembersScope implements JetScope {
return classifierDescriptor;
}
@Override
public ClassDescriptor getObjectDescriptor(@NotNull String name) {
return null;
}
@NotNull
@Override
public Collection<DeclarationDescriptor> getAllDescriptors() {
@@ -34,6 +34,11 @@ public class JavaPackageScope extends JetScopeImpl {
return semanticServices.getDescriptorResolver().resolveClass(getQualifiedName(name));
}
@Override
public ClassDescriptor getObjectDescriptor(@NotNull String name) {
return null;
}
@Override
public NamespaceDescriptor getNamespace(@NotNull String name) {
return semanticServices.getDescriptorResolver().resolveNamespace(getQualifiedName(name));