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

Minor: use NoLookupLocation.WHEN_GET_SUPER_MEMBERS

Browse Source 
for unqualified 'super' resolution
This commit is contained in:
Dmitry Petrov
2016-07-01 15:26:28 +03:00
parent bf4f26318e
commit dbf38823b9
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/unqualifiedSuper/unqualifiedSuper.kt
+18 -10
View File
@@ -49,19 +49,18 @@ fun resolveUnqualifiedSuperFromExpressionContext(
val calleeExpression = selectorExpression.calleeExpression val calleeExpression = selectorExpression.calleeExpression
if (calleeExpression is KtSimpleNameExpression) { if (calleeExpression is KtSimpleNameExpression) {
val calleeName = calleeExpression.getReferencedNameAsName() val calleeName = calleeExpression.getReferencedNameAsName()
val location = NoLookupLocation.WHEN_TYPING
if (isCallingMethodOfAny(selectorExpression, calleeName)) { if (isCallingMethodOfAny(selectorExpression, calleeName)) {
return resolveSupertypesForMethodOfAny(supertypes, calleeName, location, anyType) return resolveSupertypesForMethodOfAny(supertypes, calleeName, anyType)
} }
else { else {
return resolveSupertypesByCalleeName(supertypes, calleeName, location) return resolveSupertypesByCalleeName(supertypes, calleeName)
} }
} }
} }
is KtSimpleNameExpression -> { is KtSimpleNameExpression -> {
// super.x: x can be a property only // super.x: x can be a property only
// NB there are no properties in kotlin.Any // NB there are no properties in kotlin.Any
return resolveSupertypesByPropertyName(supertypes, selectorExpression.getReferencedNameAsName(), NoLookupLocation.WHEN_TYPING) return resolveSupertypesByPropertyName(supertypes, selectorExpression.getReferencedNameAsName())
} }
} }
} }
@@ -94,22 +93,31 @@ private fun isCallingMethodOfAnyWithSuper(superExpression: KtSuperExpression): B
return false return false
} }
private val LOOKUP_LOCATION = NoLookupLocation.WHEN_GET_SUPER_MEMBERS
private fun KotlinType.isInterface(): Boolean = private fun KotlinType.isInterface(): Boolean =
TypeUtils.getClassDescriptor(this)?.kind == ClassKind.INTERFACE TypeUtils.getClassDescriptor(this)?.kind == ClassKind.INTERFACE
private fun resolveSupertypesForMethodOfAny(supertypes: Collection<KotlinType>, calleeName: Name, location: LookupLocation, anyType: KotlinType): Collection<KotlinType> { private fun resolveSupertypesForMethodOfAny(supertypes: Collection<KotlinType>, calleeName: Name, anyType: KotlinType): Collection<KotlinType> {
val typesWithConcreteOverride = resolveSupertypesByMembers(supertypes, false) { getFunctionMembers(it, calleeName, location) } val typesWithConcreteOverride = resolveSupertypesByMembers(supertypes, false) {
getFunctionMembers(it, calleeName, LOOKUP_LOCATION)
}
return if (typesWithConcreteOverride.isNotEmpty()) return if (typesWithConcreteOverride.isNotEmpty())
typesWithConcreteOverride typesWithConcreteOverride
else else
anyType.singletonList() anyType.singletonList()
} }
private fun resolveSupertypesByCalleeName(supertypes: Collection<KotlinType>, calleeName: Name, location: LookupLocation): Collection<KotlinType> = private fun resolveSupertypesByCalleeName(supertypes: Collection<KotlinType>, calleeName: Name): Collection<KotlinType> =
resolveSupertypesByMembers(supertypes, true) { getFunctionMembers(it, calleeName, location) + getPropertyMembers(it, calleeName, location) } resolveSupertypesByMembers(supertypes, true) {
getFunctionMembers(it, calleeName, LOOKUP_LOCATION) +
getPropertyMembers(it, calleeName, LOOKUP_LOCATION)
}
private fun resolveSupertypesByPropertyName(supertypes: Collection<KotlinType>, propertyName: Name, location: LookupLocation): Collection<KotlinType> = private fun resolveSupertypesByPropertyName(supertypes: Collection<KotlinType>, propertyName: Name): Collection<KotlinType> =
resolveSupertypesByMembers(supertypes, true) { getPropertyMembers(it, propertyName, location) } resolveSupertypesByMembers(supertypes, true) {
getPropertyMembers(it, propertyName, LOOKUP_LOCATION)
}
private inline fun resolveSupertypesByMembers( private inline fun resolveSupertypesByMembers(
supertypes: Collection<KotlinType>, supertypes: Collection<KotlinType>,