Only display hierarchial variables as trees

Author: fwcd

adapter/src/main/kotlin/org/javacs/ktda/adapter/DAPConverter.kt

@@ -88,7 +88,7 @@ class DAPConverter(
 		name = variableTree.name
 		value = variableTree.value
 		type = variableTree.type
-		variablesReference = variablesPool.store(Unit, variableTree)
+		variablesReference = variableTree.childs?.takeIf { it.isNotEmpty() }?.let { variablesPool.store(Unit, variableTree) } ?: 0
 	}
 
 	fun toDAPThread(internalThread: DebuggeeThread) = DAPThread().apply {

adapter/src/main/kotlin/org/javacs/ktda/adapter/KotlinDebugAdapter.kt

@@ -330,8 +330,9 @@ class KotlinDebugAdapter(
 				.let(converter::toVariableTree)
 					?: throw KotlinDAException("Could not find variablesReference with ID ${args.variablesReference}"))
 				.childs
-				.map(converter::toDAPVariable)
-				.toTypedArray()
+				?.map(converter::toDAPVariable)
+				?.toTypedArray()
+				?: emptyArray()
 		}
 	)
 

adapter/src/main/kotlin/org/javacs/ktda/core/scope/VariableTreeNode.kt

@@ -10,8 +10,8 @@ interface VariableTreeNode {
 		get() = null
 	val type: String?
 		get() = null
-	val childs: List<VariableTreeNode>
-		get() = emptyList()
+	val childs: List<VariableTreeNode>?
+		get() = null
 
 	// TODO: Setters for values?
 }

adapter/src/main/kotlin/org/javacs/ktda/jdi/scope/JDIVariable.kt

@@ -16,7 +16,7 @@ class JDIVariable(
 ) : VariableTreeNode {
 	override val value: String = jdiValue?.toString() ?: "null" // TODO: Better string representation
 	override val type: String = (jdiType?.name() ?: jdiValue?.type()?.name()) ?: "Unknown type"
-	override val childs: List<VariableTreeNode> by lazy { jdiValue?.let(::childrenOf) ?: emptyList() }
+	override val childs: List<VariableTreeNode>? by lazy { jdiValue?.let(::childrenOf) }
 
 	private fun childrenOf(jdiValue: Value): List<VariableTreeNode> {
 		val jdiType = jdiValue.type()

adapter/src/main/kotlin/org/javacs/ktda/util/ObjectPool.kt

@@ -10,7 +10,7 @@ private data class ObjectMapping<O, V> (
 	val value: V
 )
 
-private var currentID = 0L
+private var currentID = 1L
 
 /**
  * Maps objects of owners to multiple owned values.