From e9bac5ce16e3726b767bbdcc9c3ec6af06fd6af5 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Sat, 10 Mar 2012 20:29:00 +0400
Subject: [PATCH] Added better rendering for objects in DescriptorRenderer.

---
 .../jet/resolve/DescriptorRenderer.java       | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
index aef7c264b8c..09992aced60 100644
--- a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
+++ b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
@@ -381,7 +381,20 @@ public class DescriptorRenderer implements Renderer<DeclarationDescriptor> {
 
         @Override
         public Void visitClassDescriptor(ClassDescriptor descriptor, StringBuilder builder) {
-            String keyword = descriptor.getKind() == ClassKind.TRAIT ? "trait" : "class";
+            String keyword;
+            switch (descriptor.getKind()) {
+                case TRAIT:
+                    keyword = "trait";
+                    break;
+                case ENUM_CLASS:
+                    keyword = "enum class";
+                    break;
+                case OBJECT:
+                    keyword = "object";
+                    break;
+                default:
+                    keyword = "class";
+            }
             renderClassDescriptor(descriptor, builder, keyword);
             return super.visitClassDescriptor(descriptor, builder);
         }
@@ -390,9 +403,12 @@ public class DescriptorRenderer implements Renderer<DeclarationDescriptor> {
             if (descriptor.getKind() != ClassKind.TRAIT) {
                 renderModality(descriptor.getModality(), builder);
             }
-            builder.append(renderKeyword(keyword)).append(" ");
-            renderName(descriptor, builder);
-            renderTypeParameters(descriptor.getTypeConstructor().getParameters(), builder);
+            builder.append(renderKeyword(keyword));
+            if (descriptor.getKind() != ClassKind.OBJECT) {
+                builder.append(" ");
+                renderName(descriptor, builder);
+                renderTypeParameters(descriptor.getTypeConstructor().getParameters(), builder);
+            }
             if (!descriptor.equals(JetStandardClasses.getNothing())) {
                 Collection<? extends JetType> supertypes = descriptor.getTypeConstructor().getSupertypes();
                 if (!supertypes.isEmpty()) {