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

[IR] Print annotation arguments in report of ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT

Browse Source 
Now IR checker is not duplicated by FIR checker reporting, so it's
useful to have more verbose report of annotations in diagnostic message.

^KT-62559
This commit is contained in:
Roman Efremov
2023-11-23 13:49:59 +01:00
committed by Space Team
parent ec7a2c20d1
commit 8f6b6e17be
5 changed files with 59 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.actualization/src/main/kotlin/org/jetbrains/kotlin/backend/common/actualizer/IrActualizationErrors.kt
+11 -4
View File
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.ir.IrDiagnosticRenderers
import org.jetbrains.kotlin.ir.declarations.IrValueParameter
import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
import org.jetbrains.kotlin.ir.symbols.IrSymbol
import org.jetbrains.kotlin.ir.types.classFqName
import org.jetbrains.kotlin.ir.util.RenderIrElementVisitorForDiagnosticText
import org.jetbrains.kotlin.platform.isCommon
import org.jetbrains.kotlin.resolve.multiplatform.ExpectActualAnnotationsIncompatibilityType
import org.jetbrains.kotlin.resolve.multiplatform.ExpectActualCheckingCompatibility
@@ -80,14 +80,21 @@ internal object IrActualizationDiagnosticRenderers {
}
val EXPECT_ACTUAL_ANNOTATION_INCOMPATIBILITY =
Renderer { incompatibilityType: ExpectActualAnnotationsIncompatibilityType<IrConstructorCall> ->
val expectAnnotationFqName = incompatibilityType.expectAnnotation.type.classFqName ?: "<unknown>"
val expectAnnotation = ANNOTATION.render(incompatibilityType.expectAnnotation)
val reason = when (incompatibilityType) {
is ExpectActualAnnotationsIncompatibilityType.MissingOnActual -> "is missing on actual declaration"
is ExpectActualAnnotationsIncompatibilityType.DifferentOnActual -> "has different arguments on actual declaration"
is ExpectActualAnnotationsIncompatibilityType.DifferentOnActual -> {
val actualAnnotation = ANNOTATION.render(incompatibilityType.actualAnnotation)
"has different arguments on actual declaration: `$actualAnnotation`"
}
}
"Annotation `$expectAnnotationFqName` $reason"
"Annotation `$expectAnnotation` $reason"
}
private val ANNOTATION = Renderer<IrConstructorCall> {
"@" + RenderIrElementVisitorForDiagnosticText.renderAsAnnotation(it)
}
@JvmField
val MODULE_WITH_PLATFORM = Renderer<ModuleDescriptor> { module ->
val platform = module.platform