From 2ab86192c359e50c974ce0d113ea356c6df22d51 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 11 Jun 2015 16:18:11 +0300 Subject: [PATCH] One more simplification --- .../jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 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 cd20c325926..92fa18a6c09 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,7 @@ public class WritableScopeImpl(override val workerScope: JetScope, : AbstractScopeAdapter(), WritableScope { private val explicitlyAddedDescriptors = SmartList() - private val declaredDescriptorsAccessibleBySimpleName = HashMultimap.create() + private val ownDeclaredDescriptors = ArrayList() private var functionGroups: SetMultimap? = null @@ -122,7 +122,7 @@ public class WritableScopeImpl(override val workerScope: JetScope, variableOrClassDescriptors!!.put(name, descriptor) explicitlyAddedDescriptors.add(descriptor) - declaredDescriptorsAccessibleBySimpleName.put(name, descriptor) + ownDeclaredDescriptors.add(descriptor) } override fun addVariableDescriptor(variableDescriptor: VariableDescriptor) { @@ -206,8 +206,7 @@ public class WritableScopeImpl(override val workerScope: JetScope, super.getImplicitReceiversHierarchy() } - override fun getOwnDeclaredDescriptors(): Collection - = declaredDescriptorsAccessibleBySimpleName.values() + override fun getOwnDeclaredDescriptors(): Collection = ownDeclaredDescriptors override fun toString(): String { return javaClass.getSimpleName() + "@" + Integer.toHexString(System.identityHashCode(this)) + " " + debugName + " for " + getContainingDeclaration()