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

[NI] Use infered delegate expression type if there is no resolved call in trace

Browse Source 
#KT-35707 Fixed
This commit is contained in:
Dmitriy Novozhilov
2019-12-27 11:49:24 +03:00
parent 605ef647e6
commit 9367c6a762
8 changed files with 55 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.kt
+5 -3
View File
@@ -632,16 +632,18 @@ class DelegatedPropertyResolver(
result?.let { recordResolvedDelegateOrReportError(it.overloadResolutionResults, isGet) }
}
val resolvedDelegateType = extractResolvedDelegateType(delegateExpression, trace)
val resolvedDelegateType = extractResolvedDelegateType(delegateExpression, trace, delegateType)
trace.recordType(delegateExpression, resolvedDelegateType)
trace.commit()
return resolvedDelegateType.unwrap()
}
private fun extractResolvedDelegateType(delegateExpression: KtExpression, trace: BindingTrace): KotlinType {
private fun extractResolvedDelegateType(delegateExpression: KtExpression, trace: BindingTrace, delegateType: KotlinType): KotlinType {
val call = delegateExpression.getCall(trace.bindingContext)
val pretendReturnType = call.getResolvedCall(trace.bindingContext)?.resultingDescriptor?.returnType
return pretendReturnType?.takeUnless { !it.isProperType() } ?: ErrorUtils.createErrorType("Type for ${delegateExpression.text}")
return pretendReturnType?.takeIf { it.isProperType() }
?: delegateType.takeIf { it.isProperType() }
?: ErrorUtils.createErrorType("Type for ${delegateExpression.text}")
}
private fun KotlinType.isProperType(): Boolean {