azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use original element when resolving java descriptors in IDE

Browse Source
This commit is contained in:
Denis Zharkov
2015-09-10 20:54:55 +03:00
parent 9c69a64789
commit aac1f68678
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt
+4 -2
View File
@@ -46,11 +46,13 @@ fun PsiMethod.getJavaMethodDescriptor(): FunctionDescriptor? {
} }
fun PsiClass.getJavaClassDescriptor(): ClassDescriptor? { 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? { 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? { fun PsiMember.getJavaMemberDescriptor(): DeclarationDescriptor? {