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

New J2K: Add NoType for ktProperty

Browse Source
This commit is contained in:
Ilya Kirillov
2018-11-08 17:52:25 +03:00
committed by Ilya Kirillov
parent a55d2b6597
commit 77713c1877
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt
+1 -1
View File
@@ -271,7 +271,7 @@ class JavaToJKTreeBuilder(var symbolProvider: JKSymbolProvider) {
fun PsiField.toJK(): JKJavaField { fun PsiField.toJK(): JKJavaField {
return JKJavaFieldImpl( return JKJavaFieldImpl(
with(modifierMapper) { modifierList.toJK(finalAsMutability = true) }, with(modifierMapper) { modifierList.toJK(finalAsMutability = true) },
with(expressionTreeMapper) { typeElement?.toJK() } ?: TODO(), with(expressionTreeMapper) { typeElement?.toJK() } ?: JKTypeElementImpl(JKNoTypeImpl),
JKNameIdentifierImpl(name), JKNameIdentifierImpl(name),
with(expressionTreeMapper) { initializer.toJK() } with(expressionTreeMapper) { initializer.toJK() }
).also { ).also {
j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt
+6 -1
View File
@@ -229,10 +229,15 @@ class NewCodeBuilder {
} }
} }
override fun visitKtProperty(ktProperty: JKKtProperty) { override fun visitKtProperty(ktProperty: JKKtProperty) {
ktProperty.modifierList.accept(this) ktProperty.modifierList.accept(this)
printer.printWithNoIndent(" ", ktProperty.name.value, ": ") printer.printWithNoIndent(" ", ktProperty.name.value)
if (ktProperty.type.type != JKNoTypeImpl) {
printer.printWithNoIndent(":")
ktProperty.type.accept(this)
}
ktProperty.type.accept(this) ktProperty.type.accept(this)
if (ktProperty.initializer !is JKStubExpression) { if (ktProperty.initializer !is JKStubExpression) {
printer.printWithNoIndent(" = ") printer.printWithNoIndent(" = ")