From ff700b5399e17822e5bd80fc97bb424b8065781d Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Thu, 8 Nov 2018 17:54:30 +0300
Subject: [PATCH] New J2K: Add TypeElement.present() function

---
 j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt | 5 ++---
 j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt   | 5 ++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt
index 3d132a4900f..ed5163b0106 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt
@@ -234,11 +234,10 @@ class NewCodeBuilder {
             ktProperty.modifierList.accept(this)
 
             printer.printWithNoIndent(" ", ktProperty.name.value)
-            if (ktProperty.type.type != JKNoTypeImpl) {
+            if (ktProperty.type.present()) {
                 printer.printWithNoIndent(":")
                 ktProperty.type.accept(this)
             }
-            ktProperty.type.accept(this)
             if (ktProperty.initializer !is JKStubExpression) {
                 printer.printWithNoIndent(" = ")
                 ktProperty.initializer.accept(this)
@@ -469,7 +468,7 @@ class NewCodeBuilder {
             }
 
             printer.printWithNoIndent(" ", localVariable.name.value)
-            if (localVariable.type.type != JKContextType && localVariable.type.type !is JKNoTypeImpl) {
+            if (localVariable.type.present() && localVariable.type.type != JKContextType) {
                 printer.printWithNoIndent(": ")
                 localVariable.type.accept(this)
             }
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt
index 6a5c518df59..1c31f75fa49 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt
@@ -467,4 +467,7 @@ class JKVarianceTypeParameterTypeImpl(
 class JKTypeParameterTypeImpl(
     override val name: String,
     override val nullability: Nullability = Nullability.Default
-) : JKTypeParameterType
\ No newline at end of file
+) : JKTypeParameterType
+
+fun JKTypeElement.present(): Boolean =
+    type != JKNoTypeImpl
\ No newline at end of file