Revert "Light classes support for declarations in multipart classes."
This reverts commit 3ea51a982c.
This commit is contained in:
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.asJava
|
package org.jetbrains.kotlin.asJava
|
||||||
|
|
||||||
import com.intellij.openapi.project.Project
|
|
||||||
import com.intellij.psi.*
|
import com.intellij.psi.*
|
||||||
import com.intellij.psi.impl.java.stubs.PsiClassStub
|
import com.intellij.psi.impl.java.stubs.PsiClassStub
|
||||||
import com.intellij.psi.search.GlobalSearchScope
|
import com.intellij.psi.search.GlobalSearchScope
|
||||||
@@ -28,19 +27,11 @@ import org.jetbrains.kotlin.asJava.elements.*
|
|||||||
import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
|
import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
|
||||||
import org.jetbrains.kotlin.fileClasses.javaFileFacadeFqName
|
import org.jetbrains.kotlin.fileClasses.javaFileFacadeFqName
|
||||||
import org.jetbrains.kotlin.load.java.JvmAbi
|
import org.jetbrains.kotlin.load.java.JvmAbi
|
||||||
import org.jetbrains.kotlin.name.FqName
|
|
||||||
import org.jetbrains.kotlin.psi.*
|
import org.jetbrains.kotlin.psi.*
|
||||||
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
|
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
|
||||||
import org.jetbrains.kotlin.utils.checkWithAttachment
|
import org.jetbrains.kotlin.utils.checkWithAttachment
|
||||||
|
|
||||||
object LightClassUtil {
|
object LightClassUtil {
|
||||||
/**
|
|
||||||
* {@link kotlin.MetadataKt#kind} 4 = Multi-file class facade
|
|
||||||
*/
|
|
||||||
const val MULTI_FILE_CLASS_FACADE = 4
|
|
||||||
const val KOTLIN_METADATA_ANNOTATION = "kotlin.Metadata"
|
|
||||||
const val METADATA_KIND = "k"
|
|
||||||
const val METADATA_DATA1 = "d1"
|
|
||||||
|
|
||||||
fun findClass(stub: StubElement<*>, predicate: (PsiClassStub<*>) -> Boolean): PsiClass? {
|
fun findClass(stub: StubElement<*>, predicate: (PsiClassStub<*>) -> Boolean): PsiClass? {
|
||||||
if (stub is PsiClassStub<*> && predicate(stub)) {
|
if (stub is PsiClassStub<*> && predicate(stub)) {
|
||||||
@@ -179,46 +170,20 @@ object LightClassUtil {
|
|||||||
private fun findFileFacade(ktFile: KtFile): PsiClass? {
|
private fun findFileFacade(ktFile: KtFile): PsiClass? {
|
||||||
val fqName = ktFile.javaFileFacadeFqName
|
val fqName = ktFile.javaFileFacadeFqName
|
||||||
val project = ktFile.project
|
val project = ktFile.project
|
||||||
val classesWithMatchingFqName = findPsiClass(project, fqName)
|
val classesWithMatchingFqName =
|
||||||
|
JavaElementFinder.getInstance(project).findClasses(fqName.asString(), GlobalSearchScope.allScope(project))
|
||||||
return classesWithMatchingFqName.singleOrNull() ?: classesWithMatchingFqName.find {
|
return classesWithMatchingFqName.singleOrNull() ?: classesWithMatchingFqName.find {
|
||||||
it.containingFile?.virtualFile == ktFile.virtualFile
|
it.containingFile?.virtualFile == ktFile.virtualFile
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun findPsiClass(
|
|
||||||
project: Project,
|
|
||||||
fqName: FqName
|
|
||||||
): Array<PsiClass> =
|
|
||||||
JavaElementFinder.getInstance(project).findClasses(fqName.asString(), GlobalSearchScope.allScope(project))
|
|
||||||
|
|
||||||
private fun findMultifileClassMetadata(psiClass: PsiClass): List<String>? {
|
|
||||||
val metadata = psiClass.getAnnotation(KOTLIN_METADATA_ANNOTATION)
|
|
||||||
if (metadata != null) {
|
|
||||||
val k = (metadata.findAttributeValue(METADATA_KIND) as? PsiLiteralValue)?.value as Int
|
|
||||||
if (k == MULTI_FILE_CLASS_FACADE) {
|
|
||||||
val d1 = (metadata.findAttributeValue(METADATA_DATA1) as? PsiArrayInitializerMemberValue)?.initializers?.mapNotNull {
|
|
||||||
(it as? PsiLiteralValue)?.value as? String
|
|
||||||
} ?: emptyList()
|
|
||||||
return d1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun getWrappingClasses(declaration: KtDeclaration): Sequence<PsiClass> {
|
private fun getWrappingClasses(declaration: KtDeclaration): Sequence<PsiClass> {
|
||||||
val wrapperClass = getWrappingClass(declaration) ?: return emptySequence()
|
val wrapperClass = getWrappingClass(declaration) ?: return emptySequence()
|
||||||
val wrapperClassOrigin = (wrapperClass as KtLightClass).kotlinOrigin
|
val wrapperClassOrigin = (wrapperClass as KtLightClass).kotlinOrigin
|
||||||
if (wrapperClassOrigin is KtObjectDeclaration && wrapperClassOrigin.isCompanion() && wrapperClass.parent is PsiClass) {
|
if (wrapperClassOrigin is KtObjectDeclaration && wrapperClassOrigin.isCompanion() && wrapperClass.parent is PsiClass) {
|
||||||
return sequenceOf(wrapperClass, wrapperClass.parent as PsiClass)
|
return sequenceOf(wrapperClass, wrapperClass.parent as PsiClass)
|
||||||
}
|
}
|
||||||
val wrappers = mutableListOf<PsiClass>(wrapperClass);
|
return sequenceOf(wrapperClass)
|
||||||
// for multipart classes we need to add parts to wrappingClasses, otherwise the declarations there wouldn't be found in stubs
|
|
||||||
findMultifileClassMetadata(wrapperClass)?.let {
|
|
||||||
it.forEach {
|
|
||||||
wrappers.addAll(findPsiClass(declaration.project, FqName.fromSegments(it.split("/"))).toList())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return wrappers.asSequence()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun canGenerateLightClass(declaration: KtDeclaration): Boolean {
|
fun canGenerateLightClass(declaration: KtDeclaration): Boolean {
|
||||||
|
|||||||
Reference in New Issue
Block a user