JavaElementFinder: support repeatable annotation container
^KTIJ-19318
This commit is contained in:
@@ -26,16 +26,17 @@ import com.intellij.psi.util.PsiUtilCore
|
||||
import com.intellij.util.SmartList
|
||||
import com.intellij.util.containers.ContainerUtil
|
||||
import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport
|
||||
import org.jetbrains.kotlin.asJava.hasRepeatableAnnotationContainer
|
||||
import org.jetbrains.kotlin.load.java.JvmAbi
|
||||
import org.jetbrains.kotlin.name.FqName
|
||||
import org.jetbrains.kotlin.name.isValidJavaFqName
|
||||
import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus
|
||||
import org.jetbrains.kotlin.psi.KtClass
|
||||
import org.jetbrains.kotlin.psi.KtClassOrObject
|
||||
import org.jetbrains.kotlin.psi.KtEnumEntry
|
||||
import org.jetbrains.kotlin.psi.KtFile
|
||||
import org.jetbrains.kotlin.resolve.jvm.KotlinFinderMarker
|
||||
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
|
||||
import java.util.*
|
||||
|
||||
class JavaElementFinder(
|
||||
private val project: Project,
|
||||
@@ -64,9 +65,10 @@ class JavaElementFinder(
|
||||
}
|
||||
|
||||
// Finds explicitly declared classes and objects, not package classes
|
||||
// Also DefaultImpls classes of interfaces
|
||||
// Also DefaultImpls classes of interfaces, Container classes of repeatable annotations
|
||||
private fun findClassesAndObjects(qualifiedName: FqName, scope: GlobalSearchScope, answer: MutableList<PsiClass>) {
|
||||
findInterfaceDefaultImpls(qualifiedName, scope, answer)
|
||||
findRepeatableAnnotationContainer(qualifiedName, scope, answer)
|
||||
|
||||
val classOrObjectDeclarations = kotlinAsJavaSupport.findClassOrObjectDeclarations(qualifiedName, scope)
|
||||
|
||||
@@ -80,17 +82,30 @@ class JavaElementFinder(
|
||||
}
|
||||
}
|
||||
|
||||
private fun findInterfaceDefaultImpls(qualifiedName: FqName, scope: GlobalSearchScope, answer: MutableList<PsiClass>) {
|
||||
if (qualifiedName.isRoot) return
|
||||
private fun findInterfaceDefaultImpls(qualifiedName: FqName, scope: GlobalSearchScope, answer: MutableList<PsiClass>) =
|
||||
findSyntheticInnerClass(qualifiedName, JvmAbi.DEFAULT_IMPLS_CLASS_NAME, scope, answer) {
|
||||
it is KtClass && it.isInterface()
|
||||
}
|
||||
|
||||
if (qualifiedName.shortName().asString() != JvmAbi.DEFAULT_IMPLS_CLASS_NAME) return
|
||||
private fun findRepeatableAnnotationContainer(qualifiedName: FqName, scope: GlobalSearchScope, answer: MutableList<PsiClass>) =
|
||||
findSyntheticInnerClass(qualifiedName, JvmAbi.REPEATABLE_ANNOTATION_CONTAINER_NAME, scope, answer) {
|
||||
it.hasRepeatableAnnotationContainer
|
||||
}
|
||||
|
||||
private fun findSyntheticInnerClass(
|
||||
qualifiedName: FqName,
|
||||
syntheticName: String,
|
||||
scope: GlobalSearchScope,
|
||||
answer: MutableList<PsiClass>,
|
||||
predicate: (KtClassOrObject) -> Boolean,
|
||||
) {
|
||||
if (qualifiedName.isRoot || qualifiedName.shortName().asString() != syntheticName) return
|
||||
|
||||
for (classOrObject in kotlinAsJavaSupport.findClassOrObjectDeclarations(qualifiedName.parent(), scope)) {
|
||||
ProgressIndicatorAndCompilationCanceledStatus.checkCanceled()
|
||||
//NOTE: can't filter out more interfaces right away because decompiled declarations do not have member bodies
|
||||
if (classOrObject is KtClass && classOrObject.isInterface()) {
|
||||
if (predicate(classOrObject)) {
|
||||
val interfaceClass = kotlinAsJavaSupport.getLightClass(classOrObject) ?: continue
|
||||
val implsClass = interfaceClass.findInnerClassByName(JvmAbi.DEFAULT_IMPLS_CLASS_NAME, false) ?: continue
|
||||
val implsClass = interfaceClass.findInnerClassByName(syntheticName, false) ?: continue
|
||||
answer.add(implsClass)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,10 +17,11 @@
|
||||
package org.jetbrains.kotlin.asJava
|
||||
|
||||
import com.intellij.psi.*
|
||||
import com.intellij.psi.impl.light.LightField
|
||||
import com.intellij.psi.search.GlobalSearchScope
|
||||
import org.jetbrains.kotlin.asJava.classes.*
|
||||
import org.jetbrains.kotlin.asJava.elements.PsiElementWithOrigin
|
||||
import org.jetbrains.kotlin.asJava.classes.KtFakeLightClass
|
||||
import org.jetbrains.kotlin.asJava.classes.KtLightClass
|
||||
import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
|
||||
import org.jetbrains.kotlin.asJava.classes.runReadAction
|
||||
import org.jetbrains.kotlin.asJava.elements.*
|
||||
import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
|
||||
import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
|
||||
@@ -157,6 +158,22 @@ val PsiElement.namedUnwrappedElement: PsiNamedElement?
|
||||
val KtClassOrObject.hasInterfaceDefaultImpls: Boolean
|
||||
get() = this is KtClass && isInterface() && hasNonAbstractMembers(this)
|
||||
|
||||
val KtClassOrObject.hasRepeatableAnnotationContainer: Boolean
|
||||
get() = this is KtClass &&
|
||||
isAnnotation() &&
|
||||
run {
|
||||
var hasRepeatableAnnotation = false
|
||||
for (annotation in annotationEntries) when (annotation.shortName?.asString()) {
|
||||
"JvmRepeatable" -> return false
|
||||
"Repeatable" -> {
|
||||
if (annotation.valueArgumentList != null) return false
|
||||
hasRepeatableAnnotation = true
|
||||
}
|
||||
}
|
||||
|
||||
return hasRepeatableAnnotation
|
||||
}
|
||||
|
||||
private fun hasNonAbstractMembers(ktInterface: KtClass): Boolean {
|
||||
return ktInterface.declarations.any(::isNonAbstractMember)
|
||||
}
|
||||
@@ -169,6 +186,9 @@ private fun isNonAbstractMember(member: KtDeclaration?): Boolean {
|
||||
private val DEFAULT_IMPLS_CLASS_NAME = Name.identifier(JvmAbi.DEFAULT_IMPLS_CLASS_NAME)
|
||||
fun FqName.defaultImplsChild() = child(DEFAULT_IMPLS_CLASS_NAME)
|
||||
|
||||
private val REPEATABLE_ANNOTATION_CONTAINER_NAME = Name.identifier(JvmAbi.REPEATABLE_ANNOTATION_CONTAINER_NAME)
|
||||
fun FqName.repeatableAnnotationContainerChild() = child(REPEATABLE_ANNOTATION_CONTAINER_NAME)
|
||||
|
||||
@Suppress("unused")
|
||||
fun KtElement.toLightAnnotation(): PsiAnnotation? {
|
||||
val ktDeclaration = getStrictParentOfType<KtModifierList>()?.parent as? KtDeclaration ?: return null
|
||||
|
||||
Reference in New Issue
Block a user