From 4f5682110106de0e7428cd75606acc1ab77323ee Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 29 Sep 2015 15:23:22 +0200 Subject: [PATCH] Java sometimes asks us to find usages of a method with no containing class; don't crash on this (EA-73362 - assert: JavaMemberImpl.getContainingClass) --- .../jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt | 1 + 1 file changed, 1 insertion(+) 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 3a9cc6f1177..3b612ba7575 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 @@ -38,6 +38,7 @@ private fun PsiElement.getJavaDescriptorResolver(): JavaDescriptorResolver? { fun PsiMethod.getJavaMethodDescriptor(): FunctionDescriptor? { val method = getOriginalElement() as? PsiMethod ?: return null + if (method.containingClass == null) return null val resolver = method.getJavaDescriptorResolver() return when { method.isConstructor() -> resolver?.resolveConstructor(JavaConstructorImpl(method))