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

Minor. Avoid recursion

Browse Source
This commit is contained in:
Mikhael Bogdanov
2018-04-10 11:01:53 +02:00
parent 6d1af263ba
commit e23c406285
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmDefaultChecker.kt
+4 -2
View File
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.resolve.jvm.checkers
import org.jetbrains.kotlin.config.AnalysisFlag import org.jetbrains.kotlin.config.AnalysisFlag
import org.jetbrains.kotlin.config.JvmTarget import org.jetbrains.kotlin.config.JvmTarget
import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor
import org.jetbrains.kotlin.load.java.descriptors.JavaMethodDescriptor import org.jetbrains.kotlin.load.java.descriptors.JavaMethodDescriptor
import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtDeclaration
import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
@@ -75,11 +74,14 @@ class JvmDefaultChecker(val jvmTarget: JvmTarget) : DeclarationChecker {
!DescriptorUtils.isAnnotationClass(descriptor) !DescriptorUtils.isAnnotationClass(descriptor)
) { ) {
return descriptor.getSuperInterfaces().all { return descriptor.getSuperInterfaces().all {
checkJvmDefaultThroughInheritance(it, enableJvmDefault) checkJvmDefaultAnnotation(it)
} }
} }
return checkJvmDefaultAnnotation(descriptor)
}
private fun checkJvmDefaultAnnotation(descriptor: ClassDescriptor): Boolean {
return descriptor.unsubstitutedMemberScope.getContributedDescriptors().filterIsInstance<CallableMemberDescriptor>().all { return descriptor.unsubstitutedMemberScope.getContributedDescriptors().filterIsInstance<CallableMemberDescriptor>().all {
!it.hasJvmDefaultAnnotation() !it.hasJvmDefaultAnnotation()
} }