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

Fix compilation after @JvmDefault deprecation

Browse Source 
Suppress could be removed after switch to -Xjvm-default=all
This commit is contained in:
Mikhael Bogdanov
2021-03-12 14:29:52 +01:00
committed by Space
parent 95654bb9bc
commit 6fab1305e9
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/extensions/internal/NonStableExtensionPoints.kt
+6 -1
View File
@@ -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(
compiler/frontend/src/org/jetbrains/kotlin/resolve/extensions/SyntheticResolveExtension.kt
+2
View File
@@ -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)