Resolve annotation class constructors before other constructors

2013-07-02 16:19:39 +04:00
parent e8faf96c41
commit 2152c22f86
4 changed files with 37 additions and 3 deletions
@@ -101,6 +101,9 @@ public class AnnotationDescriptorResolveTest extends JetLiteFixture {
        checkDescriptor(expectedAnnotation, topProp.getSetter());

        checkDescriptor(expectedAnnotation, getObjectDescriptor(test, "MyObject"));
+
+        checkDescriptor(expectedAnnotation, getConstructorParameterDescriptor(myClass, "consProp"));
+        checkDescriptor(expectedAnnotation, getConstructorParameterDescriptor(myClass, "param"));
    }

    @NotNull
@@ -235,6 +238,24 @@ public class AnnotationDescriptorResolveTest extends JetLiteFixture {
        return null;
    }

+    @NotNull
+    private static ValueParameterDescriptor getConstructorParameterDescriptor(
+            @NotNull ClassDescriptor classDescriptor,
+            @NotNull String name
+    ) {
+        ConstructorDescriptor constructorDescriptor = getConstructorDescriptor(classDescriptor);
+        ValueParameterDescriptor parameter = findValueParameter(constructorDescriptor.getValueParameters(), name);
+        assertNotNull("Cannot find constructor parameter with name " + name, parameter);
+        return parameter;
+    }
+
+    @NotNull
+    private static ConstructorDescriptor getConstructorDescriptor(@NotNull ClassDescriptor classDescriptor) {
+        Collection<ConstructorDescriptor> constructors = classDescriptor.getConstructors();
+        assert constructors.size() == 1;
+        return constructors.iterator().next();
+    }
+
    private static ValueParameterDescriptor findValueParameter(List<ValueParameterDescriptor> parameters, String name) {
        for (ValueParameterDescriptor parameter : parameters) {
            if (parameter.getName().asString().equals(name)) {