From c84cd7f961ad4768dbab3cceb7fdb94bd1235cfe Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Fri, 26 Oct 2012 21:19:55 +0400
Subject: [PATCH] Renamed ClassObject$ to object in JVM backend.

---
 .../src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java     | 2 +-
 .../testData/writeFlags/class/deprecatedFlag/classObject.kt | 2 +-
 .../writeFlags/function/deprecatedFlag/funInClassObject.kt  | 2 +-
 idea/testData/debugger/classObject.kt                       | 2 +-
 .../jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java  | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java
index 4ce1647e1b9..17638a9ea1c 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java
@@ -28,7 +28,7 @@ public class JvmAbi {
     public static final String SETTER_PREFIX = "set";
     public static final String PACKAGE_CLASS = "namespace";
 
-    public static final String CLASS_OBJECT_CLASS_NAME = "ClassObject$";
+    public static final String CLASS_OBJECT_CLASS_NAME = "object";
     public static final String CLASS_OBJECT_SUFFIX = "$" + CLASS_OBJECT_CLASS_NAME;
 
     public static final String INSTANCE_FIELD = "$instance";
diff --git a/compiler/testData/writeFlags/class/deprecatedFlag/classObject.kt b/compiler/testData/writeFlags/class/deprecatedFlag/classObject.kt
index b96336eca80..1ca5be0ab8d 100644
--- a/compiler/testData/writeFlags/class/deprecatedFlag/classObject.kt
+++ b/compiler/testData/writeFlags/class/deprecatedFlag/classObject.kt
@@ -5,5 +5,5 @@ class MyClass {
 }
 
 // TESTED_OBJECT_KIND: class
-// TESTED_OBJECTS: MyClass$ClassObject$
+// TESTED_OBJECTS: MyClass$object
 // FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_DEPRECATED, ACC_SUPER
diff --git a/compiler/testData/writeFlags/function/deprecatedFlag/funInClassObject.kt b/compiler/testData/writeFlags/function/deprecatedFlag/funInClassObject.kt
index 1e1e2bdf697..3715a73236e 100644
--- a/compiler/testData/writeFlags/function/deprecatedFlag/funInClassObject.kt
+++ b/compiler/testData/writeFlags/function/deprecatedFlag/funInClassObject.kt
@@ -5,5 +5,5 @@ class MyClass() {
 }
 
 // TESTED_OBJECT_KIND: function
-// TESTED_OBJECTS: MyClass$ClassObject$, test
+// TESTED_OBJECTS: MyClass$object, test
 // FLAGS: ACC_DEPRECATED, ACC_PUBLIC, ACC_FINAL
diff --git a/idea/testData/debugger/classObject.kt b/idea/testData/debugger/classObject.kt
index e91ffaf7d57..de31627f32c 100644
--- a/idea/testData/debugger/classObject.kt
+++ b/idea/testData/debugger/classObject.kt
@@ -1,7 +1,7 @@
 class A {
     class object {
         fun foo() {
-            ""   // A$ClassObject$
+            ""   // A$object
         }
     }
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java b/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java
index c0b008f1918..274512848e2 100644
--- a/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java
@@ -127,14 +127,14 @@ public class JetJavaFacadeTest extends LightCodeInsightFixtureTestCase {
         PsiField classobjField = theClass.findFieldByName("$classobj", false);
         assertNull(classobjField);
 
-        final PsiClass classObjectClass = theClass.findInnerClassByName("ClassObject$", false);
+        final PsiClass classObjectClass = theClass.findInnerClassByName("object", false);
         assertNotNull(classObjectClass);
-        assertEquals("foo.TheClass.ClassObject$", classObjectClass.getQualifiedName());
+        assertEquals("foo.TheClass.object", classObjectClass.getQualifiedName());
         assertTrue(classObjectClass.hasModifierProperty(PsiModifier.STATIC));
 
         final PsiField instance = classObjectClass.findFieldByName(JvmAbi.INSTANCE_FIELD, false);
         assertNotNull(instance);
-        assertEquals("foo.TheClass.ClassObject$", instance.getType().getCanonicalText());
+        assertEquals("foo.TheClass.object", instance.getType().getCanonicalText());
         assertTrue(instance.hasModifierProperty(PsiModifier.PUBLIC));
         assertTrue(instance.hasModifierProperty(PsiModifier.STATIC));
         assertTrue(instance.hasModifierProperty(PsiModifier.FINAL));