fix another case of property resolution, refactoring

compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java

@@ -94,7 +94,7 @@ public class FunctionCodegen {
                 int start = 0;
                 if(kind != OwnerKind.TRAIT_IMPL) {
                     if (functionDescriptor instanceof PropertyAccessorDescriptor) {
-                        PropertyCodegen.generateJetPropertyAnnotation(mv, propertyTypeSignature);
+                        PropertyCodegen.generateJetPropertyAnnotation(mv, propertyTypeSignature, jvmSignature.getKotlinTypeParameter());
                     } else if (functionDescriptor instanceof NamedFunctionDescriptor) {
                         if (propertyTypeSignature != null) {
                             throw new IllegalStateException();

compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java

@@ -243,7 +243,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
                         JvmPropertyAccessorSignature originalSignature = typeMapper.mapGetterSignature(original, OwnerKind.IMPLEMENTATION);
                         Method originalMethod = originalSignature.getJvmMethodSignature().getAsmMethod();
                         MethodVisitor mv = v.newMethod(null, Opcodes.ACC_PUBLIC | Opcodes.ACC_BRIDGE | Opcodes.ACC_FINAL, method.getName(), method.getDescriptor(), null, null);
-                        PropertyCodegen.generateJetPropertyAnnotation(mv, originalSignature.getPropertyTypeKotlinSignature());
+                        PropertyCodegen.generateJetPropertyAnnotation(mv, originalSignature.getPropertyTypeKotlinSignature(), originalSignature.getJvmMethodSignature().getKotlinTypeParameter());
                         mv.visitAnnotation(JvmStdlibNames.JET_PROPERTY.getDescriptor(), true).visitEnd();
                         if (v.generateCode()) {
                             mv.visitCode();
@@ -267,7 +267,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
                         JvmPropertyAccessorSignature originalSignature2 = typeMapper.mapSetterSignature(original, OwnerKind.IMPLEMENTATION);
                         Method originalMethod = originalSignature2.getJvmMethodSignature().getAsmMethod();
                         MethodVisitor mv = v.newMethod(null, Opcodes.ACC_PUBLIC | Opcodes.ACC_BRIDGE | Opcodes.ACC_FINAL, method.getName(), method.getDescriptor(), null, null);
-                        PropertyCodegen.generateJetPropertyAnnotation(mv, originalSignature2.getPropertyTypeKotlinSignature());
+                        PropertyCodegen.generateJetPropertyAnnotation(mv, originalSignature2.getPropertyTypeKotlinSignature(), originalSignature2.getJvmMethodSignature().getKotlinTypeParameter());
                         mv.visitAnnotation(JvmStdlibNames.JET_PROPERTY.getDescriptor(), true).visitEnd();
                         if (v.generateCode()) {
                             mv.visitCode();

compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java

@@ -519,9 +519,8 @@ public class JetTypeMapper {
         
         BothSignatureWriter signatureWriter = new BothSignatureWriter(BothSignatureWriter.Mode.METHOD, false);
         
-        signatureWriter.writeFormalTypeParametersStart();
+        writeFormalTypeParameters(f.getTypeParameters(), signatureWriter);
-        signatureWriter.writeFormalTypeParametersEnd();
+
-        
         signatureWriter.writeParametersStart();
         
         final List<ValueParameterDescriptor> parameters = f.getValueParameters();
@@ -552,8 +551,7 @@ public class JetTypeMapper {
         // TODO: do not generate generics if not needed
         BothSignatureWriter signatureWriter = new BothSignatureWriter(BothSignatureWriter.Mode.METHOD, true);
 
-        signatureWriter.writeFormalTypeParametersStart();
+        writeFormalTypeParameters(descriptor.getTypeParameters(), signatureWriter);
-        signatureWriter.writeFormalTypeParametersEnd();
 
         signatureWriter.writeParametersStart();
 
@@ -597,8 +595,7 @@ public class JetTypeMapper {
         // TODO: generics signature is not always needed
         BothSignatureWriter signatureWriter = new BothSignatureWriter(BothSignatureWriter.Mode.METHOD, true);
         
-        signatureWriter.writeFormalTypeParametersStart();
+        writeFormalTypeParameters(descriptor.getTypeParameters(), signatureWriter);
-        signatureWriter.writeFormalTypeParametersEnd();
 
         JetType outType = descriptor.getOutType();
 
@@ -644,8 +641,7 @@ public class JetTypeMapper {
         List<ValueParameterDescriptor> parameters = descriptor.getOriginal().getValueParameters();
         ClassDescriptor classDescriptor = descriptor.getContainingDeclaration();
         
-        signatureWriter.writeFormalTypeParametersStart();
+        writeFormalTypeParameters(descriptor.getTypeParameters(), signatureWriter);
-        signatureWriter.writeFormalTypeParametersEnd();
 
         signatureWriter.writeParametersStart();
 

compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java

@@ -146,7 +146,7 @@ public class PropertyCodegen {
         final String descriptor = signature.getJvmMethodSignature().getAsmMethod().getDescriptor();
         String getterName = getterName(propertyDescriptor.getName());
         MethodVisitor mv = v.newMethod(origin, flags, getterName, descriptor, null, null);
-        generateJetPropertyAnnotation(mv, signature.getPropertyTypeKotlinSignature());
+        generateJetPropertyAnnotation(mv, signature.getPropertyTypeKotlinSignature(), signature.getJvmMethodSignature().getKotlinTypeParameter());
         if (v.generateCode() && (!isTrait || kind instanceof OwnerKind.DelegateKind)) {
             mv.visitCode();
             InstructionAdapter iv = new InstructionAdapter(mv);
@@ -169,11 +169,14 @@ public class PropertyCodegen {
         }
     }
 
-    public static void generateJetPropertyAnnotation(MethodVisitor mv, @NotNull String kotlinType) {
+    public static void generateJetPropertyAnnotation(MethodVisitor mv, @NotNull String kotlinType, @NotNull String typeParameters) {
         AnnotationVisitor annotationVisitor = mv.visitAnnotation(JvmStdlibNames.JET_PROPERTY.getDescriptor(), true);
         if (kotlinType.length() > 0) {
             annotationVisitor.visit(JvmStdlibNames.JET_PROPERTY_TYPE_FIELD, kotlinType);
         }
+        if (typeParameters.length() > 0) {
+            annotationVisitor.visit(JvmStdlibNames.JET_PROPERTY_TYPE_PARAMETERS_FIELD, typeParameters);
+        }
         annotationVisitor.visitEnd();
     }
 
@@ -200,7 +203,7 @@ public class PropertyCodegen {
         JvmPropertyAccessorSignature signature = state.getTypeMapper().mapSetterSignature(propertyDescriptor, kind);
         final String descriptor = signature.getJvmMethodSignature().getAsmMethod().getDescriptor();
         MethodVisitor mv = v.newMethod(origin, flags, setterName(propertyDescriptor.getName()), descriptor, null, null);
-        generateJetPropertyAnnotation(mv, signature.getPropertyTypeKotlinSignature());
+        generateJetPropertyAnnotation(mv, signature.getPropertyTypeKotlinSignature(), signature.getJvmMethodSignature().getKotlinTypeParameter());
         if (v.generateCode() && (!isTrait || kind instanceof OwnerKind.DelegateKind)) {
             mv.visitCode();
             InstructionAdapter iv = new InstructionAdapter(mv);

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java

@@ -14,7 +14,6 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiEllipsisType;
 import com.intellij.psi.PsiField;
 import com.intellij.psi.PsiJavaFile;
-import com.intellij.psi.PsiMember;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiModifier;
 import com.intellij.psi.PsiModifierListOwner;
@@ -34,11 +33,12 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorImpl;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorVisitor;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
-import org.jetbrains.jet.lang.descriptors.FunctionDescriptorImpl;
 import org.jetbrains.jet.lang.descriptors.Modality;
 import org.jetbrains.jet.lang.descriptors.NamedFunctionDescriptorImpl;
 import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
+import org.jetbrains.jet.lang.descriptors.PropertyGetterDescriptor;
+import org.jetbrains.jet.lang.descriptors.PropertySetterDescriptor;
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptorImpl;
@@ -48,7 +48,6 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.java.kt.JetClassAnnotation;
-import org.jetbrains.jet.lang.resolve.java.kt.JetMethodAnnotation;
 import org.jetbrains.jet.lang.types.JetStandardClasses;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.TypeConstructorImpl;
@@ -160,7 +159,7 @@ public class JavaDescriptorResolver {
     protected final Map<String, ResolverNamespaceData> namespaceDescriptorCacheByFqn = Maps.newHashMap();
     protected final Map<PsiElement, ResolverNamespaceData> namespaceDescriptorCache = Maps.newHashMap();
 
-    protected final Map<PsiTypeParameter, TypeParameterDescriptorInitialization> typeParameterDescriptorCache = Maps.newHashMap();
+    private final Map<PsiTypeParameter, TypeParameterDescriptorInitialization> typeParameterDescriptorCache = Maps.newHashMap();
     protected final Map<PsiMethod, FunctionDescriptor> methodDescriptorCache = Maps.newHashMap();
     protected final Map<PsiField, VariableDescriptor> fieldDescriptorCache = Maps.newHashMap();
     protected final JavaPsiFacade javaFacade;
@@ -806,15 +805,15 @@ public class JavaDescriptorResolver {
     private static class PropertyKey {
         @NotNull
         private final String name;
-        @NotNull
+        //@NotNull
-        private final PsiType type;
+        //private final PsiType type;
-        @Nullable
+        //@Nullable
-        private final PsiType receiverType;
+        //private final PsiType receiverType;
 
-        private PropertyKey(@NotNull String name, @NotNull PsiType type, @Nullable PsiType receiverType) {
+        private PropertyKey(@NotNull String name /*, @NotNull PsiType type, @Nullable PsiType receiverType */) {
             this.name = name;
-            this.type = type;
+            //this.type = type;
-            this.receiverType = receiverType;
+            //this.receiverType = receiverType;
         }
 
         @Override
@@ -825,9 +824,9 @@ public class JavaDescriptorResolver {
             PropertyKey that = (PropertyKey) o;
 
             if (!name.equals(that.name)) return false;
-            if (receiverType != null ? !receiverType.equals(that.receiverType) : that.receiverType != null)
+            //if (receiverType != null ? !receiverType.equals(that.receiverType) : that.receiverType != null)
-                return false;
+            //    return false;
-            if (!type.equals(that.type)) return false;
+            //if (!type.equals(that.type)) return false;
 
             return true;
         }
@@ -835,16 +834,19 @@ public class JavaDescriptorResolver {
         @Override
         public int hashCode() {
             int result = name.hashCode();
-            result = 31 * result + type.hashCode();
+            //result = 31 * result + type.hashCode();
-            result = 31 * result + (receiverType != null ? receiverType.hashCode() : 0);
+            //result = 31 * result + (receiverType != null ? receiverType.hashCode() : 0);
             return result;
         }
     }
 
     private static class MembersForProperty {
-        private PsiField field;
+        private PsiFieldWrapper field;
-        private PsiMethod setter;
+        private PsiMethodWrapper setter;
-        private PsiMethod getter;
+        private PsiMethodWrapper getter;
+
+        private PsiType type;
+        private PsiType receiverType;
     }
     
     private Map<PropertyKey, MembersForProperty> getMembersForProperties(@NotNull PsiClass clazz, boolean staticMembers, boolean kotlin) {
@@ -860,8 +862,9 @@ public class JavaDescriptorResolver {
                 }
 
                 MembersForProperty members = new MembersForProperty();
-                members.field = field;
+                members.field = new PsiFieldWrapper(field);
-                membersMap.put(new PropertyKey(field.getName(), field.getType(), null), members);
+                members.type = field.getType();
+                membersMap.put(new PropertyKey(field.getName() /*, field.getType(), null*/), members);
             }
         }
         
@@ -882,41 +885,49 @@ public class JavaDescriptorResolver {
 
                 // TODO: some java properties too
                 if (method.getJetProperty().isDefined()) {
-                    PsiType receiverType;
+
-                    if (method.getParameters().size() == 0) {
-                        receiverType = null;
-                    } else if (method.getParameters().size() == 1) {
-                        if (method.getParameter(0).getJetTypeParameter().isDefined()) {
-                            receiverType = null;
-                        } else {
-                            receiverType = method.getParameter(0).getPsiParameter().getType();
-                        }
-                    } else if (method.getParameters().size() == 2) {
-                        if (!method.getParameter(1).getJetTypeParameter().isDefined()) {
-                            throw new IllegalStateException();
-                        }
-                        receiverType = psiMethod.getParameterList().getParameters()[0].getType();
-                    } else {
-                        throw new IllegalStateException();
-                    }
-                    
                     if (psiMethod.getName().equals(JvmStdlibNames.JET_OBJECT_GET_TYPEINFO_METHOD)) {
                         continue;
                     }
 
+                    int i = 0;
+
+                    PsiType receiverType;
+                    if (i < method.getParameters().size() && method.getParameter(i).getJetValueParameter().receiver()) {
+                        receiverType = method.getParameter(i).getPsiParameter().getType();
+                        ++i;
+                    } else {
+                        receiverType = null;
+                    }
+                    
+                    while (i < method.getParameters().size() && method.getParameter(i).getJetTypeParameter().isDefined()) {
+                        // TODO: store is reified
+                        ++i;
+                    }
+                    
+                    if (i != method.getParameters().size()) {
+                        // TODO: report error properly
+                        throw new IllegalStateException();
+                    }
+                    
                     String propertyName = StringUtil.decapitalize(psiMethod.getName().substring(JvmAbi.GETTER_PREFIX.length()));
-                    PropertyKey key = new PropertyKey(propertyName, psiMethod.getReturnType(), receiverType);
+                    PropertyKey key = new PropertyKey(propertyName /*, psiMethod.getReturnType(), receiverType*/);
                     MembersForProperty members = membersMap.get(key);
                     if (members == null) {
                         members = new MembersForProperty();
                         membersMap.put(key, members);
                     }
-                    members.getter = psiMethod;
+                    members.getter = new PsiMethodWrapper(psiMethod);
+
+                    // TODO: check conflicts with setter
+                    members.type = psiMethod.getReturnType();
+                    members.receiverType = receiverType;
                 }
             } else if (psiMethod.getName().startsWith(JvmAbi.SETTER_PREFIX)) {
 
                 if (method.getJetProperty().isDefined()) {
                     if (psiMethod.getParameterList().getParametersCount() == 0) {
+                        // TODO: report error properly
                         throw new IllegalStateException();
                     }
 
@@ -940,13 +951,17 @@ public class JavaDescriptorResolver {
                     PsiType propertyType = psiMethod.getParameterList().getParameters()[i].getType();
 
                     String propertyName = StringUtil.decapitalize(psiMethod.getName().substring(JvmAbi.SETTER_PREFIX.length()));
-                    PropertyKey key = new PropertyKey(propertyName, propertyType, receiverType);
+                    PropertyKey key = new PropertyKey(propertyName /*, propertyType, receiverType*/);
                     MembersForProperty members = membersMap.get(key);
                     if (members == null) {
                         members = new MembersForProperty();
                         membersMap.put(key, members);
                     }
-                    members.setter = psiMethod;
+                    members.setter = new PsiMethodWrapper(psiMethod);
+
+                    // TODO: check conflicts with getter
+                    members.type = propertyType;
+                    members.receiverType = receiverType;
                 }
             }
         }
@@ -986,29 +1001,30 @@ public class JavaDescriptorResolver {
         }
         
         Set<VariableDescriptor> descriptors = Sets.newHashSet();
-        for (Map.Entry<PropertyKey, MembersForProperty> entry : getMembersForProperties(psiClass, staticMembers, scopeData.kotlin).entrySet()) {
+        Map<PropertyKey, MembersForProperty> membersForProperties = getMembersForProperties(psiClass, staticMembers, scopeData.kotlin);
+        for (Map.Entry<PropertyKey, MembersForProperty> entry : membersForProperties.entrySet()) {
             //VariableDescriptor variableDescriptor = fieldDescriptorCache.get(field);
             //if (variableDescriptor != null) {
             //    return variableDescriptor;
             //}
             String propertyName = entry.getKey().name;
-            PsiType propertyType = entry.getKey().type;
+            PsiType propertyType = entry.getValue().type;
-            PsiType receiverType = entry.getKey().receiverType;
+            PsiType receiverType = entry.getValue().receiverType;
             MembersForProperty members = entry.getValue();
 
             JetType type = semanticServices.getTypeTransformer().transformToType(propertyType);
             boolean isFinal;
             if (members.setter == null && members.getter == null) {
-                isFinal = members.field.hasModifierProperty(PsiModifier.FINAL);
+                isFinal = false;
             } else if (members.getter != null) {
-                isFinal = members.getter.hasModifierProperty(PsiModifier.FINAL);
+                isFinal = members.getter.isFinal();
             } else if (members.setter != null) {
-                isFinal = members.setter.hasModifierProperty(PsiModifier.FINAL);
+                isFinal = members.setter.isFinal();
             } else {
                 isFinal = false;
             }
             
-            PsiMember anyMember;
+            PsiMemberWrapper anyMember;
             if (members.getter != null) {
                 anyMember = members.getter;
             } else if (members.field != null) {
@@ -1026,25 +1042,66 @@ public class JavaDescriptorResolver {
                 isVar = members.setter != null;
             }
             
+            PropertyDescriptor propertyDescriptor = new PropertyDescriptor(
+                    owner,
+                    Collections.<AnnotationDescriptor>emptyList(),
+                    isFinal && !staticMembers ? Modality.FINAL : Modality.OPEN, // TODO: abstract
+                    resolveVisibilityFromPsiModifiers(anyMember.psiMember),
+                    isVar,
+                    false,
+                    propertyName);
+            
+            PropertyGetterDescriptor getterDescriptor = null;
+            PropertySetterDescriptor setterDescriptor = null;
+            if (members.getter != null) {
+                getterDescriptor = new PropertyGetterDescriptor(propertyDescriptor, Collections.<AnnotationDescriptor>emptyList(), Modality.OPEN, Visibility.PUBLIC, true, false);
+            }
+            if (members.setter != null) {
+                setterDescriptor = new PropertySetterDescriptor(propertyDescriptor, Collections.<AnnotationDescriptor>emptyList(), Modality.OPEN, Visibility.PUBLIC, true, false);
+            }
+            
+            propertyDescriptor.initialize(getterDescriptor, setterDescriptor);
+
+            final List<TypeParameterDescriptor> classTypeParameters;
+            if (anyMember instanceof PsiMethodWrapper && !anyMember.isStatic()) {
+                classTypeParameters = ((ClassDescriptor) owner).getTypeConstructor().getParameters();
+            } else {
+                classTypeParameters = new ArrayList<TypeParameterDescriptor>(0);
+            }
+            TypeParameterListTypeVariableResolver typeVariableResolver = new TypeParameterListTypeVariableResolver(classTypeParameters);
+
+            List<TypeParameterDescriptor> typeParameters = new ArrayList<TypeParameterDescriptor>(0);
+
+            if (members.setter != null) {
+                // call ugly code with side effects
+                typeParameters = resolveMethodTypeParameters(members.setter, propertyDescriptor.getSetter(), typeVariableResolver);
+            }
+            if (members.getter != null) {
+                // call ugly code with side effects
+                typeParameters = resolveMethodTypeParameters(members.getter, propertyDescriptor.getGetter(), typeVariableResolver);
+            }
+
             JetType receiverJetType;
             if (receiverType == null) {
                 receiverJetType = null;
             } else {
                 receiverJetType = semanticServices.getTypeTransformer().transformToType(receiverType);
             }
-            
+
-            PropertyDescriptor propertyDescriptor = new PropertyDescriptor(
+            propertyDescriptor.setType(
-                    owner,
+                    type,
-                    Collections.<AnnotationDescriptor>emptyList(),
+                    typeParameters,
-                    isFinal && !staticMembers ? Modality.FINAL : Modality.OPEN, // TODO: abstract
-                    resolveVisibilityFromPsiModifiers(anyMember),
-                    isVar,
-                    false,
-                    receiverJetType,
                     DescriptorUtils.getExpectedThisObjectIfNeeded(owner),
-                    propertyName,
+                    receiverJetType
-                    type);
+                );
-            semanticServices.getTrace().record(BindingContext.VARIABLE, anyMember, propertyDescriptor);
+            if (getterDescriptor != null) {
+                getterDescriptor.initialize(type);
+            }
+            if (setterDescriptor != null) {
+                // TODO: initialize
+            }
+            
+            semanticServices.getTrace().record(BindingContext.VARIABLE, anyMember.psiMember, propertyDescriptor);
             //fieldDescriptorCache.put(field, propertyDescriptor);
             descriptors.add(propertyDescriptor);
         }
@@ -1177,7 +1234,7 @@ public class JavaDescriptorResolver {
         // TODO: add outer classes
         TypeParameterListTypeVariableResolver typeVariableResolverForParameters = new TypeParameterListTypeVariableResolver(classTypeParameters);
 
-        final List<TypeParameterDescriptor> methodTypeParameters = resolveMethodTypeParameters(psiMethod, functionDescriptorImpl, typeVariableResolverForParameters);
+        final List<TypeParameterDescriptor> methodTypeParameters = resolveMethodTypeParameters(new PsiMethodWrapper(psiMethod), functionDescriptorImpl, typeVariableResolverForParameters);
 
         class MethodTypeVariableResolver implements TypeVariableResolver {
 
@@ -1217,17 +1274,19 @@ public class JavaDescriptorResolver {
         return substitutedFunctionDescriptor;
     }
 
-    private List<TypeParameterDescriptor> resolveMethodTypeParameters(PsiMethod method, FunctionDescriptorImpl functionDescriptorImpl, TypeVariableResolver classTypeVariableResolver) {
+    private List<TypeParameterDescriptor> resolveMethodTypeParameters(
-        JetMethodAnnotation jetMethodAnnotation = JetMethodAnnotation.get(method);
+            @NotNull PsiMethodWrapper method,
-        if (jetMethodAnnotation.typeParameters().length() > 0) {
+            @NotNull FunctionDescriptor functionDescriptor,
+            @NotNull TypeVariableResolver classTypeVariableResolver) {
+        if (method.getJetMethodOrProperty().typeParameters().length() > 0) {
             List<TypeParameterDescriptor> r = resolveMethodTypeParametersFromJetSignature(
-                    jetMethodAnnotation.typeParameters(), method, functionDescriptorImpl, classTypeVariableResolver);
+                    method.getJetMethodOrProperty().typeParameters(), method.getPsiMethod(), functionDescriptor, classTypeVariableResolver);
-            initializeTypeParameters(method);
+            initializeTypeParameters(method.getPsiMethod());
             return r;
         }
 
-        List<TypeParameterDescriptor> typeParameters = makeUninitializedTypeParameters(functionDescriptorImpl, method.getTypeParameters());
+        List<TypeParameterDescriptor> typeParameters = makeUninitializedTypeParameters(functionDescriptor, method.getPsiMethod().getTypeParameters());
-        initializeTypeParameters(method);
+        initializeTypeParameters(method.getPsiMethod());
         return typeParameters;
     }
 

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java

@@ -31,6 +31,7 @@ public class JvmStdlibNames {
     public static final JvmClassName JET_PROPERTY = new JvmClassName("jet.runtime.typeinfo.JetProperty");
     
     public static final String JET_PROPERTY_TYPE_FIELD = "type";
+    public static final String JET_PROPERTY_TYPE_PARAMETERS_FIELD = "typeParameters";
     
     public static final JvmClassName JET_CONSTRUCTOR = new JvmClassName("jet.runtime.typeinfo.JetConstructor");
 

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiFieldWrapper.java

@@ -0,0 +1,13 @@
+package org.jetbrains.jet.lang.resolve.java;
+
+import com.intellij.psi.PsiMember;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author Stepan Koltsov
+ */
+public class PsiFieldWrapper extends PsiMemberWrapper {
+    public PsiFieldWrapper(@NotNull PsiMember psiMember) {
+        super(psiMember);
+    }
+}

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiMemberWrapper.java

@@ -0,0 +1,27 @@
+package org.jetbrains.jet.lang.resolve.java;
+
+import com.intellij.psi.PsiMember;
+import com.intellij.psi.PsiModifier;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author Stepan Koltsov
+ */
+public class PsiMemberWrapper {
+
+    @NotNull
+    protected final PsiMember psiMember;
+
+    public PsiMemberWrapper(@NotNull PsiMember psiMember) {
+        this.psiMember = psiMember;
+    }
+
+    public boolean isStatic() {
+        return psiMember.hasModifierProperty(PsiModifier.STATIC);
+    }
+
+    public boolean isPrivate() {
+        return psiMember.hasModifierProperty(PsiModifier.PRIVATE);
+    }
+
+}

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiMethodWrapper.java

@@ -1,11 +1,13 @@
 package org.jetbrains.jet.lang.resolve.java;
 
+import com.intellij.psi.PsiMember;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiModifier;
 import com.intellij.psi.PsiParameter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.java.kt.JetConstructorAnnotation;
 import org.jetbrains.jet.lang.resolve.java.kt.JetMethodAnnotation;
+import org.jetbrains.jet.lang.resolve.java.kt.JetMethodOrPropertyAnnotation;
 import org.jetbrains.jet.lang.resolve.java.kt.JetPropertyAnnotation;
 
 import java.util.ArrayList;
@@ -14,19 +16,17 @@ import java.util.List;
 /**
  * @author Stepan Koltsov
  */
-public class PsiMethodWrapper {
+public class PsiMethodWrapper extends PsiMemberWrapper {
-    @NotNull
-    private final PsiMethod psiMethod;
 
     public PsiMethodWrapper(@NotNull PsiMethod psiMethod) {
-        this.psiMethod = psiMethod;
+        super(psiMethod);
     }
     
     private List<PsiParameterWrapper> parameters;
     @NotNull
     public List<PsiParameterWrapper> getParameters() {
         if (parameters == null) {
-            PsiParameter[] psiParameters = psiMethod.getParameterList().getParameters();
+            PsiParameter[] psiParameters = getPsiMethod().getParameterList().getParameters();
             parameters = new ArrayList<PsiParameterWrapper>(psiParameters.length);
             for (int i = 0; i < psiParameters.length; ++i) {
                 parameters.add(new PsiParameterWrapper(psiParameters[i]));
@@ -40,19 +40,15 @@ public class PsiMethodWrapper {
         return getParameters().get(i);
     }
 
-    public boolean isStatic() {
+    public boolean isFinal() {
-        return psiMethod.getModifierList().hasExplicitModifier(PsiModifier.STATIC);
+        return psiMember.hasModifierProperty(PsiModifier.FINAL);
-    }
-
-    public boolean isPrivate() {
-        return psiMethod.hasModifierProperty(PsiModifier.PRIVATE);
     }
 
     private JetMethodAnnotation jetMethod;
     @NotNull
     public JetMethodAnnotation getJetMethod() {
         if (jetMethod == null) {
-            jetMethod = JetMethodAnnotation.get(psiMethod);
+            jetMethod = JetMethodAnnotation.get(getPsiMethod());
         }
         return jetMethod;
     }
@@ -61,7 +57,7 @@ public class PsiMethodWrapper {
     @NotNull
     public JetConstructorAnnotation getJetConstructor() {
         if (jetConstructor == null) {
-            jetConstructor = JetConstructorAnnotation.get(psiMethod);
+            jetConstructor = JetConstructorAnnotation.get(getPsiMethod());
         }
         return jetConstructor;
     }
@@ -70,8 +66,21 @@ public class PsiMethodWrapper {
     @NotNull
     public JetPropertyAnnotation getJetProperty() {
         if (jetProperty == null) {
-            jetProperty = JetPropertyAnnotation.get(psiMethod);
+            jetProperty = JetPropertyAnnotation.get(getPsiMethod());
         }
         return jetProperty;
     }
+    
+    public JetMethodOrPropertyAnnotation getJetMethodOrProperty() {
+        if (getJetMethod().isDefined()) {
+            return getJetMethod();
+        } else {
+            return getJetProperty();
+        }
+    }
+
+    @NotNull
+    public PsiMethod getPsiMethod() {
+        return (PsiMethod) psiMember;
+    }
 }

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetMethodAnnotation.java

@@ -9,21 +9,12 @@ import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
 /**
  * @author Stepan Koltsov
  */
-public class JetMethodAnnotation extends PsiAnnotationWrapper {
+public class JetMethodAnnotation extends JetMethodOrPropertyAnnotation {
 
     public JetMethodAnnotation(@Nullable PsiAnnotation psiAnnotation) {
         super(psiAnnotation);
     }
 
-    private String typeParameters;
-    @NotNull
-    public String typeParameters() {
-        if (typeParameters == null) {
-            typeParameters = getStringAttribute(JvmStdlibNames.JET_METHOD_TYPE_PARAMETERS_FIELD, "");
-        }
-        return typeParameters;
-    }
-    
     private String returnType;
     @NotNull
     public String returnType() {

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetMethodOrPropertyAnnotation.java

@@ -0,0 +1,25 @@
+package org.jetbrains.jet.lang.resolve.java.kt;
+
+import com.intellij.psi.PsiAnnotation;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
+
+/**
+ * @author Stepan Koltsov
+ */
+public abstract class JetMethodOrPropertyAnnotation extends PsiAnnotationWrapper {
+    protected JetMethodOrPropertyAnnotation(@Nullable PsiAnnotation psiAnnotation) {
+        super(psiAnnotation);
+    }
+
+    private String typeParameters;
+    @NotNull
+    public String typeParameters() {
+        if (typeParameters == null) {
+            typeParameters = getStringAttribute(JvmStdlibNames.JET_METHOD_TYPE_PARAMETERS_FIELD, "");
+        }
+        return typeParameters;
+    }
+
+}

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetPropertyAnnotation.java

@@ -9,7 +9,7 @@ import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
 /**
  * @author Stepan Koltsov
  */
-public class JetPropertyAnnotation extends PsiAnnotationWrapper {
+public class JetPropertyAnnotation extends JetMethodOrPropertyAnnotation {
     protected JetPropertyAnnotation(@Nullable PsiAnnotation psiAnnotation) {
         super(psiAnnotation);
     }

compiler/testData/readClass/prop/ExtVarMapPQInt.kt

@@ -0,0 +1,7 @@
+package test
+
+import java.util.Map
+
+var <P, Q> Map<P, Q>.asas: Int
+    get() = throw Exception()
+    set(i: Int) = throw Exception()

stdlib/src/jet/runtime/typeinfo/JetProperty.java

@@ -12,4 +12,6 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 public @interface JetProperty {
     String type() default "";
+
+    String typeParameters() default "";
 }