generate property accessors in class interface

idea/src/org/jetbrains/jet/codegen/PropertyCodegen.java

@@ -34,7 +34,7 @@ public class PropertyCodegen {
     }
 
     public void genInInterface(JetProperty p) {
-        gen(p, OwnerKind.INTERFACE);
+
     }
 
     public void genInImplementation(JetProperty p) {
@@ -46,12 +46,37 @@ public class PropertyCodegen {
     }
 
     public void gen(JetProperty p, OwnerKind kind) {
-        if (kind == OwnerKind.NAMESPACE || kind == OwnerKind.IMPLEMENTATION) {
         final VariableDescriptor descriptor = context.getVariableDescriptor(p);
         if (!(descriptor instanceof PropertyDescriptor)) {
             throw new UnsupportedOperationException("expect a property to have a property descriptor");
         }
         final PropertyDescriptor propertyDescriptor = (PropertyDescriptor) descriptor;
+        if (kind == OwnerKind.NAMESPACE || kind == OwnerKind.IMPLEMENTATION) {
+            generateBackingField(p, kind, propertyDescriptor);
+            generateGetter(p, kind, propertyDescriptor);
+            generateSetter(p, kind, propertyDescriptor);
+        }
+        else if (kind == OwnerKind.INTERFACE) {
+            final JetPropertyAccessor getter = p.getGetter();
+            if ((getter != null && !getter.hasModifier(JetTokens.PRIVATE_KEYWORD) ||
+                 (getter == null && isExternallyAccessible(p)))) {
+                v.visitMethod(Opcodes.ACC_ABSTRACT | Opcodes.ACC_PUBLIC,
+                        getterName(p.getName()),
+                        mapper.mapGetterSignature(propertyDescriptor).getDescriptor(),
+                        null, null);
+            }
+            final JetPropertyAccessor setter = p.getSetter();
+            if ((setter != null && !setter.hasModifier(JetTokens.PRIVATE_KEYWORD) ||
+                (setter == null && isExternallyAccessible(p) && p.isVar()))) {
+                v.visitMethod(Opcodes.ACC_ABSTRACT | Opcodes.ACC_PUBLIC,
+                        setterName(p.getName()),
+                        mapper.mapSetterSignature(propertyDescriptor).getDescriptor(),
+                        null, null);
+            }
+        }
+    }
+
+    private void generateBackingField(JetProperty p, OwnerKind kind, PropertyDescriptor propertyDescriptor) {
         if (context.hasBackingField(propertyDescriptor)) {
             Object value = null;
             final JetExpression initializer = p.getInitializer();
@@ -64,8 +89,11 @@ public class PropertyCodegen {
             if (kind == OwnerKind.NAMESPACE) {
                 modifiers |= Opcodes.ACC_STATIC;
             }
-                v.visitField(modifiers, p.getName(), mapper.mapType(descriptor.getOutType()).getDescriptor(), null, value);
+            v.visitField(modifiers, p.getName(), mapper.mapType(propertyDescriptor.getOutType()).getDescriptor(), null, value);
         }
+    }
+
+    private void generateGetter(JetProperty p, OwnerKind kind, PropertyDescriptor propertyDescriptor) {
         final JetPropertyAccessor getter = p.getGetter();
         if (getter != null) {
             if (getter.getBodyExpression() != null) {
@@ -76,9 +104,16 @@ public class PropertyCodegen {
                 generateDefaultGetter(p, getter, kind);
             }
         }
-            else if (p.hasModifier(JetTokens.PUBLIC_KEYWORD)) {
+        else if (isExternallyAccessible(p)) {
             generateDefaultGetter(p, p, kind);
         }
+    }
+
+    private static boolean isExternallyAccessible(JetProperty p) {
+        return p.hasModifier(JetTokens.PUBLIC_KEYWORD);
+    }
+
+    private void generateSetter(JetProperty p, OwnerKind kind, PropertyDescriptor propertyDescriptor) {
         final JetPropertyAccessor setter = p.getSetter();
         if (setter != null) {
             if (setter.getBodyExpression() != null) {
@@ -91,11 +126,10 @@ public class PropertyCodegen {
                 generateDefaultSetter(p, setter, kind);
             }
         }
-            else if (p.hasModifier(JetTokens.PUBLIC_KEYWORD) && p.isVar()) {
+        else if (isExternallyAccessible(p) && p.isVar()) {
             generateDefaultSetter(p, p, kind);
         }
     }
-    }
 
     private void generateDefaultGetter(JetProperty p, JetDeclaration declaration, OwnerKind kind) {
         final PropertyDescriptor propertyDescriptor = (PropertyDescriptor) context.getVariableDescriptor(p);

idea/tests/org/jetbrains/jet/codegen/PropertyGenTest.java

@@ -40,6 +40,13 @@ public class PropertyGenTest extends CodegenTestCase {
         assertEquals(239, ((Integer) getter.invoke(instance)).intValue());
     }
 
+    public void testAccessorsInInterface() {
+        loadText("class AccessorsInInterface { public var foo = 0; }");
+        final Class aClass = loadClass("AccessorsInInterface", generateClassesInFile());
+        assertNotNull(findMethodByName(aClass, "getFoo"));
+        assertNotNull(findMethodByName(aClass, "setFoo"));
+    }
+
     public void testPropertyInNamespace() throws Exception {
         loadText("private val x = 239");
         final Class nsClass = generateNamespaceClass();