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

[FIR] Make rendering of cone type attributes in diagnostic messages opt-in per attribute

Browse Source 
#KT-63228 Fixed
This commit is contained in:
Kirill Rakhman
2023-12-21 14:09:50 +01:00
committed by Space Team
parent 2b53e4ecbd
commit d5ed922208
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeAttributeRenderer.kt
+2 -1
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.fir.renderer package org.jetbrains.kotlin.fir.renderer
import org.jetbrains.kotlin.fir.types.ConeAttribute import org.jetbrains.kotlin.fir.types.ConeAttribute
import org.jetbrains.kotlin.utils.addToStdlib.ifNotEmpty
abstract class ConeAttributeRenderer { abstract class ConeAttributeRenderer {
abstract fun render(attributes: Iterable<ConeAttribute<*>>): String abstract fun render(attributes: Iterable<ConeAttribute<*>>): String
@@ -17,6 +18,6 @@ abstract class ConeAttributeRenderer {
object ForReadability : ConeAttributeRenderer() { object ForReadability : ConeAttributeRenderer() {
override fun render(attributes: Iterable<ConeAttribute<*>>): String = override fun render(attributes: Iterable<ConeAttribute<*>>): String =
attributes.joinToString(separator = " ", postfix = " ") { it.renderForReadability() } attributes.mapNotNull { it.renderForReadability() }.ifNotEmpty { joinToString(separator = " ", postfix = " ") } ?: ""
} }
} }
compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeAttributes.kt
+1 -1
View File
@@ -30,7 +30,7 @@ abstract class ConeAttribute<out T : ConeAttribute<T>> : AnnotationMarker {
abstract fun isSubtypeOf(other: @UnsafeVariance T?): Boolean abstract fun isSubtypeOf(other: @UnsafeVariance T?): Boolean
abstract override fun toString(): String abstract override fun toString(): String
open fun renderForReadability(): String = toString() open fun renderForReadability(): String? = null
abstract val key: KClass<out T> abstract val key: KClass<out T>