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

Minor. Inline parameter

Browse Source
This commit is contained in:
Denis Zharkov
2015-09-30 20:34:11 +03:00
parent 27b231cd7d
commit dfe93406d9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt
+3 -3
View File
@@ -91,7 +91,7 @@ public class LazyJavaClassMemberScope(
computeAnnotationProperties(name, result) computeAnnotationProperties(name, result)
} }
val propertiesFromSupertypes = getPropertiesFromSupertypes(name, getContainingDeclaration()) val propertiesFromSupertypes = getPropertiesFromSupertypes(name)
result.addAll(DescriptorResolverUtils.resolveOverrides(name, propertiesFromSupertypes, result, getContainingDeclaration(), result.addAll(DescriptorResolverUtils.resolveOverrides(name, propertiesFromSupertypes, result, getContainingDeclaration(),
c.components.errorReporter)) c.components.errorReporter))
@@ -118,8 +118,8 @@ public class LazyJavaClassMemberScope(
result.add(propertyDescriptor) result.add(propertyDescriptor)
} }
private fun getPropertiesFromSupertypes(name: Name, descriptor: ClassDescriptor): Set<PropertyDescriptor> { private fun getPropertiesFromSupertypes(name: Name): Set<PropertyDescriptor> {
return descriptor.typeConstructor.supertypes.flatMap { return getContainingDeclaration().typeConstructor.supertypes.flatMap {
it.memberScope.getProperties(name, NoLookupLocation.WHEN_GET_SUPER_MEMBERS).map { p -> p as PropertyDescriptor } it.memberScope.getProperties(name, NoLookupLocation.WHEN_GET_SUPER_MEMBERS).map { p -> p as PropertyDescriptor }
}.toSet() }.toSet()
} }