From a0305855661973567cee80a716e8fec18be135b4 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 19 Feb 2015 14:01:00 +0100 Subject: [PATCH] EA-64906 - NPE: KdocPackage$KDocReference$c.getParamDescriptors --- .../src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt index 2f923b921c6..f37ce1bde4e 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt @@ -102,7 +102,10 @@ public fun getParamDescriptors(fromDescriptor: DeclarationDescriptor): List { val typeParams = fromDescriptor.getTypeConstructor().getParameters() if (fromDescriptor is ClassDescriptor) { - return typeParams + fromDescriptor.getUnsubstitutedPrimaryConstructor().getValueParameters() + val constructorDescriptor = fromDescriptor.getUnsubstitutedPrimaryConstructor() + if (constructorDescriptor != null) { + return typeParams + constructorDescriptor.getValueParameters() + } } return typeParams }