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

[AA] KtAnnotationApplication: make index nullable

Browse Source 
^KT-56046
This commit is contained in:
Dmitrii Gridin
2023-02-01 20:51:50 +01:00
committed by Space Team
parent 50711d5003
commit 379044f2c8
6 changed files with 14 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/base/Kt1DescUtils.kt
+5 -5
View File
@@ -429,18 +429,18 @@ internal tailrec fun KotlinBuiltIns.areSameArrayTypeIgnoringProjections(left: Ko
internal fun List<ConstantValue<*>>.expandArrayAnnotationValue(
containingArrayType: KotlinType,
analysisContext: Fe10AnalysisContext,
): List<KtAnnotationValue> = flatMapIndexed { index: Int, constantValue: ConstantValue<*> ->
): List<KtAnnotationValue> = flatMap { constantValue: ConstantValue<*> ->
val constantType = constantValue.getType(analysisContext.resolveSession.moduleDescriptor)
if (analysisContext.builtIns.areSameArrayTypeIgnoringProjections(containingArrayType, constantType)) {
// If an element in the array has the same type as the containing array, it's a spread component that needs
// to be expanded here. (It should have the array element type instead.)
(constantValue as ArrayValue).value.expandArrayAnnotationValue(containingArrayType, analysisContext)
} else {
listOf(constantValue.toKtAnnotationValue(analysisContext, index))
listOf(constantValue.toKtAnnotationValue(analysisContext))
}
}
internal fun ConstantValue<*>.toKtAnnotationValue(analysisContext: Fe10AnalysisContext, index: Int): KtAnnotationValue {
internal fun ConstantValue<*>.toKtAnnotationValue(analysisContext: Fe10AnalysisContext): KtAnnotationValue {
return when (this) {
is ArrayValue -> {
val arrayType = getType(analysisContext.resolveSession.moduleDescriptor)
@@ -462,7 +462,7 @@ internal fun ConstantValue<*>.toKtAnnotationValue(analysisContext: Fe10AnalysisC
psi = null,
useSiteTarget = null,
arguments = value.getKtNamedAnnotationArguments(analysisContext),
index = index,
index = null,
)
)
}
@@ -635,7 +635,7 @@ internal val AnnotationDescriptor.useSiteTarget: AnnotationUseSiteTarget?
internal fun AnnotationDescriptor.getKtNamedAnnotationArguments(analysisContext: Fe10AnalysisContext): List<KtNamedAnnotationValue> =
allValueArguments.map { (name, value) ->
KtNamedAnnotationValue(name, value.toKtAnnotationValue(analysisContext, index = -1))
KtNamedAnnotationValue(name, value.toKtAnnotationValue(analysisContext))
}
internal fun CallableDescriptor.createContextReceivers(
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/utils/renderAnnotations.kt
+1 -1
View File
@@ -41,7 +41,7 @@ internal fun PrettyPrinter.renderFe10Annotations(
printCollectionIfNotEmpty(valueArguments, separator = ", ", prefix = "(", postfix = ")") { (name, value) ->
append(name.render())
append(" = ")
append(value.toKtAnnotationValue(analysisContext, -1).renderAsSourceCode())
append(value.toKtAnnotationValue(analysisContext).renderAsSourceCode())
}
append(separator)