From bfabb4095523aab0178dca8e064fa3456f1a9659 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 9 Jun 2015 14:59:26 +0300 Subject: [PATCH] Find Usages: Skip KotlinNoOriginLightMethod to avoid NPE (to be be fixed later) --- .../src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt index 6887a3f2ce3..1d39a571224 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt @@ -29,6 +29,7 @@ import org.jetbrains.kotlin.asJava.KotlinLightElement import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.codegen.PropertyCodegen import org.jetbrains.kotlin.asJava.KotlinLightMethod +import org.jetbrains.kotlin.asJava.KotlinNoOriginLightMethod import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.resolve.OverrideResolver import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils @@ -133,6 +134,8 @@ private fun PsiElement.processDelegationCallKotlinConstructorUsages(scope: Searc private fun PsiElement.processDelegationCallJavaConstructorUsages(scope: SearchScope, process: (JetConstructorDelegationCall) -> Unit) { if (this is KotlinLightElement<*, *>) return + // TODO: Temporary hack to avoid NPE while KotlinNoOriginLightMethod is around + if (this is KotlinNoOriginLightMethod) return if (!(this is PsiMethod && isConstructor())) return val klass = getContainingClass() ?: return val descriptor = getJavaMethodDescriptor() as? ConstructorDescriptor ?: return