From 99001f0fe2099c557f3bf7593284fdeb0bfecd81 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Thu, 11 Jun 2015 16:21:00 +0300
Subject: [PATCH] More correct and simple

---
 .../org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt
index 92fa18a6c09..c74dcca9c49 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt
@@ -39,7 +39,6 @@ public class WritableScopeImpl(override val workerScope: JetScope,
 : AbstractScopeAdapter(), WritableScope {
 
     private val explicitlyAddedDescriptors = SmartList<DeclarationDescriptor>()
-    private val ownDeclaredDescriptors = ArrayList<DeclarationDescriptor>()
 
     private var functionGroups: SetMultimap<Name, FunctionDescriptor>? = null
 
@@ -122,7 +121,6 @@ public class WritableScopeImpl(override val workerScope: JetScope,
         variableOrClassDescriptors!!.put(name, descriptor)
 
         explicitlyAddedDescriptors.add(descriptor)
-        ownDeclaredDescriptors.add(descriptor)
     }
 
     override fun addVariableDescriptor(variableDescriptor: VariableDescriptor) {
@@ -206,7 +204,7 @@ public class WritableScopeImpl(override val workerScope: JetScope,
             super<AbstractScopeAdapter>.getImplicitReceiversHierarchy()
     }
 
-    override fun getOwnDeclaredDescriptors(): Collection<DeclarationDescriptor> = ownDeclaredDescriptors
+    override fun getOwnDeclaredDescriptors(): Collection<DeclarationDescriptor> = explicitlyAddedDescriptors
 
     override fun toString(): String {
         return javaClass.getSimpleName() + "@" + Integer.toHexString(System.identityHashCode(this)) + " " + debugName + " for " + getContainingDeclaration()