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

New J2K: Render list separator as function

Browse Source
This commit is contained in:
Ilya Kirillov
2018-11-10 19:42:09 +03:00
committed by Ilya Kirillov
parent 7af03c2859
commit 9a1e5582b6
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt
+5 -3
View File
@@ -177,12 +177,14 @@ class NewCodeBuilder {
) )
} }
private inline fun <T> renderList(list: List<T>, separator: String = ", ", renderElement: (T) -> Unit) =
renderList(list, { printer.printWithNoIndent(separator) }, renderElement)
private inline fun <T> renderList(list: List<T>, separator: String = ", ", renderElement: (T) -> Unit) { private inline fun <T> renderList(list: List<T>, separator: () -> Unit, renderElement: (T) -> Unit) {
val (head, tail) = list.headTail() val (head, tail) = list.headTail()
head?.let(renderElement) ?: return head?.let(renderElement) ?: return
tail?.forEach { tail?.forEach {
builder.append(separator) separator()
renderElement(it) renderElement(it)
} }
} }
@@ -343,7 +345,7 @@ class NewCodeBuilder {
private fun renderStatementOrBlock(statement: JKStatement, multiline: Boolean = false) { private fun renderStatementOrBlock(statement: JKStatement, multiline: Boolean = false) {
if (statement is JKBlockStatement) { if (statement is JKBlockStatement) {
printer.block(multiline) { printer.block(multiline) {
statement.block.statements.forEach { it.accept(this) } statement.block.accept(this)
} }
} else { } else {
statement.accept(this) statement.accept(this)