From 45a85e3e3543b8d82a39089b349d39b3a58e1431 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Wed, 1 Jul 2015 16:40:09 +0300 Subject: [PATCH] Removed packagePartHASH --- .../evaluate/AbstractKotlinEvaluateExpressionTest.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt index 14543210191..d1e1ea25021 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt @@ -216,7 +216,7 @@ public abstract class AbstractKotlinEvaluateExpressionTest : KotlinDebuggerTestB fun printDescriptor(descriptor: NodeDescriptorImpl, indent: Int): Boolean { if (descriptor is DefaultNodeDescriptor) return true - val label = descriptor.getLabel()!!.replace("Package\\$[\\w]*\\$[0-9a-f]+".toRegex(), "Package\\$@packagePartHASH") + val label = descriptor.getLabel()!! if (label.endsWith(XDebuggerUIConstants.COLLECTING_DATA_MESSAGE)) return true val curIndent = " ".repeat(indent) @@ -336,11 +336,10 @@ public abstract class AbstractKotlinEvaluateExpressionTest : KotlinDebuggerTestB private fun Value.asString(): String { if (this is ObjectValue && this.value is ObjectReference) { - return this.toString().replace(PACKAGE_PART_REGEX, "$1@packagePartHASH").replaceFirst(ID_PART_REGEX, "id=ID") + return this.toString().replaceFirst(ID_PART_REGEX, "id=ID") } return this.toString() } } -private val PACKAGE_PART_REGEX = "(Package\\$[\\w]*\\$)([0-9a-f]+)".toRegex() private val ID_PART_REGEX = "id=[0-9]*".toRegex() \ No newline at end of file