Include containing declaration name in message for JVM signature clashes

#KT-9359 Fixed
This commit is contained in:
Dmitry Petrov
2017-05-24 17:36:08 +03:00
parent d850f01c39
commit 17eab2865d
5 changed files with 14 additions and 18 deletions
@@ -69,10 +69,6 @@ object IdeRenderers {
HTML_RENDER_TYPE.render(member.returnType!!, context)
}
@JvmField val HTML_COMPACT_WITH_MODIFIERS = DescriptorRenderer.HTML.withOptions {
withDefinedIn = false
}.asRenderer()
@JvmField val HTML_CONFLICTING_JVM_DECLARATIONS_DATA = Renderer {
data: ConflictingJvmDeclarationsData ->
@@ -80,7 +76,7 @@ object IdeRenderers {
.mapNotNull { it.descriptor }
.sortedWith(MemberComparator.INSTANCE)
val context = RenderingContext.of(descriptors)
val conflicts = descriptors.joinToString("") { "<li>" + HTML_COMPACT_WITH_MODIFIERS.render(it, context) + "</li>\n" }
val conflicts = descriptors.joinToString("") { "<li>" + HTML.render(it, context) + "</li>\n" }
"The following declarations have the same JVM signature (<code>${data.signature.name}${data.signature.desc}</code>):<br/>\n<ul>\n$conflicts</ul>"
}