azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed packagePartHASH

Browse Source
This commit is contained in:
Michael Bogdanov
2015-07-01 16:40:09 +03:00
parent 17d9b93790
commit 45a85e3e35
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt
+2 -3
View File
@@ -216,7 +216,7 @@ public abstract class AbstractKotlinEvaluateExpressionTest : KotlinDebuggerTestB
fun printDescriptor(descriptor: NodeDescriptorImpl, indent: Int): Boolean { fun printDescriptor(descriptor: NodeDescriptorImpl, indent: Int): Boolean {
if (descriptor is DefaultNodeDescriptor) return true 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 if (label.endsWith(XDebuggerUIConstants.COLLECTING_DATA_MESSAGE)) return true
val curIndent = " ".repeat(indent) val curIndent = " ".repeat(indent)
@@ -336,11 +336,10 @@ public abstract class AbstractKotlinEvaluateExpressionTest : KotlinDebuggerTestB
private fun Value.asString(): String { private fun Value.asString(): String {
if (this is ObjectValue && this.value is ObjectReference) { 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() return this.toString()
} }
} }
private val PACKAGE_PART_REGEX = "(Package\\$[\\w]*\\$)([0-9a-f]+)".toRegex()
private val ID_PART_REGEX = "id=[0-9]*".toRegex() private val ID_PART_REGEX = "id=[0-9]*".toRegex()