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

New J2K: Fix method call expression printing

Browse Source
This commit is contained in:
Ilya Kirillov
2018-12-19 16:01:07 +03:00
committed by Ilya Kirillov
parent 5fc9ca8fc7
commit 7c04590d82
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt
+6 -4
View File
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.j2k
import org.jetbrains.kotlin.j2k.NewCodeBuilder.ParenthesisKind.* import org.jetbrains.kotlin.j2k.NewCodeBuilder.ParenthesisKind.*
import org.jetbrains.kotlin.j2k.ast.Mutability import org.jetbrains.kotlin.j2k.ast.Mutability
import org.jetbrains.kotlin.j2k.ast.Nullability import org.jetbrains.kotlin.j2k.ast.Nullability
import org.jetbrains.kotlin.j2k.conversions.parentOfType
import org.jetbrains.kotlin.j2k.tree.* import org.jetbrains.kotlin.j2k.tree.*
import org.jetbrains.kotlin.j2k.tree.impl.* import org.jetbrains.kotlin.j2k.tree.impl.*
import org.jetbrains.kotlin.j2k.tree.visitors.JKVisitorVoid import org.jetbrains.kotlin.j2k.tree.visitors.JKVisitorVoid
@@ -503,7 +504,7 @@ class NewCodeBuilder {
} }
override fun visitMethodCallExpression(methodCallExpression: JKMethodCallExpression) { override fun visitMethodCallExpression(methodCallExpression: JKMethodCallExpression) {
printer.printWithNoIndent(FqName(methodCallExpression.identifier.fqName).shortName().asString()) printer.printWithNoIndent(FqName(methodCallExpression.identifier.fqName).shortName().asString().escaped())
methodCallExpression.typeArgumentList.accept(this) methodCallExpression.typeArgumentList.accept(this)
printer.par { printer.par {
methodCallExpression.arguments.accept(this) methodCallExpression.arguments.accept(this)
@@ -623,7 +624,7 @@ class NewCodeBuilder {
} }
printer.printWithNoIndent(javaNewExpression.classSymbol.displayName()) printer.printWithNoIndent(javaNewExpression.classSymbol.displayName())
javaNewExpression.typeArgumentList.accept(this) javaNewExpression.typeArgumentList.accept(this)
if (javaNewExpression.constructorIsPresent()) { if (javaNewExpression.constructorIsPresent() || !javaNewExpression.isAnonymousClass()) {
printer.par(ROUND) { printer.par(ROUND) {
javaNewExpression.arguments.accept(this) javaNewExpression.arguments.accept(this)
} }
@@ -732,7 +733,8 @@ class NewCodeBuilder {
} }
private inline fun Printer.block(multiline: Boolean = false, crossinline body: () -> Unit) { private inline fun Printer.block(multiline: Boolean = false, crossinline body: () -> Unit) {
par(if (multiline) CURVED_MULTILINE else CURVED) { par(CURVED) {
if (multiline) printer.printWithNoIndent("\n")
indented(body) indented(body)
} }
} }
@@ -848,7 +850,6 @@ class NewCodeBuilder {
} }
private inline fun <T> List<T>.headTail(): Pair<T?, List<T>?> { private inline fun <T> List<T>.headTail(): Pair<T?, List<T>?> {
val head = this.firstOrNull() val head = this.firstOrNull()
val tail = if (size <= 1) null else subList(1, size) val tail = if (size <= 1) null else subList(1, size)
@@ -871,6 +872,7 @@ private inline fun JKDelegationConstructorCall.isCallOfConstructorOf(type: JKTyp
else -> false else -> false
} }
} }
private val KEYWORDS = KtTokens.KEYWORDS.types.map { (it as KtKeywordToken).value }.toSet() private val KEYWORDS = KtTokens.KEYWORDS.types.map { (it as KtKeywordToken).value }.toSet()
private fun String.escaped() = private fun String.escaped() =