From 026e35b6d00e2ee0b8f04ee7ac4f4d437b59ce0e Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 13 Mar 2015 20:09:42 +0300 Subject: [PATCH] DecompiledTextFactory: use separate descriptor renderer to render keys Previously the same render that renders decompiled text was used by accident --- .../idea/decompiler/textBuilder/DecompiledTextFactory.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt index ff130641f57..f856d6d62dc 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt @@ -74,7 +74,7 @@ private val DECOMPILED_CODE_COMMENT = "/* compiled code */" private val DECOMPILED_COMMENT_FOR_PARAMETER = "/* = compiled code */" private val FLEXIBLE_TYPE_COMMENT = "/* platform type */" -public val descriptorRendererForDecompiler: DescriptorRenderer = DescriptorRendererBuilder() +private val descriptorRendererForDecompiler = DescriptorRendererBuilder() .setWithDefinedIn(false) .setClassWithPrimaryConstructor(true) .setTypeNormalizer { @@ -87,9 +87,10 @@ public val descriptorRendererForDecompiler: DescriptorRenderer = DescriptorRende } .build() -//TODO: should use more accurate way to identify descriptors +private val descriptorRendererForKeys = DescriptorRenderer.COMPACT_WITH_MODIFIERS + public fun descriptorToKey(descriptor: DeclarationDescriptor): String { - return descriptorRendererForDecompiler.render(descriptor) + return descriptorRendererForKeys.render(descriptor) } public data class DecompiledText(public val text: String, public val renderedDescriptorsToRange: Map)