From 4892784f70a15d63000b83c3bd88c7388088f4e0 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Thu, 24 May 2018 17:06:12 +0300
Subject: [PATCH] New J2K: Improve debug tree printer for types

---
 .../org/jetbrains/kotlin/j2k/tree/DebugTreePrinter.kt       | 6 ++++++
 j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/j.kt          | 6 ++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/DebugTreePrinter.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/DebugTreePrinter.kt
index 7d7b7885866..69fa951e8d0 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/DebugTreePrinter.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/DebugTreePrinter.kt
@@ -80,6 +80,12 @@ private class DebugTreePrinter : JKVisitorVoid {
             if (type is JKClassType) {
                 printer.println((type.classReference as? JKClassSymbol)?.fqName ?: type.classReference?.let { it::class } ?: "Unbound")
             }
+            if (type is JKJavaArrayType) {
+                type.type.accept(this, null)
+            }
+            if (type is JKJavaPrimitiveType) {
+                printer.println(type.name)
+            }
         }
         printer.println("\"")
     }
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/j.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/j.kt
index 65fc8bdb72f..2b7ff61558c 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/j.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/j.kt
@@ -131,12 +131,10 @@ sealed class JKJavaPrimitiveTypeImpl(override val name: String) : JKJavaPrimitiv
     object INT : JKJavaPrimitiveTypeImpl("int")
 }
 
-class JKJavaArrayTypeImpl(override val type: JKType) : JKJavaArrayType, JKElementBase() {
+class JKJavaArrayTypeImpl(type: JKType) : JKJavaArrayType, JKBranchElementBase() {
     override fun <R, D> accept(visitor: JKVisitor<R, D>, data: D): R = visitor.visitJavaArrayType(this, data)
 
-    override fun <D> acceptChildren(visitor: JKVisitor<Unit, D>, data: D) {
-
-    }
+    override val type: JKType by child(type)
 }
 
 class JKReturnStatementImpl(expression: JKExpression) : JKBranchElementBase(), JKReturnStatement {