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

Light Classes: Do not compute annotations for light elements with invalid

Browse Source 
origin (possible fix for KT-13199)
This commit is contained in:
Alexey Sedunov
2016-08-09 13:33:48 +03:00
parent 4ab25bd0bb
commit ab7d48a34e
1 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightModifierListWithExplicitModifiers.kt
+31 -29
View File
@@ -93,37 +93,39 @@ class KtLightModifierList(
internal fun computeAnnotations(lightElement: PsiModifierList, internal fun computeAnnotations(lightElement: PsiModifierList,
delegate: PsiAnnotationOwner): CachedValue<Array<out PsiAnnotation>> { delegate: PsiAnnotationOwner): CachedValue<Array<out PsiAnnotation>> {
val cacheManager = CachedValuesManager.getManager(lightElement.project) fun doCompute(): Array<PsiAnnotation> {
return cacheManager.createCachedValue<Array<out PsiAnnotation>>( val lightOwner = lightElement.parent as? KtLightElement<*, *>
{ val declaration = lightOwner?.kotlinOrigin as? KtDeclaration
val lightOwner = lightElement.parent as? KtLightElement<*, *> if (declaration != null && !declaration.isValid) return PsiAnnotation.EMPTY_ARRAY
val declaration = lightOwner?.kotlinOrigin as? KtDeclaration val descriptor = declaration?.let { LightClassGenerationSupport.getInstance(lightElement.project).resolveToDescriptor(it) }
val descriptor = declaration?.let { LightClassGenerationSupport.getInstance(lightElement.project).resolveToDescriptor(it) } val annotatedDescriptor = when {
val annotatedDescriptor = when { descriptor !is PropertyDescriptor || lightOwner !is KtLightMethod -> descriptor
descriptor !is PropertyDescriptor || lightOwner !is KtLightMethod -> descriptor JvmAbi.isGetterName(lightOwner.name) -> descriptor.getter
JvmAbi.isGetterName(lightOwner.name) -> descriptor.getter JvmAbi.isSetterName(lightOwner.name) -> descriptor.setter
JvmAbi.isSetterName(lightOwner.name) -> descriptor.setter else -> descriptor
else -> descriptor }
val ktAnnotations = annotatedDescriptor?.annotations?.getAllAnnotations() ?: emptyList()
var nextIndex = 0
val result = delegate
.annotations
.map { clsAnnotation ->
val currentIndex = ktAnnotations.indexOfFirst(nextIndex) {
it.annotation.type.constructor.declarationDescriptor?.fqNameUnsafe?.asString() == clsAnnotation.qualifiedName
}
if (currentIndex >= 0) {
nextIndex = currentIndex + 1
val ktAnnotation = ktAnnotations[currentIndex]
val entry = ktAnnotation.annotation.source.getPsi() as? KtAnnotationEntry ?: return@map clsAnnotation
KtLightAnnotation(clsAnnotation, entry, lightElement)
}
else clsAnnotation
} }
val ktAnnotations = annotatedDescriptor?.annotations?.getAllAnnotations() ?: emptyList() .toTypedArray()
var nextIndex = 0 return result
val result = delegate.annotations }
.map { clsAnnotation ->
val currentIndex = ktAnnotations.indexOfFirst(nextIndex) {
it.annotation.type.constructor.declarationDescriptor?.fqNameUnsafe?.asString() == clsAnnotation.qualifiedName
}
if (currentIndex >= 0) {
nextIndex = currentIndex + 1
val ktAnnotation = ktAnnotations[currentIndex]
val entry = ktAnnotation.annotation.source.getPsi() as? KtAnnotationEntry ?: return@map clsAnnotation
KtLightAnnotation(clsAnnotation, entry, lightElement)
}
else clsAnnotation
}
.toTypedArray()
CachedValueProvider.Result.create(result, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT) return CachedValuesManager.getManager(lightElement.project).createCachedValue<Array<out PsiAnnotation>>(
}, { CachedValueProvider.Result.create(doCompute(), PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT) },
false false
) )
} }