diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegateInferenceSession.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegateInferenceSession.kt index 65f2ff319f0..58f3acba0a8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegateInferenceSession.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegateInferenceSession.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.types.TypeConstructor import org.jetbrains.kotlin.types.UnwrappedType import org.jetbrains.kotlin.util.OperatorNameConventions -class DelegatedPropertyInferenceSession( +class DelegateInferenceSession( val variableDescriptor: VariableDescriptorWithAccessors, val expectedType: UnwrappedType?, psiCallResolver: PSICallResolver, @@ -47,7 +47,7 @@ class DelegatedPropertyInferenceSession( fun getNestedBuilderInferenceSessions(): List { val builderInferenceSessions = nestedInferenceSessions.filterIsInstance() - val delegatedPropertyInferenceSessions = nestedInferenceSessions.filterIsInstance() + val delegatedPropertyInferenceSessions = nestedInferenceSessions.filterIsInstance() return builderInferenceSessions + delegatedPropertyInferenceSessions.map { it.getNestedBuilderInferenceSessions() }.flatten() } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.kt index 0d50ff12f3b..6ba57eecf45 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.kt @@ -656,7 +656,7 @@ class DelegatedPropertyResolver( inferenceSession: InferenceSession ): UnwrappedType { val expectedType = if (variableDescriptor.type !is DeferredType) variableDescriptor.type.unwrap() else null - val newInferenceSession = DelegatedPropertyInferenceSession( + val newInferenceSession = DelegateInferenceSession( variableDescriptor, expectedType, psiCallResolver, postponedArgumentsAnalyzer, kotlinConstraintSystemCompleter, callComponents, builtIns, inferenceSession diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/BuilderInferenceSession.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/BuilderInferenceSession.kt index 717a0c0d981..7662fa9d242 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/BuilderInferenceSession.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/BuilderInferenceSession.kt @@ -269,7 +269,7 @@ class BuilderInferenceSession( for (nestedSession in nestedInferenceSessions) { when (nestedSession) { is BuilderInferenceSession -> add(nestedSession) - is DelegatedPropertyInferenceSession -> addAll(nestedSession.getNestedBuilderInferenceSessions()) + is DelegateInferenceSession -> addAll(nestedSession.getNestedBuilderInferenceSessions()) } } }