diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt index aa5f0beaf8d..4569828fce3 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt @@ -271,7 +271,7 @@ class JavaToJKTreeBuilder(var symbolProvider: JKSymbolProvider) { fun PsiField.toJK(): JKJavaField { return JKJavaFieldImpl( with(modifierMapper) { modifierList.toJK(finalAsMutability = true) }, - with(expressionTreeMapper) { typeElement?.toJK() } ?: TODO(), + with(expressionTreeMapper) { typeElement?.toJK() } ?: JKTypeElementImpl(JKNoTypeImpl), JKNameIdentifierImpl(name), with(expressionTreeMapper) { initializer.toJK() } ).also { diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt index e80a3bb88c8..3d132a4900f 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt @@ -229,10 +229,15 @@ class NewCodeBuilder { } } + override fun visitKtProperty(ktProperty: JKKtProperty) { 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) if (ktProperty.initializer !is JKStubExpression) { printer.printWithNoIndent(" = ")