DescriptorRenderer uses FqName.render(), not the opposite

This commit is contained in:
Valentin Kipyatkov
2015-06-05 17:53:16 +03:00
parent 2d5611d916
commit c661e2fbe2
2 changed files with 18 additions and 15 deletions
@@ -117,20 +117,9 @@ internal class DescriptorRendererImpl(
}
}
override fun renderFqName(fqName: FqNameBase): String {
return renderFqName(fqName.pathSegments())
}
override fun renderFqName(fqName: FqNameBase) = renderFqName(fqName.pathSegments())
private fun renderFqName(pathSegments: List<Name>): String {
val buf = StringBuilder()
for (element in pathSegments) {
if (buf.length() != 0) {
buf.append(".")
}
buf.append(renderName(element))
}
return buf.toString()
}
private fun renderFqName(pathSegments: List<Name>) = escape(org.jetbrains.kotlin.renderer.renderFqName(pathSegments))
override fun renderClassifierName(klass: ClassifierDescriptor): String {
if (klass is MissingDependencyErrorClass) {
@@ -164,7 +153,7 @@ internal class DescriptorRendererImpl(
/* TYPES RENDERING */
override fun renderType(type: JetType): String {
return renderNormalizedType(typeNormalizer.invoke(type))
return renderNormalizedType(typeNormalizer(type))
}
private fun renderNormalizedType(type: JetType): String {
@@ -47,4 +47,18 @@ private fun Name.shouldBeEscaped(): Boolean {
return string in KeywordStringsGenerated.KEYWORDS || string.any { !Character.isLetterOrDigit(it) && it != '_' }
}
public fun FqNameBase.render(): String = DescriptorRenderer.COMPACT.renderFqName(this)
public fun FqNameBase.render(): String {
return renderFqName(pathSegments())
}
public fun renderFqName(pathSegments: List<Name>): String {
return StringBuilder {
for (element in pathSegments) {
if (length() > 0) {
append(".")
}
append(element.render())
}
}.toString()
}