[FIR] Don't render lazy attributes with null value in FIR renderer

JetBrains · Jan 15, 2025 · 618eaff · 618eaff
1 parent 5f5af38
commit 618eaff
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...er/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirDeclarationRendererWithAttributes.kt b/...er/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirDeclarationRendererWithAttributes.kt
@@ -16,7 +16,13 @@ open class FirDeclarationRendererWithAttributes : FirDeclarationRenderer() {
     override fun FirDeclaration.renderDeclarationAttributes() {
         if (attributes.isNotEmpty()) {
             val attributes = getAttributesWithValues()
-                .mapNotNull { (klass, value) -> value?.let { klass to value.renderAsDeclarationAttributeValue() } }
+                .mapNotNull { (klass, value) ->
+                    val unwrappedValue = when (value) {
+                        is Lazy<*> -> value.value
+                        else -> value
+                    } ?: return@mapNotNull null
+                    klass to unwrappedValue.renderAsDeclarationAttributeValue()
+                }
                 .ifEmpty { return }
                 .joinToString { (name, value) -> "$name=$value" }
             printer.print("[$attributes] ")
@@ -39,7 +45,6 @@ open class FirDeclarationRendererWithAttributes : FirDeclarationRenderer() {
         is FirCallableSymbol<*> -> callableId.toString()
         is FirClassLikeSymbol<*> -> classId.asString()
         is FirCallableDeclaration -> symbol.callableId.toString()
-        is Lazy<*> -> value.toString()
         else -> toString()
     }
 }