diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt index df2a85de384..e9ad56aaf31 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt @@ -203,7 +203,7 @@ public class LazyJavaClassMemberScope( method.hasAnnotationParameterDefaultValue(), // Nulls are not allowed in annotation arguments in Java varargElementType?.let { TypeUtils.makeNotNullable(it) }, - SourceElement.NO_SOURCE + c.sourceElementFactory.source(method) )) } diff --git a/idea/testData/resolve/references/JavaAnnotationParameter.kt b/idea/testData/resolve/references/JavaAnnotationParameter.kt new file mode 100644 index 00000000000..aebfbbf6e24 --- /dev/null +++ b/idea/testData/resolve/references/JavaAnnotationParameter.kt @@ -0,0 +1,4 @@ +java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +annotation class Anno() + +// REF: (in java.lang.annotation.Retention).value() \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java index 22e2b843e8a..da75d56b693 100644 --- a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java @@ -137,6 +137,11 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest doTest("idea/testData/resolve/references/InSecondClassObject.kt"); } + @TestMetadata("JavaAnnotationParameter.kt") + public void testJavaAnnotationParameter() throws Exception { + doTest("idea/testData/resolve/references/JavaAnnotationParameter.kt"); + } + @TestMetadata("JavaEnumEntry.kt") public void testJavaEnumEntry() throws Exception { doTest("idea/testData/resolve/references/JavaEnumEntry.kt");