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

Refine double colon LHS resolution if expression is an object

Browse Source
This commit is contained in:
Alexander Udalov
2016-07-01 16:05:40 +03:00
parent 5a6237b357
commit 7b59864ed9
6 changed files with 131 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DoubleColonExpressionResolver.kt
+16 -4
View File
@@ -51,7 +51,7 @@ import org.jetbrains.kotlin.types.expressions.typeInfoFactory.createTypeInfo
import javax.inject.Inject
sealed class DoubleColonLHS(val type: KotlinType) {
class Expression(typeInfo: KotlinTypeInfo) : DoubleColonLHS(typeInfo.type!!) {
class Expression(typeInfo: KotlinTypeInfo, val isObject: Boolean) : DoubleColonLHS(typeInfo.type!!) {
val dataFlowInfo: DataFlowInfo = typeInfo.dataFlowInfo
}
@@ -160,8 +160,10 @@ class DoubleColonExpressionResolver(
private fun resolveDoubleColonLHS(doubleColonExpression: KtDoubleColonExpression, c: ExpressionTypingContext): DoubleColonLHS? {
val resultForExpr = tryResolveLHS(doubleColonExpression, c, this::shouldTryResolveLHSAsExpression, this::resolveExpressionOnLHS)
if (resultForExpr != null) {
val lhs = resultForExpr.lhs
if (lhs != null) {
val lhs = resultForExpr.lhs as DoubleColonLHS.Expression?
// If expression result is an object, we remember this and skip it here, because there are valid situations where
// another type (representing another classifier) should win
if (lhs != null && !lhs.isObject) {
return resultForExpr.commit()
}
}
@@ -171,6 +173,12 @@ class DoubleColonExpressionResolver(
}
if (resultForType != null) {
val lhs = resultForType.lhs
if (resultForExpr != null && lhs != null && lhs.type == resultForExpr.lhs?.type) {
// If we skipped an object expression result before and the type result is the same, this means that
// there were no other classifier except that object that could win. We prefer to treat the LHS as an expression here,
// to have a bound callable reference / class literal
return resultForExpr.commit()
}
if (lhs != null) {
return resultForType.commit()
}
@@ -235,13 +243,17 @@ class DoubleColonExpressionResolver(
if (resultingDescriptor is FakeCallableDescriptorForObject) {
val classDescriptor = resultingDescriptor.classDescriptor
if (classDescriptor.companionObjectDescriptor != null) return null
if (DescriptorUtils.isObject(classDescriptor)) {
return DoubleColonLHS.Expression(typeInfo, isObject = true)
}
}
// Check if this is resolved to a function (with the error "arguments expected"), such as in "Runnable::class"
if (expression.canBeConsideredProperType() && resultingDescriptor !is VariableDescriptor) return null
}
return DoubleColonLHS.Expression(typeInfo)
return DoubleColonLHS.Expression(typeInfo, isObject = false)
}
private fun resolveTypeOnLHS(