From 23f6c29efc01f7db4d6b3c7175463b8a637be29c Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Fri, 1 Oct 2021 15:48:24 +0300 Subject: [PATCH] Provide some additional proxies for external use of deprecate package `org.jetbrains.kotlin.resolve.calls.callUtil` Provided API is `getCalleeExpressionIfAny` and `createLookupLocation` --- .../kotlin/resolve/calls/callUtil/callUtil.kt | 34 ++++++++++++++++--- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/callUtil/callUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/callUtil/callUtil.kt index 26cee68985b..c877a30a764 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/callUtil/callUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/callUtil/callUtil.kt @@ -6,38 +6,62 @@ package org.jetbrains.kotlin.resolve.calls.callUtil import org.jetbrains.kotlin.descriptors.CallableDescriptor +import org.jetbrains.kotlin.incremental.KotlinLookupLocation import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall import org.jetbrains.kotlin.resolve.calls.util.getCall import org.jetbrains.kotlin.resolve.calls.util.getType +import org.jetbrains.kotlin.resolve.calls.util.getCalleeExpressionIfAny +import org.jetbrains.kotlin.resolve.calls.util.createLookupLocation import org.jetbrains.kotlin.types.KotlinType @Deprecated( "Use org.jetbrains.kotlin.resolve.calls.util.getResolvedCall instead.", - ReplaceWith("org.jetbrains.kotlin.resolve.calls.util.getResolvedCall"), + ReplaceWith("getResolvedCall", "org.jetbrains.kotlin.resolve.calls.util.getResolvedCall"), level = DeprecationLevel.ERROR ) fun Call?.getResolvedCall(context: BindingContext): ResolvedCall? = getResolvedCall(context) @Deprecated( "Use org.jetbrains.kotlin.resolve.calls.util.getResolvedCall instead.", - ReplaceWith("org.jetbrains.kotlin.resolve.calls.util.getResolvedCall"), + ReplaceWith("getResolvedCall", "org.jetbrains.kotlin.resolve.calls.util.getResolvedCall"), level = DeprecationLevel.ERROR ) fun KtElement?.getResolvedCall(context: BindingContext): ResolvedCall? = getResolvedCall(context) @Deprecated( "Use org.jetbrains.kotlin.resolve.calls.util.getType instead.", - ReplaceWith("org.jetbrains.kotlin.resolve.calls.util.getType"), + ReplaceWith("getType", "org.jetbrains.kotlin.resolve.calls.util.getType"), level = DeprecationLevel.ERROR ) fun KtExpression.getType(context: BindingContext): KotlinType? = getType(context) @Deprecated( "Use org.jetbrains.kotlin.resolve.calls.util.getCall instead.", - ReplaceWith("org.jetbrains.kotlin.resolve.calls.util.getCall"), + ReplaceWith("getType", "org.jetbrains.kotlin.resolve.calls.util.getCall"), level = DeprecationLevel.ERROR ) -fun KtElement.getCall(context: BindingContext): Call? = getCall(context) \ No newline at end of file +fun KtElement.getCall(context: BindingContext): Call? = getCall(context) + +@Deprecated( + "Use org.jetbrains.kotlin.resolve.calls.util.getCalleeExpressionIfAny instead.", + ReplaceWith("getCalleeExpressionIfAny", "org.jetbrains.kotlin.resolve.calls.util.getCalleeExpressionIfAny"), + level = DeprecationLevel.ERROR +) +fun KtElement?.getCalleeExpressionIfAny(): KtExpression? = getCalleeExpressionIfAny() + +@Deprecated( + "Use org.jetbrains.kotlin.resolve.calls.util.createLookupLocation instead.", + ReplaceWith("createLookupLocation", "org.jetbrains.kotlin.resolve.calls.util.createLookupLocation"), + level = DeprecationLevel.ERROR +) +fun Call.createLookupLocation(): KotlinLookupLocation = createLookupLocation() + +@Deprecated( + "Use org.jetbrains.kotlin.resolve.calls.util.createLookupLocation instead.", + ReplaceWith("createLookupLocation", "org.jetbrains.kotlin.resolve.calls.util.createLookupLocation"), + level = DeprecationLevel.ERROR +) +fun KtExpression.createLookupLocation(): KotlinLookupLocation? = createLookupLocation()