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

Minor. Name clash removed (workaround for KT-1)

Browse Source
This commit is contained in:
Andrey Breslav
2014-02-27 16:24:53 +04:00
parent e70571bafb
commit ed81102b2f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt
+2 -2
View File
@@ -40,7 +40,7 @@ public abstract class LazyJavaMemberScope(
protected val c: LazyJavaResolverContextWithTypes, protected val c: LazyJavaResolverContextWithTypes,
private val _containingDeclaration: DeclarationDescriptor private val _containingDeclaration: DeclarationDescriptor
) : JetScope { ) : JetScope {
private val allDescriptors = c.storageManager.createRecursionTolerantLazyValue<Collection<DeclarationDescriptor>>( private val _allDescriptors = c.storageManager.createRecursionTolerantLazyValue<Collection<DeclarationDescriptor>>(
{computeAllDescriptors()}, {computeAllDescriptors()},
// This is to avoid the following recursive case: // This is to avoid the following recursive case:
// when computing getAllPackageNames() we ask the JavaPsiFacade for all subpackages of foo // when computing getAllPackageNames() we ask the JavaPsiFacade for all subpackages of foo
@@ -309,7 +309,7 @@ public abstract class LazyJavaMemberScope(
override fun getDeclarationsByLabel(labelName: LabelName) = listOf<DeclarationDescriptor>() override fun getDeclarationsByLabel(labelName: LabelName) = listOf<DeclarationDescriptor>()
override fun getOwnDeclaredDescriptors() = getAllDescriptors() override fun getOwnDeclaredDescriptors() = getAllDescriptors()
override fun getAllDescriptors() = allDescriptors() override fun getAllDescriptors() = _allDescriptors()
private fun computeAllDescriptors(): MutableCollection<DeclarationDescriptor> { private fun computeAllDescriptors(): MutableCollection<DeclarationDescriptor> {
val result = LinkedHashSet<DeclarationDescriptor>() val result = LinkedHashSet<DeclarationDescriptor>()