Correct class object mapping in kotlin => java run

2011-12-21 09:04:56 +03:00
parent 86bb01edcf
commit 34e5f60496
3 changed files with 65 additions and 34 deletions
@@ -196,20 +196,10 @@ public class JetTypeMapper {
        }
    }

-    private static String getLocalNameForObject(JetObjectDeclaration object) {
+    public static String getLocalNameForObject(JetObjectDeclaration object) {
        PsiElement parent = object.getParent();
-        if (parent instanceof JetObjectLiteralExpression) {
-            PsiElement expressionParent = parent.getParent();
-
-            if (expressionParent instanceof JetProperty) {
-                JetProperty property = (JetProperty) expressionParent;
-                if (property.getInitializer() == parent) {
-                    return property.getName();
-                }
-            }
-        }
-        else if (parent instanceof JetClassObject) {
-            return "$ClassObject";
+        if (parent instanceof JetClassObject) {
+            return "ClassObject$";
        }

        return null;