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

Skip @JvmDefault in UnimplementedKotlinInterfaceMemberAnnotator

Browse Source 
#KT-23967 Fixed
This commit is contained in:
Mikhael Bogdanov
2018-04-25 15:14:55 +02:00
parent 5efc9f2257
commit ec0b9aa343
6 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/java/UnimplementedKotlinInterfaceMemberAnnotator.kt
+8 -3
View File
@@ -29,6 +29,7 @@ import com.intellij.psi.*
import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration
import org.jetbrains.kotlin.asJava.elements.KtLightMethod
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.resolve.annotations.JVM_DEFAULT_FQ_NAME
import org.jetbrains.kotlin.utils.ifEmpty
class UnimplementedKotlinInterfaceMemberAnnotator : Annotator {
@@ -51,10 +52,14 @@ class UnimplementedKotlinInterfaceMemberAnnotator : Annotator {
}.ifEmpty { return null }
val kotlinSuperClass = generateSequence(psiClass) { it.superClass }.firstOrNull { it is KtLightClassForSourceDeclaration }
?: return signaturesFromKotlinInterfaces.first().method as? KtLightMethod
val signaturesVisibleThroughKotlinSuperClass = kotlinSuperClass.visibleSignatures
return signaturesFromKotlinInterfaces.firstOrNull { it !in signaturesVisibleThroughKotlinSuperClass }?.method as? KtLightMethod
val signaturesVisibleThroughKotlinSuperClass = kotlinSuperClass?.visibleSignatures ?: emptyList()
return signaturesFromKotlinInterfaces.firstOrNull {
it !in signaturesVisibleThroughKotlinSuperClass &&
it.method.annotations.none { annotation ->
annotation.qualifiedName == JVM_DEFAULT_FQ_NAME.asString()
}
}?.method as? KtLightMethod
}
private fun report(method: KtLightMethod, holder: AnnotationHolder, psiClass: PsiClass) {