Rename fields on name clashing

#KT-3663 Fixed #KT-3664 Fixed
2013-06-13 13:48:08 +04:00
parent 406f90badf
commit aec6deae9f
14 changed files with 177 additions and 60 deletions
@@ -17,6 +17,7 @@
 package org.jetbrains.jet.lang.resolve.java;

 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;

@@ -59,6 +60,20 @@ public class JvmAbi {
        return name.asString() + DELEGATED_PROPERTY_NAME_POSTFIX;
    }

+
+    public static String getDefaultPropertyName(Name propertyName, boolean isDelegated, boolean isExtensionProperty) {
+        if (isDelegated) {
+            return getPropertyDelegateName(propertyName);
+        }
+
+        String name = propertyName.asString();
+        if (isExtensionProperty) {
+            name += "$ext";
+        }
+        return name;
+
+    }
+
    private JvmAbi() {
    }
 }