Fix compilation after @JvmDefault deprecation
Suppress could be removed after switch to -Xjvm-default=all
This commit is contained in:
@@ -51,7 +51,6 @@ interface BaseExpressionCodegen {
|
||||
|
||||
fun consumeReifiedOperationMarker(typeParameter: TypeParameterMarker)
|
||||
|
||||
@JvmDefault
|
||||
fun putReifiedOperationMarkerIfTypeIsReifiedParameter(type: KotlinTypeMarker, operationKind: OperationKind) {
|
||||
with(typeSystem) {
|
||||
val (typeParameter, second) = extractReificationArgument(type) ?: return
|
||||
|
||||
@@ -88,6 +88,7 @@ import org.jetbrains.kotlin.synthetic.SyntheticJavaPropertyDescriptor;
|
||||
import org.jetbrains.kotlin.types.*;
|
||||
import org.jetbrains.kotlin.types.checker.ClassicTypeSystemContextImpl;
|
||||
import org.jetbrains.kotlin.types.expressions.DoubleColonLHS;
|
||||
import org.jetbrains.kotlin.types.model.KotlinTypeMarker;
|
||||
import org.jetbrains.kotlin.types.model.TypeParameterMarker;
|
||||
import org.jetbrains.kotlin.types.typesApproximation.CapturedTypeApproximationKt;
|
||||
import org.jetbrains.kotlin.util.OperatorNameConventions;
|
||||
@@ -5532,4 +5533,11 @@ The "returned" value of try expression with no finally is either the last expres
|
||||
parentCodegen.getReifiedTypeParametersUsages().addUsedReifiedParameter(typeParameterDescriptor.getName().asString());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void putReifiedOperationMarkerIfTypeIsReifiedParameter(
|
||||
@NotNull KotlinTypeMarker type, @NotNull ReifiedTypeInliner.OperationKind operationKind
|
||||
) {
|
||||
BaseExpressionCodegen.DefaultImpls.putReifiedOperationMarkerIfTypeIsReifiedParameter(this, type, operationKind);
|
||||
}
|
||||
}
|
||||
|
||||
+6
-1
@@ -52,6 +52,7 @@ interface TypeResolutionInterceptorExtension {
|
||||
|
||||
@InternalNonStableExtensionPoints
|
||||
interface CallResolutionInterceptorExtension {
|
||||
@Suppress("DEPRECATION")
|
||||
@JvmDefault
|
||||
fun interceptCandidates(
|
||||
candidates: Collection<NewResolutionOldInference.MyCandidate>,
|
||||
@@ -63,6 +64,7 @@ interface CallResolutionInterceptorExtension {
|
||||
tracing: TracingStrategy
|
||||
): Collection<NewResolutionOldInference.MyCandidate> = candidates
|
||||
|
||||
@Suppress("DEPRECATION")
|
||||
@JvmDefault
|
||||
fun interceptFunctionCandidates(
|
||||
candidates: Collection<FunctionDescriptor>,
|
||||
@@ -74,6 +76,7 @@ interface CallResolutionInterceptorExtension {
|
||||
location: LookupLocation
|
||||
): Collection<FunctionDescriptor> = candidates
|
||||
|
||||
@Suppress("DEPRECATION")
|
||||
@JvmDefault
|
||||
fun interceptFunctionCandidates(
|
||||
candidates: Collection<FunctionDescriptor>,
|
||||
@@ -87,6 +90,7 @@ interface CallResolutionInterceptorExtension {
|
||||
extensionReceiver: ReceiverValueWithSmartCastInfo?
|
||||
): Collection<FunctionDescriptor> = candidates
|
||||
|
||||
@Suppress("DEPRECATION")
|
||||
@JvmDefault
|
||||
fun interceptVariableCandidates(
|
||||
candidates: Collection<VariableDescriptor>,
|
||||
@@ -98,6 +102,7 @@ interface CallResolutionInterceptorExtension {
|
||||
location: LookupLocation
|
||||
): Collection<VariableDescriptor> = candidates
|
||||
|
||||
@Suppress("DEPRECATION")
|
||||
@JvmDefault
|
||||
fun interceptVariableCandidates(
|
||||
candidates: Collection<VariableDescriptor>,
|
||||
@@ -111,7 +116,7 @@ interface CallResolutionInterceptorExtension {
|
||||
extensionReceiver: ReceiverValueWithSmartCastInfo?
|
||||
): Collection<VariableDescriptor> = candidates
|
||||
|
||||
@Suppress("DeprecatedCallableAddReplaceWith")
|
||||
@Suppress("DeprecatedCallableAddReplaceWith", "DEPRECATION")
|
||||
@Deprecated("Please use dedicated interceptVariableCandidates and interceptFunctionCandidates instead")
|
||||
@JvmDefault
|
||||
fun interceptCandidates(
|
||||
|
||||
+2
@@ -145,6 +145,7 @@ interface SyntheticResolveExtension {
|
||||
|
||||
fun getSyntheticFunctionNames(thisDescriptor: ClassDescriptor): List<Name> = emptyList()
|
||||
|
||||
@Suppress("DEPRECATION")
|
||||
@JvmDefault
|
||||
fun getSyntheticPropertiesNames(thisDescriptor: ClassDescriptor): List<Name> = emptyList()
|
||||
|
||||
@@ -155,6 +156,7 @@ interface SyntheticResolveExtension {
|
||||
* or null in case it needs to run resolution and inference and/or it is very costly.
|
||||
* Override this method if resolution started to fail with recursion.
|
||||
*/
|
||||
@Suppress("DEPRECATION")
|
||||
@JvmDefault
|
||||
fun getPossibleSyntheticNestedClassNames(thisDescriptor: ClassDescriptor): List<Name>? = getSyntheticNestedClassNames(thisDescriptor)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user