Minor, reuse existing method
This commit is contained in:
+2
-15
@@ -17,29 +17,16 @@
|
|||||||
package org.jetbrains.jet.lang.diagnostics.rendering
|
package org.jetbrains.jet.lang.diagnostics.rendering
|
||||||
|
|
||||||
import org.jetbrains.jet.renderer.Renderer
|
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.descriptors.ClassDescriptor
|
||||||
import org.jetbrains.jet.lang.resolve.DescriptorUtils.isClassObject
|
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 <P> renderParameter(parameter: P, renderer: Renderer<P>?): Any = renderer?.render(parameter) ?: parameter
|
||||||
|
|
||||||
public fun ClassDescriptor.renderKindWithName(): String {
|
public fun ClassDescriptor.renderKindWithName(): String {
|
||||||
val kind = getKind().getText()
|
val kind = DescriptorRendererImpl.getClassKindPrefix(this)
|
||||||
if (isClassObject(this)) {
|
if (isClassObject(this)) {
|
||||||
return "$kind of '${getContainingDeclaration().getName()}'"
|
return "$kind of '${getContainingDeclaration().getName()}'"
|
||||||
}
|
}
|
||||||
return "$kind '${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
|
@NotNull
|
||||||
private static String getClassKindPrefix(@NotNull ClassDescriptor klass) {
|
public static String getClassKindPrefix(@NotNull ClassDescriptor klass) {
|
||||||
switch (klass.getKind()) {
|
switch (klass.getKind()) {
|
||||||
case CLASS:
|
case CLASS:
|
||||||
return "class";
|
return "class";
|
||||||
|
|||||||
Reference in New Issue
Block a user