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

[FE 1.0] Rename DelegatedPropertyInferenceSession to DelegateInferenceSession

Browse Source
This commit is contained in:
Victor Petukhov
2021-12-24 12:45:37 +03:00
committed by teamcity
parent ab207ca58f
commit 27ed4a7dc2
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegateInferenceSession.kt
+2 -2
View File
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.types.TypeConstructor
import org.jetbrains.kotlin.types.UnwrappedType import org.jetbrains.kotlin.types.UnwrappedType
import org.jetbrains.kotlin.util.OperatorNameConventions import org.jetbrains.kotlin.util.OperatorNameConventions
class DelegatedPropertyInferenceSession( class DelegateInferenceSession(
val variableDescriptor: VariableDescriptorWithAccessors, val variableDescriptor: VariableDescriptorWithAccessors,
val expectedType: UnwrappedType?, val expectedType: UnwrappedType?,
psiCallResolver: PSICallResolver, psiCallResolver: PSICallResolver,
@@ -47,7 +47,7 @@ class DelegatedPropertyInferenceSession(
fun getNestedBuilderInferenceSessions(): List<BuilderInferenceSession> { fun getNestedBuilderInferenceSessions(): List<BuilderInferenceSession> {
val builderInferenceSessions = nestedInferenceSessions.filterIsInstance<BuilderInferenceSession>() val builderInferenceSessions = nestedInferenceSessions.filterIsInstance<BuilderInferenceSession>()
val delegatedPropertyInferenceSessions = nestedInferenceSessions.filterIsInstance<DelegatedPropertyInferenceSession>() val delegatedPropertyInferenceSessions = nestedInferenceSessions.filterIsInstance<DelegateInferenceSession>()
return builderInferenceSessions + delegatedPropertyInferenceSessions.map { it.getNestedBuilderInferenceSessions() }.flatten() return builderInferenceSessions + delegatedPropertyInferenceSessions.map { it.getNestedBuilderInferenceSessions() }.flatten()
} }
compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.kt
+1 -1
View File
@@ -656,7 +656,7 @@ class DelegatedPropertyResolver(
inferenceSession: InferenceSession inferenceSession: InferenceSession
): UnwrappedType { ): UnwrappedType {
val expectedType = if (variableDescriptor.type !is DeferredType) variableDescriptor.type.unwrap() else null val expectedType = if (variableDescriptor.type !is DeferredType) variableDescriptor.type.unwrap() else null
val newInferenceSession = DelegatedPropertyInferenceSession( val newInferenceSession = DelegateInferenceSession(
variableDescriptor, expectedType, psiCallResolver, variableDescriptor, expectedType, psiCallResolver,
postponedArgumentsAnalyzer, kotlinConstraintSystemCompleter, postponedArgumentsAnalyzer, kotlinConstraintSystemCompleter,
callComponents, builtIns, inferenceSession callComponents, builtIns, inferenceSession
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/BuilderInferenceSession.kt
+1 -1
View File
@@ -269,7 +269,7 @@ class BuilderInferenceSession(
for (nestedSession in nestedInferenceSessions) { for (nestedSession in nestedInferenceSessions) {
when (nestedSession) { when (nestedSession) {
is BuilderInferenceSession -> add(nestedSession) is BuilderInferenceSession -> add(nestedSession)
is DelegatedPropertyInferenceSession -> addAll(nestedSession.getNestedBuilderInferenceSessions()) is DelegateInferenceSession -> addAll(nestedSession.getNestedBuilderInferenceSessions())
} }
} }
} }