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

New J2K: Cleanup code generation

Browse Source
This commit is contained in:
Simon Ogorodnik
2018-07-07 19:10:56 +03:00
committed by Ilya Kirillov
parent 2e7940149f
commit c41be3274e
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt
+20 -7
View File
@@ -121,7 +121,7 @@ class NewCodeBuilder {
printer.print("var")
}
printer.printWithNoIndent(" ", ktProperty.name.value)
printer.printWithNoIndent(" ", ktProperty.name.value, ": ")
ktProperty.type.accept(this)
if (ktProperty.initializer !is JKStubExpression) {
printer.printWithNoIndent(" = ")
@@ -131,7 +131,20 @@ class NewCodeBuilder {
}
override fun visitKtFunction(ktFunction: JKKtFunction) {
printer.print("fun ", ktFunction.name.value, "(", ")")
printer.print("fun ", ktFunction.name.value, "(")
for (parameter in ktFunction.parameters) {
if (parameter != ktFunction.parameters.first()) {
printer.printWithNoIndent(", ")
}
printer.printWithNoIndent(parameter.name.value, ": ")
parameter.type.accept(this)
if (parameter.initializer !is JKStubExpression) {
printer.printWithNoIndent(" = ")
parameter.initializer.accept(this)
}
}
printer.printWithNoIndent(")", ": ")
ktFunction.returnType.accept(this)
if (ktFunction.block !== JKBodyStub) {
printer.printlnWithNoIndent(" {")
@@ -210,7 +223,7 @@ class NewCodeBuilder {
printer.print("var")
}
printer.printWithNoIndent(" ", localVariable.name.value)
printer.printWithNoIndent(" ", localVariable.name.value, ": ")
localVariable.type.accept(this)
if (localVariable.initializer !is JKStubExpression) {
printer.printWithNoIndent(" = ")
@@ -222,10 +235,10 @@ class NewCodeBuilder {
override fun visitTypeElement(typeElement: JKTypeElement) {
val type = typeElement.type
when (type) {
is JKClassType -> if ((type.classReference as? JKClassSymbol)?.fqName != "kotlin.Unit") {
(type.classReference as JKClassSymbol).fqName?.let { printer.printWithNoIndent(":" + FqName(it).shortName().asString()) }
}
else -> printer.printWithNoIndent(":Unit /* TODO: ${type::class} */")
is JKClassType ->
(type.classReference as JKClassSymbol).fqName?.let { printer.printWithNoIndent(FqName(it).shortName().asString()) }
else -> printer.printWithNoIndent("Unit /* TODO: ${type::class} */")
}
when (type.nullability) {
Nullability.Nullable -> printer.printWithNoIndent("?")