Replaced usages of JetScope.getAllDescriptors() with JetScope.getDescriptors() (where makes sense)

compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java

@@ -37,7 +37,6 @@ import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.calls.CallResolverUtil;
 import org.jetbrains.jet.lang.resolve.dataClassUtils.DataClassUtilsPackage;
 import org.jetbrains.jet.lang.resolve.name.Name;
-import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.types.*;
 import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
@@ -318,14 +317,14 @@ public class OverrideResolver {
     private static List<CallableMemberDescriptor> getCallableMembersFromSupertypes(ClassDescriptor classDescriptor) {
         Set<CallableMemberDescriptor> r = Sets.newLinkedHashSet();
         for (JetType supertype : classDescriptor.getTypeConstructor().getSupertypes()) {
-            r.addAll(getCallableMembersFromType(supertype.getMemberScope()));
+            r.addAll(getCallableMembersFromType(supertype));
         }
         return new ArrayList<CallableMemberDescriptor>(r);
     }
 
-    private static List<CallableMemberDescriptor> getCallableMembersFromType(JetScope scope) {
+    private static List<CallableMemberDescriptor> getCallableMembersFromType(JetType type) {
         List<CallableMemberDescriptor> r = Lists.newArrayList();
-        for (DeclarationDescriptor decl : scope.getAllDescriptors()) {
+        for (DeclarationDescriptor decl : type.getMemberScope().getAllDescriptors()) {
             if (decl instanceof PropertyDescriptor || decl instanceof SimpleFunctionDescriptor) {
                 r.add((CallableMemberDescriptor) decl);
             }

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt

@@ -183,7 +183,7 @@ public abstract class AbstractLazyMemberScope<D : DeclarationDescriptor, DP : De
     // a generic implementation can't do this properly
     abstract override fun toString(): String
 
-    override fun getOwnDeclaredDescriptors() = getAllDescriptors()
+    override fun getOwnDeclaredDescriptors() = getDescriptors()
 
     override fun printScopeStructure(p: Printer) {
         p.println(javaClass.getSimpleName(), " {")

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt

@@ -206,7 +206,7 @@ public open class LazyClassMemberScope(resolveSession: ResolveSession,
     override fun computeExtraDescriptors(): Collection<DeclarationDescriptor> {
         val result = ArrayList<DeclarationDescriptor>()
         for (supertype in thisDescriptor.getTypeConstructor().getSupertypes()) {
-            for (descriptor in supertype.getMemberScope().getAllDescriptors()) {
+            for (descriptor in supertype.getMemberScope().getDescriptors()) {
                 if (descriptor is FunctionDescriptor) {
                     result.addAll(getFunctions(descriptor.getName()))
                 }

compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeUtils.java

@@ -61,7 +61,7 @@ public final class JetScopeUtils {
     public static Collection<CallableDescriptor> getAllExtensions(@NotNull JetScope scope) {
         Set<CallableDescriptor> result = Sets.newHashSet();
 
-        for (DeclarationDescriptor descriptor : scope.getAllDescriptors()) {
+        for (DeclarationDescriptor descriptor : scope.getDescriptors(JetScope.DescriptorKind.EXTENSIONS, JetScope.ALL_NAME_FILTER)) {
             if (descriptor instanceof CallableDescriptor) {
                 CallableDescriptor callDescriptor = (CallableDescriptor) descriptor;
                 if (callDescriptor.getExtensionReceiverParameter() != null) {

compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.kt

@@ -109,9 +109,9 @@ public class WritableScopeImpl(scope: JetScope,
             // make sure no descriptors added to allDescriptors collection
             changeLockLevel(WritableScope.LockLevel.READING)
 
-            allDescriptors.addAll(workerScope.getAllDescriptors())
+            allDescriptors.addAll(workerScope.getDescriptors())
             for (imported in getImports()) {
-                allDescriptors.addAll(imported.getAllDescriptors())
+                allDescriptors.addAll(imported.getDescriptors())
             }
         }
         return allDescriptors

compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.kt

@@ -170,10 +170,10 @@ public class WriteThroughScope(outerScope: JetScope, private val writableWorker:
 
         if (_allDescriptors == null) {
             _allDescriptors = Lists.newArrayList<DeclarationDescriptor>()
-            _allDescriptors!!.addAll(workerScope.getAllDescriptors())
+            _allDescriptors!!.addAll(workerScope.getDescriptors())
 
             for (imported in getImports()) {
-                _allDescriptors!!.addAll(imported.getAllDescriptors())
+                _allDescriptors!!.addAll(imported.getDescriptors())
             }
         }
         return _allDescriptors!!