From aac1f68678f23e354dc3ce418199520dbe38b20d Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 10 Sep 2015 20:54:55 +0300 Subject: [PATCH] Use original element when resolving java descriptors in IDE --- .../kotlin/idea/caches/resolve/JavaResolveExtension.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt index 0cddb5c4000..3a9cc6f1177 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt @@ -46,11 +46,13 @@ fun PsiMethod.getJavaMethodDescriptor(): FunctionDescriptor? { } fun PsiClass.getJavaClassDescriptor(): ClassDescriptor? { - return getJavaDescriptorResolver()?.resolveClass(JavaClassImpl(this)) + val psiClass = originalElement as? PsiClass ?: return null + return psiClass.getJavaDescriptorResolver()?.resolveClass(JavaClassImpl(psiClass)) } fun PsiField.getJavaFieldDescriptor(): PropertyDescriptor? { - return getJavaDescriptorResolver()?.resolveField(JavaFieldImpl(this)) + val field = originalElement as? PsiField ?: return null + return field.getJavaDescriptorResolver()?.resolveField(JavaFieldImpl(field)) } fun PsiMember.getJavaMemberDescriptor(): DeclarationDescriptor? {