From afaf20aea39bcad9212fb9e4fcfb6311b5dce166 Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Thu, 2 Jun 2022 18:44:53 +0200 Subject: [PATCH] [FE 1.0] Get rid of deprecated `interceptCandidates` in `CallResolutionInterceptorExtension` --- .../extensions/internal/CandidateInterceptor.kt | 17 ----------------- .../internal/NonStableExtensionPoints.kt | 15 --------------- .../calls/tower/NewResolutionOldInference.kt | 2 -- 3 files changed, 34 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/extensions/internal/CandidateInterceptor.kt b/compiler/frontend/src/org/jetbrains/kotlin/extensions/internal/CandidateInterceptor.kt index 160d562c63e..b633f423f9e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/extensions/internal/CandidateInterceptor.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/extensions/internal/CandidateInterceptor.kt @@ -14,16 +14,11 @@ import org.jetbrains.kotlin.incremental.components.LookupLocation import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.BindingTrace import org.jetbrains.kotlin.resolve.calls.CallResolver -import org.jetbrains.kotlin.resolve.calls.CandidateResolver -import org.jetbrains.kotlin.resolve.calls.KotlinCallResolver import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.kotlin.resolve.calls.inference.components.NewTypeSubstitutor -import org.jetbrains.kotlin.resolve.calls.model.CallResolutionResult import org.jetbrains.kotlin.resolve.calls.model.KotlinCallDiagnostic import org.jetbrains.kotlin.resolve.calls.model.ResolvedCallAtom -import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy import org.jetbrains.kotlin.resolve.calls.tower.ImplicitScopeTower -import org.jetbrains.kotlin.resolve.calls.tower.NewResolutionOldInference import org.jetbrains.kotlin.resolve.calls.tower.PSICallResolver import org.jetbrains.kotlin.resolve.scopes.ResolutionScope import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValueWithSmartCastInfo @@ -42,18 +37,6 @@ class CandidateInterceptor(project: Project) { extension.interceptResolvedCallAtomCandidate(it, completedCallAtom, trace, resultSubstitutor, diagnostics) } - fun interceptResolvedCandidates( - candidates: Collection, - context: BasicCallResolutionContext, - candidateResolver: CandidateResolver, - callResolver: CallResolver, - name: Name, - kind: NewResolutionOldInference.ResolutionKind, - tracing: TracingStrategy - ): Collection = extensions.fold(candidates) { it, extension -> - extension.interceptCandidates(it, context, candidateResolver, callResolver, name, kind, tracing) - } - fun interceptFunctionCandidates( candidates: Collection, scopeTower: ImplicitScopeTower, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/extensions/internal/NonStableExtensionPoints.kt b/compiler/frontend/src/org/jetbrains/kotlin/extensions/internal/NonStableExtensionPoints.kt index c3beb37b508..f1501d05a0f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/extensions/internal/NonStableExtensionPoints.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/extensions/internal/NonStableExtensionPoints.kt @@ -15,14 +15,11 @@ import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtLambdaExpression import org.jetbrains.kotlin.resolve.BindingTrace import org.jetbrains.kotlin.resolve.calls.CallResolver -import org.jetbrains.kotlin.resolve.calls.CandidateResolver import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.kotlin.resolve.calls.inference.components.NewTypeSubstitutor import org.jetbrains.kotlin.resolve.calls.model.KotlinCallDiagnostic import org.jetbrains.kotlin.resolve.calls.model.ResolvedCallAtom -import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy import org.jetbrains.kotlin.resolve.calls.tower.ImplicitScopeTower -import org.jetbrains.kotlin.resolve.calls.tower.NewResolutionOldInference import org.jetbrains.kotlin.resolve.calls.tower.PSICallResolver import org.jetbrains.kotlin.resolve.scopes.ResolutionScope import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValueWithSmartCastInfo @@ -65,18 +62,6 @@ interface CallResolutionInterceptorExtension { diagnostics: Collection ): CallableDescriptor = candidateDescriptor - @Suppress("DEPRECATION") - @JvmDefault - fun interceptCandidates( - candidates: Collection, - context: BasicCallResolutionContext, - candidateResolver: CandidateResolver, - callResolver: CallResolver, - name: Name, - kind: NewResolutionOldInference.ResolutionKind, - tracing: TracingStrategy - ): Collection = candidates - @Suppress("DEPRECATION") @JvmDefault fun interceptFunctionCandidates( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewResolutionOldInference.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewResolutionOldInference.kt index c11ea61f12f..d4873124231 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewResolutionOldInference.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewResolutionOldInference.kt @@ -201,8 +201,6 @@ class NewResolutionOldInference( ) } - candidates = candidateInterceptor.interceptResolvedCandidates(candidates, context, candidateResolver, callResolver, name, kind, tracing) - if (candidates.isEmpty()) { if (reportAdditionalDiagnosticIfNoCandidates(context, nameToResolve, kind, scopeTower, detailedReceiver)) { return OverloadResolutionResultsImpl.nameNotFound()