Minor, reuse existing method

This commit is contained in:
Alexander Udalov
2014-09-08 12:37:10 +04:00
parent 476dc78c16
commit c5345a83c9
2 changed files with 3 additions and 16 deletions
@@ -17,29 +17,16 @@
package org.jetbrains.jet.lang.diagnostics.rendering
import org.jetbrains.jet.renderer.Renderer
import org.jetbrains.jet.lang.descriptors.ClassKind
import org.jetbrains.jet.lang.descriptors.ClassKind.*
import org.jetbrains.jet.lang.descriptors.ClassDescriptor
import org.jetbrains.jet.lang.resolve.DescriptorUtils.isClassObject
import org.jetbrains.jet.renderer.DescriptorRendererImpl
public fun <P> renderParameter(parameter: P, renderer: Renderer<P>?): Any = renderer?.render(parameter) ?: parameter
public fun ClassDescriptor.renderKindWithName(): String {
val kind = getKind().getText()
val kind = DescriptorRendererImpl.getClassKindPrefix(this)
if (isClassObject(this)) {
return "$kind of '${getContainingDeclaration().getName()}'"
}
return "$kind '${getName()}'"
}
public fun ClassKind.getText(): String {
return when (this) {
CLASS -> "class"
TRAIT -> "trait"
ENUM_CLASS -> "enum class"
ENUM_ENTRY -> "enum entry"
ANNOTATION_CLASS -> "annotation class"
OBJECT -> "object"
CLASS_OBJECT -> "class object"
}
}
@@ -855,7 +855,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
}
@NotNull
private static String getClassKindPrefix(@NotNull ClassDescriptor klass) {
public static String getClassKindPrefix(@NotNull ClassDescriptor klass) {
switch (klass.getKind()) {
case CLASS:
return "class";