azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace HashSet's with LinkedHashSet's for consistent behavior

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-10 22:16:27 +03:00
parent 048d34b964
commit 5696fef30f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt
+2 -2
View File
@@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.scopes.*
import org.jetbrains.jet.utils.Printer import org.jetbrains.jet.utils.Printer
import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver.LookupMode import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver.LookupMode
import java.util.HashSet import java.util.LinkedHashSet
public class LazyImportScope(private val resolveSession: ResolveSession, public class LazyImportScope(private val resolveSession: ResolveSession,
private val containingDeclaration: PackageViewDescriptor, private val containingDeclaration: PackageViewDescriptor,
@@ -160,7 +160,7 @@ public class LazyImportScope(private val resolveSession: ResolveSession,
override fun getDescriptors(kindFilterMask: Int, nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> { override fun getDescriptors(kindFilterMask: Int, nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> {
return resolveSession.getStorageManager().compute { return resolveSession.getStorageManager().compute {
val descriptors = HashSet<DeclarationDescriptor>() val descriptors = LinkedHashSet<DeclarationDescriptor>()
for (directive in importsProvider.getAllImports()) { for (directive in importsProvider.getAllImports()) {
if (directive == directiveUnderResolve) { if (directive == directiveUnderResolve) {
// This is the recursion in imports analysis // This is the recursion in imports analysis
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.kt
+1 -1
View File
@@ -61,7 +61,7 @@ public class ChainedScope(private val containingDeclaration: DeclarationDescript
override fun getDescriptors(kindFilterMask: Int, override fun getDescriptors(kindFilterMask: Int,
nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> { nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> {
val result = HashSet<DeclarationDescriptor>() val result = LinkedHashSet<DeclarationDescriptor>()
scopeChain.flatMapTo(result) { it.getDescriptors(kindFilterMask, nameFilter) } scopeChain.flatMapTo(result) { it.getDescriptors(kindFilterMask, nameFilter) }
return result return result
} }