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

DecompiledTextFactory: use separate descriptor renderer to render keys

Browse Source 
Previously the same render that renders decompiled text was used by accident
This commit is contained in:
Pavel V. Talanov
2015-03-13 20:09:42 +03:00
parent fd718ad366
commit 026e35b6d0
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt
+4 -3
View File
@@ -74,7 +74,7 @@ private val DECOMPILED_CODE_COMMENT = "/* compiled code */"
private val DECOMPILED_COMMENT_FOR_PARAMETER = "/* = compiled code */" private val DECOMPILED_COMMENT_FOR_PARAMETER = "/* = compiled code */"
private val FLEXIBLE_TYPE_COMMENT = "/* platform type */" private val FLEXIBLE_TYPE_COMMENT = "/* platform type */"
public val descriptorRendererForDecompiler: DescriptorRenderer = DescriptorRendererBuilder() private val descriptorRendererForDecompiler = DescriptorRendererBuilder()
.setWithDefinedIn(false) .setWithDefinedIn(false)
.setClassWithPrimaryConstructor(true) .setClassWithPrimaryConstructor(true)
.setTypeNormalizer { .setTypeNormalizer {
@@ -87,9 +87,10 @@ public val descriptorRendererForDecompiler: DescriptorRenderer = DescriptorRende
} }
.build() .build()
//TODO: should use more accurate way to identify descriptors private val descriptorRendererForKeys = DescriptorRenderer.COMPACT_WITH_MODIFIERS
public fun descriptorToKey(descriptor: DeclarationDescriptor): String { 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<String, TextRange>) public data class DecompiledText(public val text: String, public val renderedDescriptorsToRange: Map<String, TextRange>)