From e5481d595694f46e23f87c7258fa815b89e9a85e Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Mon, 18 Jun 2012 20:50:18 +0400
Subject: [PATCH] Revert "smarter WritableScopeImpl.getAllDescriptors"

This reverts commit 4d229144cf370c5f547a71e7f2d310aa5803c467.
---
 .../resolve/scopes/WritableScopeImpl.java     | 36 +++----------------
 1 file changed, 4 insertions(+), 32 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java
index fb0d02d18c2..d2f2b18ed81 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java
@@ -124,49 +124,21 @@ public class WritableScopeImpl extends WritableScopeWithImports {
         super.clearImports();
     }
 
-    @NotNull
-    private Collection<DeclarationDescriptor> getInheritedDescriptors(@NotNull DescriptorPredicate predicate) {
-        Collection<DeclarationDescriptor> r = Lists.newArrayList();
-        r.addAll(getWorkerScope().getAllDescriptors(predicate));
-        for (JetScope imported : getImports()) {
-            r.addAll(imported.getAllDescriptors(predicate));
-        }
-        return r;
-    }
-
-    @NotNull
-    private static <A> Collection<A> concat(@NotNull Collection<A> c1, @NotNull Collection<A> c2) {
-        if (c1.isEmpty()) {
-            return c2;
-        }
-        else if (c2.isEmpty()) {
-            return c1;
-        }
-        else {
-            Collection<A> r = Lists.newArrayListWithCapacity(c1.size() + c2.size());
-            r.addAll(c1);
-            r.addAll(c2);
-            return r;
-        }
-    }
-
     @NotNull
     @Override
     public Collection<DeclarationDescriptor> getAllDescriptors(@NotNull DescriptorPredicate predicate) {
         checkMayRead();
 
         if (!allDescriptorsDone) {
-            if (!predicate.includeAll()) {
-                // super-optimized version
-                return concat(allDescriptors, getInheritedDescriptors(predicate));
-            }
-
             allDescriptorsDone = true;
 
             // make sure no descriptors added to allDescriptors collection
             changeLockLevel(LockLevel.READING);
 
-            allDescriptors.addAll(getInheritedDescriptors(DescriptorPredicate.all()));
+            allDescriptors.addAll(getWorkerScope().getAllDescriptors(DescriptorPredicate.all()));
+            for (JetScope imported : getImports()) {
+                allDescriptors.addAll(imported.getAllDescriptors(DescriptorPredicate.all()));
+            }
         }
         return DescriptorPredicateUtils.filter(allDescriptors, predicate);
     }