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

[NI] Record information about delegated property as in old inference

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2018-03-23 15:54:44 +03:00
parent 7e982fed4f
commit 3dde31729e
16 changed files with 36 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.kt
+9 -41
View File
@@ -84,11 +84,6 @@ class DelegatedPropertyResolver(
ScopeUtils.makeScopeForPropertyInitializer(propertyHeaderScope, variableDescriptor)
else propertyHeaderScope
if (languageVersionSettings.supportsFeature(LanguageFeature.NewInference)) {
resolveWithNewInference(delegateExpression, variableDescriptor, initializerScope, trace, outerDataFlowInfo)
return
}
val byExpressionType =
resolveDelegateExpression(delegateExpression, property, variableDescriptor, initializerScope, trace, outerDataFlowInfo)
@@ -460,11 +455,6 @@ class DelegatedPropertyResolver(
trace: BindingTrace,
dataFlowInfo: DataFlowInfo
): KotlinType {
if (languageVersionSettings.supportsFeature(LanguageFeature.NewInference)) {
return resolveWithNewInference(delegateExpression, variableDescriptor, scopeForDelegate, trace, dataFlowInfo)
?: ErrorUtils.createErrorType("Type for " + delegateExpression.getText())
}
val traceToResolveDelegatedProperty = TemporaryBindingTrace.create(trace, "Trace to resolve delegated property")
val propertyExpectedType = if (property.typeReference != null) variableDescriptor.type else NO_EXPECTED_TYPE
@@ -482,10 +472,12 @@ class DelegatedPropertyResolver(
traceToResolveDelegatedProperty.record(CONSTRAINT_SYSTEM_COMPLETER, it, completer)
}
val delegatedPropertyTypeFromNI =
resolveWithNewInference(delegateExpression, variableDescriptor, scopeForDelegate, trace, dataFlowInfo)
val delegateType = expressionTypingServices.safeGetType(
scopeForDelegate,
delegateExpression,
NO_EXPECTED_TYPE,
delegatedPropertyTypeFromNI ?: NO_EXPECTED_TYPE,
dataFlowInfo,
traceToResolveDelegatedProperty
)
@@ -506,9 +498,11 @@ class DelegatedPropertyResolver(
trace.getType(delegateExpression)?.let { return it }
val traceToResolveDelegatedProperty = TemporaryBindingTrace.create(trace, "Trace to resolve delegated property")
val delegateTypeInfo = expressionTypingServices.getTypeInfo(
scopeForDelegate, delegateExpression, NO_EXPECTED_TYPE, dataFlowInfo,
trace, false, delegateExpression, ContextDependency.DEPENDENT
traceToResolveDelegatedProperty, false, delegateExpression, ContextDependency.DEPENDENT
)
var delegateType = delegateTypeInfo.type ?: return null
@@ -516,7 +510,7 @@ class DelegatedPropertyResolver(
if (languageVersionSettings.supportsFeature(LanguageFeature.OperatorProvideDelegate)) {
val contextForProvideDelegate = createContextForProvideDelegateMethod(
scopeForDelegate, delegateDataFlow, trace, InferenceSessionForExistingCandidates
scopeForDelegate, delegateDataFlow, traceToResolveDelegatedProperty, InferenceSessionForExistingCandidates
)
val provideDelegateResults = getProvideDelegateMethod(
variableDescriptor, delegateExpression, delegateType, contextForProvideDelegate
@@ -532,7 +526,7 @@ class DelegatedPropertyResolver(
}
return inferDelegateTypeFromGetSetValueMethods(
delegateExpression, variableDescriptor, scopeForDelegate, trace, delegateType, delegateDataFlow
delegateExpression, variableDescriptor, scopeForDelegate, traceToResolveDelegatedProperty, delegateType, delegateDataFlow
)
}
@@ -571,12 +565,10 @@ class DelegatedPropertyResolver(
}
val resolutionCallbacks = psiCallResolver.createResolutionCallbacks(trace, inferenceSession)
val results = inferenceSession.resolveCandidates(resolutionCallbacks)
inferenceSession.resolveCandidates(resolutionCallbacks)
val resolvedDelegateType = extractResolvedDelegateType(delegateExpression, trace)
recordResolutionResults(variableDescriptor, results, delegateExpression, resolvedDelegateType, trace)
return AnonymousTypeSubstitutor.safeSubstitute(resolvedDelegateType.unwrap())
}
@@ -586,30 +578,6 @@ class DelegatedPropertyResolver(
return pretendReturnType?.takeUnless { !it.isProperType() } ?: ErrorUtils.createErrorType("Type for ${delegateExpression.text}")
}
private fun recordResolutionResults(
variableDescriptor: VariableDescriptorWithAccessors,
results: List<ResolutionResultCallInfo<FunctionDescriptor>>,
delegateExpression: KtExpression,
delegateType: KotlinType,
trace: BindingTrace
) {
for ((resolutionResult, overloadResolutionResults) in results) {
val name = resolutionResult.resultCallAtom()?.atom?.name ?: continue
val accessor = variableDescriptor.accessorBy(name) ?: continue
reportAndRecordDelegateOperatorResults(
overloadResolutionResults, variableDescriptor, accessor, delegateExpression, delegateType, trace
)
}
}
private fun VariableDescriptorWithAccessors.accessorBy(name: Name): VariableAccessorDescriptor? =
when (name) {
OperatorNameConventions.GET_VALUE -> getter
OperatorNameConventions.SET_VALUE -> setter
else -> null
}
private fun KotlinType.isProperType(): Boolean {
return !contains { it.constructor is TypeVariableTypeConstructor }
}