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

Minor: trim in RenderIrElementVisitor

Browse Source
This commit is contained in:
Dmitry Petrov
2019-07-30 15:54:04 +03:00
parent efe62c983a
commit bdec8b04e8
576 changed files with 17789 additions and 17960 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt
+25 -14
View File
@@ -89,6 +89,9 @@ class RenderIrElementVisitor : IrElementVisitor<String, Nothing?> {
private inline fun buildTrimEnd(fn: StringBuilder.() -> Unit): String =
buildString(fn).trimEnd()
private inline fun <T> T.runTrimEnd(fn: T.() -> String): String =
run(fn).trimEnd()
private fun IrType.render() =
"${renderTypeAnnotations(annotations)}${renderTypeInner()}"
@@ -315,10 +318,12 @@ class RenderIrElementVisitor : IrElementVisitor<String, Nothing?> {
"FILE fqName:${declaration.fqName} fileName:${declaration.path}"
override fun visitFunction(declaration: IrFunction, data: Nothing?): String =
"FUN ${declaration.renderOriginIfNonTrivial()}"
declaration.runTrimEnd {
"FUN ${renderOriginIfNonTrivial()}"
}
override fun visitSimpleFunction(declaration: IrSimpleFunction, data: Nothing?): String =
declaration.run {
declaration.runTrimEnd {
"FUN ${renderOriginIfNonTrivial()}" +
"name:$name visibility:$visibility modality:$modality " +
renderTypeParameters() + " " +
@@ -354,7 +359,7 @@ class RenderIrElementVisitor : IrElementVisitor<String, Nothing?> {
}.joinToString(separator = ", ", prefix = "(", postfix = ")")
override fun visitConstructor(declaration: IrConstructor, data: Nothing?): String =
declaration.run {
declaration.runTrimEnd {
"CONSTRUCTOR ${renderOriginIfNonTrivial()}" +
"visibility:$visibility " +
renderTypeParameters() + " " +
@@ -371,7 +376,7 @@ class RenderIrElementVisitor : IrElementVisitor<String, Nothing?> {
)
override fun visitProperty(declaration: IrProperty, data: Nothing?): String =
declaration.run {
declaration.runTrimEnd {
"PROPERTY ${renderOriginIfNonTrivial()}" +
"name:$name visibility:$visibility modality:$modality " +
renderPropertyFlags()
@@ -387,9 +392,10 @@ class RenderIrElementVisitor : IrElementVisitor<String, Nothing?> {
)
override fun visitField(declaration: IrField, data: Nothing?): String =
"FIELD ${declaration.renderOriginIfNonTrivial()}" +
"name:${declaration.name} type:${declaration.type.render()} visibility:${declaration.visibility} " +
declaration.renderFieldFlags()
declaration.runTrimEnd {
"FIELD ${renderOriginIfNonTrivial()}name:$name type:${type.render()} visibility:$visibility ${renderFieldFlags()}"
}
private fun IrField.renderFieldFlags() =
renderFlagsList(
@@ -399,7 +405,7 @@ class RenderIrElementVisitor : IrElementVisitor<String, Nothing?> {
)
override fun visitClass(declaration: IrClass, data: Nothing?): String =
declaration.run {
declaration.runTrimEnd {
"CLASS ${renderOriginIfNonTrivial()}" +
"$kind name:$name modality:$modality visibility:$visibility " +
renderClassFlags() +
@@ -416,8 +422,10 @@ class RenderIrElementVisitor : IrElementVisitor<String, Nothing?> {
)
override fun visitVariable(declaration: IrVariable, data: Nothing?): String =
"VAR ${declaration.renderOriginIfNonTrivial()}" +
"name:${declaration.name} type:${declaration.type.render()} ${declaration.renderVariableFlags()}"
declaration.runTrimEnd {
"VAR ${renderOriginIfNonTrivial()}name:$name type:${type.render()} ${renderVariableFlags()}"
}
private fun IrVariable.renderVariableFlags(): String =
renderFlagsList(
@@ -427,20 +435,23 @@ class RenderIrElementVisitor : IrElementVisitor<String, Nothing?> {
)
override fun visitEnumEntry(declaration: IrEnumEntry, data: Nothing?): String =
"ENUM_ENTRY ${declaration.renderOriginIfNonTrivial()}name:${declaration.name}"
declaration.runTrimEnd {
"ENUM_ENTRY ${renderOriginIfNonTrivial()}name:$name"
}
override fun visitAnonymousInitializer(declaration: IrAnonymousInitializer, data: Nothing?): String =
"ANONYMOUS_INITIALIZER isStatic=${declaration.isStatic}"
override fun visitTypeParameter(declaration: IrTypeParameter, data: Nothing?): String =
declaration.run {
declaration.runTrimEnd {
"TYPE_PARAMETER ${renderOriginIfNonTrivial()}" +
"name:$name index:$index variance:$variance " +
"superTypes:[${superTypes.joinToString(separator = "; ") { it.render() }}]"
}
override fun visitValueParameter(declaration: IrValueParameter, data: Nothing?): String =
declaration.run {
declaration.runTrimEnd {
"VALUE_PARAMETER ${renderOriginIfNonTrivial()}" +
"name:$name " +
(if (index >= 0) "index:$index " else "") +
@@ -457,7 +468,7 @@ class RenderIrElementVisitor : IrElementVisitor<String, Nothing?> {
)
override fun visitLocalDelegatedProperty(declaration: IrLocalDelegatedProperty, data: Nothing?): String =
declaration.run {
declaration.runTrimEnd {
"LOCAL_DELEGATED_PROPERTY ${declaration.renderOriginIfNonTrivial()}" +
"name:$name type:${type.render()} flags:${renderLocalDelegatedPropertyFlags()}"
}