diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt index 7e794a69c43..ca8cd8df7c2 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt @@ -115,9 +115,14 @@ class Candidate( var functionTypesOfSamConversions: HashMap? = null lateinit var typeArgumentMapping: TypeArgumentMapping val postponedAtoms = mutableListOf() + + // PCLA-related parts val postponedPCLACalls = mutableListOf() val lambdasAnalyzedWithPCLA = mutableListOf() - val onCompletionResultsWritingCallbacks = mutableListOf<(ConeSubstitutor) -> Unit>() + + // Currently, it's only about completion results writing for property delegation inference info + // See the call sites of [FirDelegatedPropertyInferenceSession.completeSessionOrPostponeIfNonRoot] + val onPCLACompletionResultsWritingCallbacks = mutableListOf<(ConeSubstitutor) -> Unit>() var currentApplicability = CandidateApplicability.RESOLVED private set diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirPCLAInferenceSession.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirPCLAInferenceSession.kt index 4bd3d786a56..a3dcf8676be 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirPCLAInferenceSession.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirPCLAInferenceSession.kt @@ -123,7 +123,7 @@ class FirPCLAInferenceSession( ) { outerCandidate.postponedPCLACalls += childCalls currentCommonSystem.addOtherSystem(childStorage) - outerCandidate.onCompletionResultsWritingCallbacks += onCompletionResultsWriting + outerCandidate.onPCLACompletionResultsWritingCallbacks += onCompletionResultsWriting } private fun FirExpression.updateReturnTypeWithCurrentSubstitutor( diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt index 16a86cc8804..0f72939ce98 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt @@ -194,7 +194,7 @@ class FirCallCompletionResultsWriterTransformer( postponedCall.transformSingle(this, null) } - for (callback in candidate.onCompletionResultsWritingCallbacks) { + for (callback in candidate.onPCLACompletionResultsWritingCallbacks) { callback(finalSubstitutor) }