diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt index b6fca702830..8db6019d055 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.scopes.* import org.jetbrains.jet.utils.Printer import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver.LookupMode -import java.util.HashSet +import java.util.LinkedHashSet public class LazyImportScope(private val resolveSession: ResolveSession, private val containingDeclaration: PackageViewDescriptor, @@ -160,7 +160,7 @@ public class LazyImportScope(private val resolveSession: ResolveSession, override fun getDescriptors(kindFilterMask: Int, nameFilter: (Name) -> Boolean): Collection { return resolveSession.getStorageManager().compute { - val descriptors = HashSet() + val descriptors = LinkedHashSet() for (directive in importsProvider.getAllImports()) { if (directive == directiveUnderResolve) { // This is the recursion in imports analysis diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.kt index 71487d041b7..e42f2b2aaa4 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.kt @@ -61,7 +61,7 @@ public class ChainedScope(private val containingDeclaration: DeclarationDescript override fun getDescriptors(kindFilterMask: Int, nameFilter: (Name) -> Boolean): Collection { - val result = HashSet() + val result = LinkedHashSet() scopeChain.flatMapTo(result) { it.getDescriptors(kindFilterMask, nameFilter) } return result }