Render name of class object as 'class object of MyClass'

core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java

@@ -87,6 +87,7 @@ public interface DescriptorRenderer extends Renderer<DeclarationDescriptor> {
     DescriptorRenderer HTML_NAMES_WITH_SHORT_TYPES = new DescriptorRendererBuilder()
             .setWithDefinedIn(false)
             .setShortNames(true)
+            .setRenderClassObjectName(true)
             .setTextFormat(TextFormat.HTML).build();
 
     DescriptorRenderer HTML = new DescriptorRendererBuilder().setTextFormat(TextFormat.HTML).build();

core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java

@@ -211,8 +211,15 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
 
     private void renderClassObjectName(@NotNull DeclarationDescriptor descriptor, @NotNull StringBuilder builder) {
         if (renderClassObjectName) {
-            if (!startFromName) renderSpaceIfNeeded(builder);
+            if (startFromName) {
-            builder.append("<class object>");
+                builder.append("class object");
+            }
+            renderSpaceIfNeeded(builder);
+            DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration();
+            if (containingDeclaration != null) {
+                builder.append("of ");
+                builder.append(renderName(containingDeclaration.getName()));
+            }
         }
         if (verbose) {
             if (!startFromName) renderSpaceIfNeeded(builder);

idea/testData/structureView/fileStructure/Render.after

@@ -12,7 +12,7 @@
   Inner1
   Inner2
  -A6
-  -<class object>
+  -class object of A6
    test(): Unit
  -A7
   <class initializer>