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 ce8fad2f6ed..df2a85de384 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 @@ -227,7 +227,7 @@ public class LazyJavaClassMemberScope( EnumEntrySyntheticClassDescriptor.create(c.storageManager, getContainingDeclaration(), name, c.storageManager.createLazyValue { memberIndex().getAllFieldNames() + memberIndex().getAllMethodNames() - }, SourceElement.NO_SOURCE) + }, c.sourceElementFactory.source(field)) } else null } diff --git a/idea/testData/resolve/references/JavaEnumEntry.kt b/idea/testData/resolve/references/JavaEnumEntry.kt new file mode 100644 index 00000000000..f5ded613ce2 --- /dev/null +++ b/idea/testData/resolve/references/JavaEnumEntry.kt @@ -0,0 +1,4 @@ +java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) +annotation class Anno() + +// REF: (in java.lang.annotation.RetentionPolicy).RUNTIME \ 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 f14611e6aa8..22e2b843e8a 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("JavaEnumEntry.kt") + public void testJavaEnumEntry() throws Exception { + doTest("idea/testData/resolve/references/JavaEnumEntry.kt"); + } + @TestMetadata("JavaParameter.kt") public void testJavaParameter() throws Exception { doTest("idea/testData/resolve/references/JavaParameter.kt");